]> git.puffer.fish Git - matthieu/frr.git/commitdiff
Merge pull request #18246 from FRRouting/mergify/bp/dev/10.3/pr-18226
authorDonald Sharp <donaldsharp72@gmail.com>
Tue, 25 Feb 2025 15:37:12 +0000 (10:37 -0500)
committerGitHub <noreply@github.com>
Tue, 25 Feb 2025 15:37:12 +0000 (10:37 -0500)
pim: Fix vrf binding of autorp and mroute socket (backport #18226)

1  2 
pimd/pim_instance.c

index f1471a5a93bfb32b5cb87b2fab8b9d57a56021ff,358821142efff8a7fc962521c2ac381bf6467d94..f64b02e44dc9f98f98aed7549861448884ecd27c
@@@ -181,11 -181,12 +181,15 @@@ static int pim_vrf_enable(struct vrf *v
  
        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);
  
+ #if PIM_IPV == 4
+       pim_autorp_enable(pim);
+ #endif
        FOR_ALL_INTERFACES (vrf, ifp) {
                if (!ifp->info)
                        continue;