fib feature: Code mechanics to decouple dependency of feature on adj

[vpp.git] / src / vnet / feature / feature.c

diff --git a/src/vnet/feature/feature.c b/src/vnet/feature/feature.c
index 2cdbcff..24960d9 100644 (file)
--- a/src/vnet/feature/feature.c
+++ b/src/vnet/feature/feature.c
@@ -14,10 +14,39 @@
  */
 
 #include <vnet/feature/feature.h>
-#include <vnet/adj/adj.h>
+
 
 vnet_feature_main_t feature_main;
 
+typedef struct vnet_feature_upd_registration_t_
+{
+  vnet_feature_update_cb_t cb;
+  void *data;
+} vnet_feature_upd_registration_t;
+
+static vnet_feature_upd_registration_t *regs;
+
+void
+vnet_feature_register (vnet_feature_update_cb_t cb, void *data)
+{
+  vnet_feature_upd_registration_t *reg;
+
+  vec_add2 (regs, reg, 1);
+
+  reg->cb = cb;
+  reg->data = data;
+}
+
+static void
+vent_feature_reg_invoke (u32 sw_if_index, u8 arc_index, u8 is_enable)
+{
+  vnet_feature_upd_registration_t *reg;
+
+  vec_foreach (reg, regs)
+    reg->cb (sw_if_index, arc_index, is_enable, reg->data);
+}
+
+
 static clib_error_t *
 vnet_feature_init (vlib_main_t * vm)
 {
@@ -115,12 +144,14 @@ vnet_feature_init (vlib_main_t * vm)
       clib_error_t *error;
       vnet_feature_config_main_t *cm;
       vnet_config_main_t *vcm;
+      char **features_in_order, *last_feature;
 
       arc_index = areg->feature_arc_index;
       cm = &fm->feature_config_mains[arc_index];
       vcm = &cm->config_main;
       if ((error = vnet_feature_arc_init
           (vm, vcm, areg->start_nodes, areg->n_start_nodes,
+           areg->last_in_arc,
            fm->next_feature_by_arc[arc_index],
            fm->next_constraint_by_arc[arc_index],
            &fm->feature_nodes[arc_index])))
@@ -129,6 +160,19 @@ vnet_feature_init (vlib_main_t * vm)
          os_exit (1);
        }
 
+      features_in_order = fm->feature_nodes[arc_index];
+
+      /* If specified, verify that the last node in the arc is actually last */
+      if (areg->last_in_arc && vec_len (features_in_order) > 0)
+       {
+         last_feature = features_in_order[vec_len (features_in_order) - 1];
+         if (strncmp (areg->last_in_arc, last_feature,
+                      strlen (areg->last_in_arc)))
+           clib_warning
+             ("WARNING: %s arc: last node is %s, but expected %s!",
+              areg->arc_name, last_feature, areg->last_in_arc);
+       }
+
       fm->next_feature_by_name[arc_index] =
        hash_create_string (0, sizeof (uword));
       freg = fm->next_feature_by_arc[arc_index];
@@ -250,7 +294,7 @@ vnet_feature_enable_disable_with_index (u8 arc_index, u32 feature_index,
   fm->sw_if_index_has_features[arc_index] =
     clib_bitmap_set (fm->sw_if_index_has_features[arc_index], sw_if_index,
                     (feature_count > 0));
-  adj_feature_update (sw_if_index, arc_index, (feature_count > 0));
+  vent_feature_reg_invoke (sw_if_index, arc_index, (feature_count > 0));
 
   fm->feature_count_by_sw_if_index[arc_index][sw_if_index] = feature_count;
   return 0;