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 /pimd/pim_mroute.c | |
| 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)
Diffstat (limited to 'pimd/pim_mroute.c')
| -rw-r--r-- | pimd/pim_mroute.c | 10 |
1 files changed, 2 insertions, 8 deletions
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; |