BFD: Support for VRFs

Allow multiple BFD instances in separate VRFs, dispatch BFD requests
according to VRFs.

Thanks to Alexander Zubkov for notice and patches.

diff --git a/nest/bfd.h b/nest/bfd.h
index b0ebe31da84f89232ef5e4b9af99c117151147d3..4654d969b47bd3303f560f5031c27ff68920541e 100644 (file)
--- a/nest/bfd.h
+++ b/nest/bfd.h
@@ -19,6 +19,7 @@ struct bfd_request {
   ip_addr addr;
   ip_addr local;
   struct iface *iface;
+  struct iface *vrf;
 
   void (*hook)(struct bfd_request *);
   void *data;
@@ -40,13 +41,13 @@ struct bfd_request {
 
 #ifdef CONFIG_BFD
 
-struct bfd_request * bfd_request_session(pool *p, ip_addr addr, ip_addr local, struct iface *iface, void (*hook)(struct bfd_request *), void *data);
+struct bfd_request * bfd_request_session(pool *p, ip_addr addr, ip_addr local, struct iface *iface, struct iface *vrf, void (*hook)(struct bfd_request *), void *data);
 
 static inline void cf_check_bfd(int use UNUSED) { }
 
 #else
 
-static inline struct bfd_request * bfd_request_session(pool *p, ip_addr addr, ip_addr local, struct iface *iface, void (*hook)(struct bfd_request *), void *data) { return NULL; }
+static inline struct bfd_request * bfd_request_session(pool *p, ip_addr addr, ip_addr local, struct iface *iface, struct iface *vrf, void (*hook)(struct bfd_request *), void *data) { return NULL; }
 
 static inline void cf_check_bfd(int use) { if (use) cf_error("BFD not available"); }
 

diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c
index 79135faeeecabe9d90910db361d5ccfffeb8e1e4..c9f1a7e514dc7b8ef13e3c773ec43d3408d45d3c 100644 (file)
--- a/proto/bfd/bfd.c
+++ b/proto/bfd/bfd.c
@@ -624,6 +624,9 @@ bfd_request_notify(struct bfd_request *req, u8 state, u8 diag)
 static int
 bfd_add_request(struct bfd_proto *p, struct bfd_request *req)
 {
+  if (p->p.vrf && (p->p.vrf != req->vrf))
+    return 0;
+
   struct bfd_session *s = bfd_find_session_by_addr(p, req->addr);
   u8 state, diag;
 
@@ -685,7 +688,8 @@ bfd_drop_requests(struct bfd_proto *p)
 static struct resclass bfd_request_class;
 
 struct bfd_request *
-bfd_request_session(pool *p, ip_addr addr, ip_addr local, struct iface *iface,
+bfd_request_session(pool *p, ip_addr addr, ip_addr local,
+                   struct iface *iface, struct iface *vrf,
                    void (*hook)(struct bfd_request *), void *data)
 {
   struct bfd_request *req = ralloc(p, &bfd_request_class);
@@ -696,6 +700,7 @@ bfd_request_session(pool *p, ip_addr addr, ip_addr local, struct iface *iface,
   req->addr = addr;
   req->local = local;
   req->iface = iface;
+  req->vrf = vrf;
 
   bfd_submit_request(req);
 
@@ -754,7 +759,7 @@ bfd_neigh_notify(struct neighbor *nb)
   if ((nb->scope > 0) && !n->req)
   {
     ip_addr local = ipa_nonzero(n->local) ? n->local : nb->ifa->ip;
-    n->req = bfd_request_session(p->p.pool, n->addr, local, nb->iface, NULL, NULL);
+    n->req = bfd_request_session(p->p.pool, n->addr, local, nb->iface, p->p.vrf, NULL, NULL);
   }
 
   if ((nb->scope <= 0) && n->req)
@@ -771,7 +776,7 @@ bfd_start_neighbor(struct bfd_proto *p, struct bfd_neighbor *n)
 
   if (n->multihop)
   {
-    n->req = bfd_request_session(p->p.pool, n->addr, n->local, NULL, NULL, NULL);
+    n->req = bfd_request_session(p->p.pool, n->addr, n->local, NULL, p->p.vrf, NULL, NULL);
     return;
   }
 
@@ -1052,15 +1057,6 @@ bfd_reconfigure(struct proto *P, struct proto_config *c)
   return 1;
 }
 
-/* Ensure one instance */
-struct bfd_config *bfd_cf;
-
-static void
-bfd_preconfig(struct protocol *P UNUSED, struct config *c UNUSED)
-{
-  bfd_cf = NULL;
-}
-
 static void
 bfd_copy_config(struct proto_config *dest, struct proto_config *src UNUSED)
 {
@@ -1123,6 +1119,5 @@ struct protocol proto_bfd = {
   .start =             bfd_start,
   .shutdown =          bfd_shutdown,
   .reconfigure =       bfd_reconfigure,
-  .preconfig =                 bfd_preconfig,
   .copy_config =       bfd_copy_config,
 };

diff --git a/proto/bfd/config.Y b/proto/bfd/config.Y
index 73414362e0abe482cfe3d0f3727bbf61d3b220d9..7e0d63bc1bdd9d656971019a99bf56471115cb5d 100644 (file)
--- a/proto/bfd/config.Y
+++ b/proto/bfd/config.Y
@@ -38,10 +38,6 @@ bfd_proto_start: proto_start BFD
   this_proto = proto_config_new(&proto_bfd, $1);
   init_list(&BFD_CFG->patt_list);
   init_list(&BFD_CFG->neigh_list);
-
-  if (bfd_cf)
-    cf_error("Only one BFD instance allowed");
-  bfd_cf = BFD_CFG;
 };
 
 bfd_proto_item:

diff --git a/proto/bfd/packets.c b/proto/bfd/packets.c
index f577ed31a6bb63c4ba41289db4d8b9ec6e682bca..08c6c5089733e45e1818234d555817bca3aa59ef 100644 (file)
--- a/proto/bfd/packets.c
+++ b/proto/bfd/packets.c
@@ -412,6 +412,7 @@ bfd_open_rx_sk(struct bfd_proto *p, int multihop)
   sock *sk = sk_new(p->tpool);
   sk->type = SK_UDP;
   sk->sport = !multihop ? BFD_CONTROL_PORT : BFD_MULTI_CTL_PORT;
+  sk->vrf = p->p.vrf;
   sk->data = p;
 
   sk->rbsize = BFD_MAX_LEN;
@@ -447,6 +448,7 @@ bfd_open_tx_sk(struct bfd_proto *p, ip_addr local, struct iface *ifa)
   sk->saddr = local;
   sk->dport = ifa ? BFD_CONTROL_PORT : BFD_MULTI_CTL_PORT;
   sk->iface = ifa;
+  sk->vrf = p->p.vrf;
   sk->data = p;
 
   sk->tbsize = BFD_MAX_LEN;

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 3d59a31bf5836a18527265f04fa79a65534b3dcd..e40a6266e9d89281f69a527a083072143a0e8b77 100644 (file)
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1084,7 +1084,7 @@ bgp_update_bfd(struct bgp_proto *p, int use_bfd)
   if (use_bfd && !p->bfd_req)
     p->bfd_req = bfd_request_session(p->p.pool, p->cf->remote_ip, p->source_addr,
                                     p->cf->multihop ? NULL : p->neigh->iface,
-                                    bgp_bfd_notify, p);
+                                    p->p.vrf, bgp_bfd_notify, p);
 
   if (!use_bfd && p->bfd_req)
     {

diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index 9fe3c02889cdd8e1c22796d34cc93870d4362efe..bc274e5fe5587cad9a481594cf25cac25be2c0fe 100644 (file)
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -584,8 +584,11 @@ ospf_neigh_bfd_hook(struct bfd_request *req)
 void
 ospf_neigh_update_bfd(struct ospf_neighbor *n, int use_bfd)
 {
+  struct ospf_proto *p = n->ifa->oa->po;
+
   if (use_bfd && !n->bfd_req)
-    n->bfd_req = bfd_request_session(n->pool, n->ip, n->ifa->addr->ip, n->ifa->iface,
+    n->bfd_req = bfd_request_session(n->pool, n->ip, n->ifa->addr->ip,
+                                    n->ifa->iface, p->p.vrf,
                                     ospf_neigh_bfd_hook, n);
 
   if (!use_bfd && n->bfd_req)

diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 88d7b7c8b4b732aa92b6cec32340ce82a4c845af..6afdc084292d20d94fea8143fc18e083235197d7 100644 (file)
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -504,7 +504,8 @@ rip_update_bfd(struct rip_proto *p, struct rip_neighbor *n)
      */
     ip_addr saddr = rip_is_v2(p) ? n->ifa->sk->saddr : n->nbr->ifa->ip;
     n->bfd_req = bfd_request_session(p->p.pool, n->nbr->addr, saddr,
-                                    n->nbr->iface, rip_bfd_notify, n);
+                                    n->nbr->iface, p->p.vrf,
+                                    rip_bfd_notify, n);
   }
 
   if (!use_bfd && n->bfd_req)

diff --git a/proto/static/static.c b/proto/static/static.c
index 6ddff146340e03c9d54cdc0b1859bbb6f1d1cef4..9e9c07fa0777813a492b75dfee448d1b3edc99af 100644 (file)
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -150,7 +150,7 @@ static_update_bfd(struct proto *p, struct static_route *r)
   if (bfd_up && !r->bfd_req)
   {
     // ip_addr local = ipa_nonzero(r->local) ? r->local : nb->ifa->ip;
-    r->bfd_req = bfd_request_session(p->pool, r->via, nb->ifa->ip, nb->iface,
+    r->bfd_req = bfd_request_session(p->pool, r->via, nb->ifa->ip, nb->iface, p->vrf,
                                     static_bfd_notify, r);
   }