From 057b3565a09b62c9415a44a99f43ad891d864ca5 Mon Sep 17 00:00:00 2001 From: Pierre Pfister Date: Mon, 10 Dec 2018 17:01:01 +0100 Subject: Change ipsec feature node names ipsec4-output and ipsec6-output were conflicting with ipsec interface names ("ipsec") and vnet/interface.c autogenerated output node ("-output"). Changing feature names seems to be the less invasive option. This patch also changes "input" feature names for consistency. Change-Id: I4ba10d07e9ba09df20aa2500104252b06b55f8f7 Signed-off-by: Pierre Pfister --- src/vnet/ip/ip4_forward.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/vnet/ip/ip4_forward.c') diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c index 1ca4f9309e6..c9db71b184e 100644 --- a/src/vnet/ip/ip4_forward.c +++ b/src/vnet/ip/ip4_forward.c @@ -754,13 +754,13 @@ VNET_FEATURE_INIT (ip4_policer_classify, static) = { .arc_name = "ip4-unicast", .node_name = "ip4-policer-classify", - .runs_before = VNET_FEATURES ("ipsec4-input"), + .runs_before = VNET_FEATURES ("ipsec4-input-feature"), }; VNET_FEATURE_INIT (ip4_ipsec, static) = { .arc_name = "ip4-unicast", - .node_name = "ipsec4-input", + .node_name = "ipsec4-input-feature", .runs_before = VNET_FEATURES ("vpath-input-ip4"), }; @@ -842,13 +842,13 @@ VNET_FEATURE_INIT (ip4_outacl, static) = { .arc_name = "ip4-output", .node_name = "ip4-outacl", - .runs_before = VNET_FEATURES ("ipsec4-output"), + .runs_before = VNET_FEATURES ("ipsec4-output-feature"), }; VNET_FEATURE_INIT (ip4_ipsec_output, static) = { .arc_name = "ip4-output", - .node_name = "ipsec4-output", + .node_name = "ipsec4-output-feature", .runs_before = VNET_FEATURES ("interface-output"), }; -- cgit 1.2.3-korg