summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2017-08-16 21:23:44 -0700
committerDave Barach <openvpp@barachs.net>2017-08-18 12:58:09 +0000
commit3d2a914762af9f9b608480c5ecf5b50e7ab36d5c (patch)
tree40744adb560d0ea52712b27aba3475d92a4e7a26
parent0714541603ef9dd80d724c38984e723d111e2886 (diff)
feature: exit on misconfigured features (VPP-915)
Change-Id: Ifa11f356d727b69cb121a2bf4cfb9d87883f545d Signed-off-by: Florin Coras <fcoras@cisco.com>
-rw-r--r--src/vnet/feature/feature.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/vnet/feature/feature.c b/src/vnet/feature/feature.c
index f0e9004c64d..ad4047e62b3 100644
--- a/src/vnet/feature/feature.c
+++ b/src/vnet/feature/feature.c
@@ -65,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;
@@ -95,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] =