CLI to update locator-set

[vpp.git] / vnet / vnet / config.c

diff --git a/vnet/vnet/config.c b/vnet/vnet/config.c
index 74c4caa..d2bcdf7 100644 (file)
--- a/vnet/vnet/config.c
+++ b/vnet/vnet/config.c
@@ -149,7 +149,7 @@ find_config_with_features (vlib_main_t * vm,
       /* First element in heap points back to pool index. */
       d = vec_elt_at_index (cm->config_string_heap, c->config_string_heap_index);
       d[0] = c->index;
-      memcpy (d + 1, config_string, vec_bytes (config_string));
+      clib_memcpy (d + 1, config_string, vec_bytes (config_string));
       hash_set_mem (cm->config_string_hash, config_string, c->index);
 
       c->reference_count = 0; /* will be incremented by caller. */
@@ -217,6 +217,15 @@ remove_reference (vnet_config_main_t * cm, vnet_config_t * c)
     }
 }
 
+static int
+feature_cmp (void * a1, void * a2)
+{
+  vnet_config_feature_t * f1 = a1;
+  vnet_config_feature_t * f2 = a2;
+
+  return (int) f1->feature_index - f2->feature_index;
+}
+
 always_inline u32 *
 vnet_get_config_heap (vnet_config_main_t * cm, u32 ci)
 { return heap_elt_at_index (cm->config_string_heap, ci); }
@@ -259,7 +268,7 @@ u32 vnet_config_add_feature (vlib_main_t * vm,
   
   /* Sort (prioritize) features. */
   if (vec_len (new_features) > 1)
-    vec_sort (new_features, f1, f2, (int) f1->feature_index - f2->feature_index);
+    vec_sort_with_function (new_features, feature_cmp);
 
   if (old)
     remove_reference (cm, old);