ADJ_BFD_STATE_UP,
} adj_bfd_state_t;
+#define ADJ_BFD_STATES { \
+ [ADJ_BFD_STATE_DOWN] = "down", \
+ [ADJ_BFD_STATE_UP] = "up", \
+}
+
+static const char *adj_bfd_state_names[] = ADJ_BFD_STATES;
+
/**
* BFD delegate daa
*/
{
/*
* lock the adj. add the delegate.
- * Lockinging the adj prevents it being removed and thus maintains
+ * Locking the adj prevents it being removed and thus maintains
* the BFD derived states
*/
adj_lock(ai);
pool_get(abd_pool, abd);
/*
- * pretend the session is up and skip the walk.
- * If we set it down then we get traffic loss on new children.
- * if we walk then we lose traffic for existing children. Wait
- * for the first BFD UP/DOWN before we let the session's state
- * influence forwarding.
+ * it would be best here if we could ignore this create and just
+ * wait for the first update, but this is not possible because
+ * BFD sessions are created in the down state, and can remain this
+ * way without transitioning to another state if the peer is
+ * unresponsive. So we have to assume down and wait for up.
*/
- abd->abd_state = ADJ_BFD_STATE_UP;
+ abd->abd_state = ADJ_BFD_STATE_DOWN;
abd->abd_index = session->bs_idx;
adj_delegate_add(adj_get(ai), ADJ_DELEGATE_BFD, abd - abd_pool);
+ adj_bfd_update_walk(ai);
}
break;
case BFD_LISTEN_EVENT_UPDATE:
/*
- * state change up/dowm and
+ * state change up/down and
*/
abd = adj_bfd_from_base(adj_delegate_get(adj_get(ai), ADJ_DELEGATE_BFD));
{
/*
* has an associated BFD tracking delegate
- * remove the BFD tracking deletgate, update children, then
+ * remove the BFD tracking delegate, update children, then
* unlock the adj
*/
adj_delegate_remove(ai, ADJ_DELEGATE_BFD);
{
const adj_bfd_delegate_t *abd = adj_bfd_from_const_base(aed);
- s = format(s, "BFD:[state:%d index:%d]",
- abd->abd_state,
+ s = format(s, "BFD:[state:%s index:%d]",
+ adj_bfd_state_names[abd->abd_state],
abd->abd_index);
return (s);
static clib_error_t *
adj_bfd_main_init (vlib_main_t * vm)
{
- clib_error_t * error = NULL;
-
- if ((error = vlib_call_init_function (vm, bfd_main_init)))
- return (error);
-
bfd_register_listener(adj_bfd_notify);
adj_delegate_register_type (ADJ_DELEGATE_BFD, &adj_delegate_vft);
- return (error);
+ return (0);
}
-VLIB_INIT_FUNCTION (adj_bfd_main_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (adj_bfd_main_init)=
+{
+ .runs_after = VLIB_INITS("bfd_main_init"),
+};
+/* *INDENT-ON* */