diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2025-02-25 10:37:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-25 10:37:12 -0500 |
| commit | f8276261bfdd8fce216f25091d99f1a8e8e97481 (patch) | |
| tree | 8f250c5de560699a1600375b2a65bba294c2e05e | |
| parent | f25a65089983764a92f1a51d5d927e26c2ae9e09 (diff) | |
| parent | 76e4076d26dfbcf22fefd1eaecb3a490b57d2385 (diff) | |
Merge pull request #18246 from FRRouting/mergify/bp/dev/10.3/pr-18226
pim: Fix vrf binding of autorp and mroute socket (backport #18226)
| -rw-r--r-- | pimd/pim_autorp.c | 10 | ||||
| -rw-r--r-- | pimd/pim_autorp.h | 1 | ||||
| -rw-r--r-- | pimd/pim_instance.c | 4 | ||||
| -rw-r--r-- | pimd/pim_mroute.c | 10 |
4 files changed, 17 insertions, 8 deletions
diff --git a/pimd/pim_autorp.c b/pimd/pim_autorp.c index dc077dbbd6..7bc28ff819 100644 --- a/pimd/pim_autorp.c +++ b/pimd/pim_autorp.c @@ -980,6 +980,13 @@ static bool pim_autorp_socket_enable(struct pim_autorp *autorp) return false; } + if (vrf_bind(autorp->pim->vrf->vrf_id, fd, NULL)) { + zlog_warn("Could not bind autorp socket to vrf fd=%d: vrf_id=%d: errno=%d: %s", + fd, autorp->pim->vrf->vrf_id, errno, safe_strerror(errno)); + close(fd); + return false; + } + if (!pim_autorp_setup(fd)) { zlog_warn("Could not setup autorp socket fd=%d: errno=%d: %s", fd, errno, safe_strerror(errno)); @@ -1549,7 +1556,10 @@ void pim_autorp_init(struct pim_instance *pim) if (PIM_DEBUG_AUTORP) zlog_debug("%s: AutoRP Initialized", __func__); +} +void pim_autorp_enable(struct pim_instance *pim) +{ /* Start AutoRP discovery by default on startup */ pim_autorp_start_discovery(pim); } diff --git a/pimd/pim_autorp.h b/pimd/pim_autorp.h index e4c6530109..88aebe5b7d 100644 --- a/pimd/pim_autorp.h +++ b/pimd/pim_autorp.h @@ -173,6 +173,7 @@ void pim_autorp_rm_ifp(struct interface *ifp); void pim_autorp_start_discovery(struct pim_instance *pim); void pim_autorp_stop_discovery(struct pim_instance *pim); void pim_autorp_init(struct pim_instance *pim); +void pim_autorp_enable(struct pim_instance *pim); void pim_autorp_finish(struct pim_instance *pim); int pim_autorp_config_write(struct pim_instance *pim, struct vty *vty); void pim_autorp_show_autorp(struct vty *vty, struct pim_instance *pim, const char *component, diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c index f1471a5a93..f64b02e44d 100644 --- a/pimd/pim_instance.c +++ b/pimd/pim_instance.c @@ -186,6 +186,10 @@ static int pim_vrf_enable(struct vrf *vrf) pim_mroute_socket_enable(pim); +#if PIM_IPV == 4 + pim_autorp_enable(pim); +#endif + FOR_ALL_INTERFACES (vrf, ifp) { if (!ifp->info) continue; diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index 6c13e1324f..30daa3a929 100644 --- a/pimd/pim_mroute.c +++ b/pimd/pim_mroute.c @@ -876,17 +876,11 @@ int pim_mroute_socket_enable(struct pim_instance *pim) pim->vrf->name); #endif -#ifdef SO_BINDTODEVICE - if (pim->vrf->vrf_id != VRF_DEFAULT - && setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, - pim->vrf->name, strlen(pim->vrf->name))) { - zlog_warn("Could not setsockopt SO_BINDTODEVICE: %s", - safe_strerror(errno)); + if (vrf_bind(pim->vrf->vrf_id, fd, NULL)) { + zlog_warn("Could not bind to vrf: %s", safe_strerror(errno)); close(fd); return -3; } -#endif - } pim->mroute_socket = fd; |