bfdd: avoid having bfd config inherited from operation context

there are cases where bfd sessions are created from remote daemons. in
that case, the bfd daemon were appearing in both operational and
configuration contexts of bfd. Change that by only keeping operational
contexts.

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

diff --git a/bfdd/bfd.h b/bfdd/bfd.h
index a69ff9a1a7b9a33b7756d6ef6305a125904220d2..78122baf7a152ed8874a3896f647fe033e9fb1be 100644 (file)
--- a/bfdd/bfd.h
+++ b/bfdd/bfd.h
@@ -166,6 +166,7 @@ enum bfd_session_flags {
                                                 * expires
                                                 */
        BFD_SESS_FLAG_SHUTDOWN = 1 << 7,        /* disable BGP peer function */
+       BFD_SESS_FLAG_CONFIG = 1 << 8,  /* Session configured with bfd NB API */
 };
 
 #define BFD_SET_FLAG(field, flag) (field |= flag)

diff --git a/bfdd/bfdd_vty.c b/bfdd/bfdd_vty.c
index c13949207642fe1e81673269291b48a957afda2f..4efdd817c1c78a44a22844d84cb9b907fd9f6379 100644 (file)
--- a/bfdd/bfdd_vty.c
+++ b/bfdd/bfdd_vty.c
@@ -158,6 +158,12 @@ DEFUN_NOSH(
                }
        }
 
+       if (!BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG)) {
+               if (bs->refcount)
+                       vty_out(vty, "%% session peer is now configurable via bfd daemon.\n");
+               BFD_SET_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG);
+       }
+
        VTY_PUSH_CONTEXT(BFD_PEER_NODE, bs);
 
        return CMD_SUCCESS;
@@ -984,6 +990,9 @@ static void _bfdd_peer_write_config_iter(struct hash_bucket *hb, void *arg)
        struct vty *vty = arg;
        struct bfd_session *bs = hb->data;
 
+       if (!BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG))
+               return;
+
        _bfdd_peer_write_config(vty, bs);
 }