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

Merge pull request #4536 from pguibert6WIND/bfd_startup_does_not_work

Browse Source 
bfdd: avoid double socket initialisation on same netns
This commit is contained in:
Donald Sharp 2019-06-21 19:41:02 -04:00 committed by GitHub
commit 574fa9a597
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
bfdd/bfd.c
View File

@ -1555,41 +1555,41 @@ static int bfd_vrf_enable(struct vrf *vrf)
} else } else
bvrf = vrf->info; bvrf = vrf->info;
log_debug("VRF enable add %s id %u", vrf->name, vrf->vrf_id); log_debug("VRF enable add %s id %u", vrf->name, vrf->vrf_id);
if (vrf->vrf_id == VRF_DEFAULT ||
vrf_get_backend() == VRF_BACKEND_NETNS) {
if (!bvrf->bg_shop)
bvrf->bg_shop = bp_udp_shop(vrf->vrf_id);
if (!bvrf->bg_mhop)
bvrf->bg_mhop = bp_udp_mhop(vrf->vrf_id);
if (!bvrf->bg_shop6)
bvrf->bg_shop6 = bp_udp6_shop(vrf->vrf_id);
if (!bvrf->bg_mhop6)
bvrf->bg_mhop6 = bp_udp6_mhop(vrf->vrf_id);
if (!bvrf->bg_echo)
bvrf->bg_echo = bp_echo_socket(vrf->vrf_id);
if (!bvrf->bg_echov6)
bvrf->bg_echov6 = bp_echov6_socket(vrf->vrf_id);
/* create sockets if needed */ /* Add descriptors to the event loop. */
if (!bvrf->bg_shop) if (!bvrf->bg_ev[0])
bvrf->bg_shop = bp_udp_shop(vrf->vrf_id); thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop,
if (!bvrf->bg_mhop) &bvrf->bg_ev[0]);
bvrf->bg_mhop = bp_udp_mhop(vrf->vrf_id); if (!bvrf->bg_ev[1])
if (!bvrf->bg_shop6) thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop,
bvrf->bg_shop6 = bp_udp6_shop(vrf->vrf_id); &bvrf->bg_ev[1]);
if (!bvrf->bg_mhop6) if (!bvrf->bg_ev[2])
bvrf->bg_mhop6 = bp_udp6_mhop(vrf->vrf_id); thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop6,
if (!bvrf->bg_echo) &bvrf->bg_ev[2]);
bvrf->bg_echo = bp_echo_socket(vrf->vrf_id); if (!bvrf->bg_ev[3])
if (!bvrf->bg_echov6) thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop6,
bvrf->bg_echov6 = bp_echov6_socket(vrf->vrf_id); &bvrf->bg_ev[3]);
if (!bvrf->bg_ev[4])
/* Add descriptors to the event loop. */ thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echo,
if (!bvrf->bg_ev[0]) &bvrf->bg_ev[4]);
thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop, if (!bvrf->bg_ev[5])
&bvrf->bg_ev[0]); thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echov6,
if (!bvrf->bg_ev[1]) &bvrf->bg_ev[5]);
thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop, }
&bvrf->bg_ev[1]);
if (!bvrf->bg_ev[2])
thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop6,
&bvrf->bg_ev[2]);
if (!bvrf->bg_ev[3])
thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop6,
&bvrf->bg_ev[3]);
if (!bvrf->bg_ev[4])
thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echo,
&bvrf->bg_ev[4]);
if (!bvrf->bg_ev[5])
thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echov6,
&bvrf->bg_ev[5]);
if (vrf->vrf_id != VRF_DEFAULT) { if (vrf->vrf_id != VRF_DEFAULT) {
bfdd_zclient_register(vrf->vrf_id); bfdd_zclient_register(vrf->vrf_id);
bfdd_sessions_enable_vrf(vrf); bfdd_sessions_enable_vrf(vrf);