matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #18226 from nabahr/pim-vrf-bind

Browse source 
pim: Fix vrf binding of autorp and mroute socket
This commit is contained in:
Donald Sharp 2025-02-24 13:53:39 -05:00 committed by GitHub
parent 231110aefd 7e181a771c
commit 777aae08cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pimd/pim_autorp.c
View file

@ -981,6 +981,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));
@ -1550,7 +1557,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);
}

1
pimd/pim_autorp.h
View file

@ -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,

4
pimd/pim_instance.c
View file

@ -183,6 +183,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;

10
pimd/pim_mroute.c
View file

@ -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;