pimd: Fix PIM VRF support (send register/register stop in VRF)

In 9461953 and 8ebcc02, transmission of PIM register and register stop messages was changed to use a separate socket. However, that socket is not bound to a possible VRF, so the messages were sent in the default VRF instead. Call vrf_bind() once after socket creation and when the VRF is ready to ensure transmission in the correct VRF. vrf_bind() handles the non-VRF case (i.e. VRF_DEFAULT) automatically, so it may be called unconditionally. Signed-off-by: Martin Buck <[email protected]> (cherry picked from commit 5a01011)
FRRouting · Feb 24, 2025 · e933d37 · e933d37
1 parent c3e264e
commit e933d37
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c
@@ -178,6 +178,9 @@ static int pim_vrf_enable(struct vrf *vrf)
 
 	zlog_debug("%s: for %s %u", __func__, vrf->name, vrf->vrf_id);
 
+	if (vrf_bind(vrf->vrf_id, pim->reg_sock, NULL) < 0)
+		zlog_warn("Failed to bind register socket to VRF %s", vrf->name);
+
 	pim_mroute_socket_enable(pim);
 
 	FOR_ALL_INTERFACES (vrf, ifp) {