Add a name to the creation of an IP and MPLS table

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

diff --git a/src/vnet/feature/feature.c b/src/vnet/feature/feature.c
index 032fe78..ad4047e 100644 (file)
--- a/src/vnet/feature/feature.c
+++ b/src/vnet/feature/feature.c
@@ -14,6 +14,7 @@
  */
 
 #include <vnet/feature/feature.h>
+#include <vnet/adj/adj.h>
 
 vnet_feature_main_t feature_main;
 
@@ -64,8 +65,11 @@ vnet_feature_init (vlib_main_t * vm)
       vnet_feature_registration_t *next;
       uword *p = hash_get_mem (fm->arc_index_by_name, freg->arc_name);
       if (p == 0)
-       return clib_error_return (0, "Unknown feature arc '%s'",
-                                 freg->arc_name);
+       {
+         /* Don't start vpp with broken features arcs */
+         clib_warning ("Unknown feature arc '%s'", freg->arc_name);
+         os_exit (1);
+       }
 
       areg = uword_to_pointer (p[0], vnet_feature_arc_registration_t *);
       arc_index = areg->feature_arc_index;
@@ -94,7 +98,8 @@ vnet_feature_init (vlib_main_t * vm)
                                          fm->next_feature_by_arc[arc_index],
                                          &fm->feature_nodes[arc_index])))
        {
-         return error;
+         clib_error_report (error);
+         os_exit (1);
        }
 
       fm->next_feature_by_name[arc_index] =
@@ -108,9 +113,6 @@ vnet_feature_init (vlib_main_t * vm)
          freg = freg->next;
        }
 
-      cm->end_feature_index =
-       vnet_get_feature_index (arc_index, areg->end_node);
-
       /* next */
       areg = areg->next;
       arc_index++;
@@ -184,7 +186,6 @@ vnet_feature_enable_disable_with_index (u8 arc_index, u32 feature_index,
   vnet_feature_main_t *fm = &feature_main;
   vnet_feature_config_main_t *cm;
   i16 feature_count;
-  int is_first_or_last;
   u32 ci;
 
   if (arc_index == (u8) ~ 0)
@@ -213,22 +214,12 @@ vnet_feature_enable_disable_with_index (u8 arc_index, u32 feature_index,
   /* update feature count */
   enable_disable = (enable_disable > 0);
   feature_count += enable_disable ? 1 : -1;
-  is_first_or_last = (feature_count == enable_disable);
   ASSERT (feature_count >= 0);
 
-  if (is_first_or_last && cm->end_feature_index != ~0)
-    {
-      /*register end node */
-      ci = (enable_disable
-           ? vnet_config_add_feature
-           : vnet_config_del_feature)
-       (vlib_get_main (), &cm->config_main, ci, cm->end_feature_index, 0, 0);
-      cm->config_index_by_sw_if_index[sw_if_index] = ci;
-    }
-
   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));
 
   fm->feature_count_by_sw_if_index[arc_index][sw_if_index] = feature_count;
   return 0;
@@ -434,6 +425,7 @@ set_interface_features_command_fn (vlib_main_t * vm,
 done:
   vec_free (feature_name);
   vec_free (arc_name);
+  unformat_free (line_input);
   return error;
 }