proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-29 23:08:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Modify pim_mroute_socket_[enable|disable] to be vrf aware

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-05-10 08:45:25 -04:00
parent fe232c1948
commit 6beed98735
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pimd/pim_mroute.c
View File

@ -658,7 +658,7 @@ static void mroute_read_off()
THREAD_OFF(qpim_mroute_socket_reader); THREAD_OFF(qpim_mroute_socket_reader);
} }
int pim_mroute_socket_enable() int pim_mroute_socket_enable(struct pim_instance *pim)
{ {
int fd; int fd;
@ -686,31 +686,31 @@ int pim_mroute_socket_enable()
return -3; return -3;
} }
pimg->mroute_socket = fd; pim->mroute_socket = fd;
pimg->mroute_socket_creation = pim_time_monotonic_sec(); pim->mroute_socket_creation = pim_time_monotonic_sec();
mroute_read_on(); mroute_read_on();
return 0; return 0;
} }
int pim_mroute_socket_disable() int pim_mroute_socket_disable(struct pim_instance *pim)
{ {
if (pim_mroute_set(pimg->mroute_socket, 0)) { if (pim_mroute_set(pim->mroute_socket, 0)) {
zlog_warn( zlog_warn(
"Could not disable mroute on socket fd=%d: errno=%d: %s", "Could not disable mroute on socket fd=%d: errno=%d: %s",
pimg->mroute_socket, errno, safe_strerror(errno)); pimg->mroute_socket, errno, safe_strerror(errno));
return -2; return -2;
} }
if (close(pimg->mroute_socket)) { if (close(pim->mroute_socket)) {
zlog_warn("Failure closing mroute socket: fd=%d errno=%d: %s", zlog_warn("Failure closing mroute socket: fd=%d errno=%d: %s",
pimg->mroute_socket, errno, safe_strerror(errno)); pimg->mroute_socket, errno, safe_strerror(errno));
return -3; return -3;
} }
mroute_read_off(); mroute_read_off();
pimg->mroute_socket = -1; pim->mroute_socket = -1;
return 0; return 0;
} }

4
pimd/pim_mroute.h
View File

@ -163,8 +163,8 @@ struct igmpmsg {
Above: from <linux/mroute.h> Above: from <linux/mroute.h>
*/ */
int pim_mroute_socket_enable(void); int pim_mroute_socket_enable(struct pim_instance *pim);
int pim_mroute_socket_disable(void); int pim_mroute_socket_disable(struct pim_instance *pim);
int pim_mroute_add_vif(struct interface *ifp, struct in_addr ifaddr, int pim_mroute_add_vif(struct interface *ifp, struct in_addr ifaddr,
unsigned char flags); unsigned char flags);

2
pimd/pimd.c
View File

@ -269,7 +269,7 @@ void pim_init()
} }
qpim_static_route_list->del = (void (*)(void *))pim_static_route_free; qpim_static_route_list->del = (void (*)(void *))pim_static_route_free;
pim_mroute_socket_enable(); pim_mroute_socket_enable(pimg);
/* /*