X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffeature%2Ffeature.c;h=f1afa3746f0dcc74ede1ad68fab09f5bdc8d2357;hb=a25def7807fb46bd48462be3ec5c598fc79e2a13;hp=6525bcbdce551835832a7e9e0f77192c622a5c3a;hpb=3b4a6a1bb0cc5059b1965282463c03ef4d14f874;p=vpp.git

diff --git a/src/vnet/feature/feature.c b/src/vnet/feature/feature.c
index 6525bcbdce5..f1afa3746f0 100644
--- a/src/vnet/feature/feature.c
+++ b/src/vnet/feature/feature.c
@@ -24,6 +24,7 @@ vnet_feature_init (vlib_main_t * vm)
   vnet_feature_main_t *fm = &feature_main;
   vnet_feature_registration_t *freg;
   vnet_feature_arc_registration_t *areg;
+  vnet_feature_constraint_registration_t *creg;
   u32 arc_index = 0;
 
   fm->arc_index_by_name = hash_create_string (0, sizeof (uword));
@@ -58,6 +59,7 @@ vnet_feature_init (vlib_main_t * vm)
   vec_validate (fm->next_feature_by_name, arc_index - 1);
   vec_validate (fm->sw_if_index_has_features, arc_index - 1);
   vec_validate (fm->feature_count_by_sw_if_index, arc_index - 1);
+  vec_validate (fm->next_constraint_by_arc, arc_index - 1);
 
   freg = fm->next_feature;
   while (freg)
@@ -82,26 +84,65 @@ vnet_feature_init (vlib_main_t * vm)
       freg = next;
     }
 
+  /* Move bulk constraints to the constraint by arc lists */
+  creg = fm->next_constraint;
+  while (creg)
+    {
+      vnet_feature_constraint_registration_t *next;
+      uword *p = hash_get_mem (fm->arc_index_by_name, creg->arc_name);
+      if (p == 0)
+	{
+	  /* Don't start vpp with broken features arcs */
+	  clib_warning ("Unknown feature arc '%s'", creg->arc_name);
+	  os_exit (1);
+	}
+
+      areg = uword_to_pointer (p[0], vnet_feature_arc_registration_t *);
+      arc_index = areg->feature_arc_index;
+
+      next = creg->next;
+      creg->next_in_arc = fm->next_constraint_by_arc[arc_index];
+      fm->next_constraint_by_arc[arc_index] = creg;
+
+      /* next */
+      creg = next;
+    }
+
+
   areg = fm->next_arc;
   while (areg)
     {
       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,
-					  fm->next_feature_by_arc[arc_index],
-					  &fm->feature_nodes[arc_index])))
+      if ((error = vnet_feature_arc_init
+	   (vm, vcm, areg->start_nodes, areg->n_start_nodes,
+	    fm->next_feature_by_arc[arc_index],
+	    fm->next_constraint_by_arc[arc_index],
+	    &fm->feature_nodes[arc_index])))
 	{
 	  clib_error_report (error);
 	  os_exit (1);
 	}
 
+      features_in_order = fm->feature_nodes[arc_index];
+
+      /* If specificed, 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];