bfdd: avoid double socket initialisation on same netns

when working with a standard vrf backend, bfdd ignores that and tries to
create and configure bfd sockets for each vrf, which will fail for the
second vrf discovered, since the network namespace used is the same, and
it is not possible to use same socket settings twice. Handle this case,
and avoids to reinitialise sockets.
This patch however does not leverage bfd support for vrf-lite.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/bfdd/bfd.c b/bfdd/bfd.c
index 43544318204f9de701990cf603f247d2a5654b4f..475aeff050ffccd478b8b1a6e114a255f70ca449 100644 (file)
--- a/bfdd/bfd.c
+++ b/bfdd/bfd.c
@@ -1552,41 +1552,41 @@ static int bfd_vrf_enable(struct vrf *vrf)
        } else
                bvrf = vrf->info;
        log_debug("VRF enable add %s id %u", vrf->name, vrf->vrf_id);
-
-       /* create sockets if needed */
-       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);
-
-       /* Add descriptors to the event loop. */
-       if (!bvrf->bg_ev[0])
-               thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop,
-                               &bvrf->bg_ev[0]);
-       if (!bvrf->bg_ev[1])
-               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 ||
+           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);
+
+               /* Add descriptors to the event loop. */
+               if (!bvrf->bg_ev[0])
+                       thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop,
+                                       &bvrf->bg_ev[0]);
+               if (!bvrf->bg_ev[1])
+                       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) {
                bfdd_zclient_register(vrf->vrf_id);
                bfdd_sessions_enable_vrf(vrf);