diff options
Diffstat (limited to 'src/vnet/ipsec')
| -rw-r--r-- | src/vnet/ipsec/ipsec.c | 32 | ||||
| -rw-r--r-- | src/vnet/ipsec/ipsec_if_in.c | 2 | ||||
| -rw-r--r-- | src/vnet/ipsec/ipsec_input.c | 6 | ||||
| -rw-r--r-- | src/vnet/ipsec/ipsec_output.c | 8 |
4 files changed, 24 insertions, 24 deletions
diff --git a/src/vnet/ipsec/ipsec.c b/src/vnet/ipsec/ipsec.c index bb62560cccf..a88164b6b0f 100644 --- a/src/vnet/ipsec/ipsec.c +++ b/src/vnet/ipsec/ipsec.c @@ -73,18 +73,18 @@ ipsec_set_interface_spd (vlib_main_t * vm, u32 sw_if_index, u32 spd_id, sw_if_index, spd_id, spd_index); /* enable IPsec on TX */ - vnet_feature_enable_disable ("ip4-output", "ipsec4-output", sw_if_index, - is_add, 0, 0); - vnet_feature_enable_disable ("ip6-output", "ipsec6-output", sw_if_index, - is_add, 0, 0); + vnet_feature_enable_disable ("ip4-output", "ipsec4-output-feature", + sw_if_index, is_add, 0, 0); + vnet_feature_enable_disable ("ip6-output", "ipsec6-output-feature", + sw_if_index, is_add, 0, 0); config.spd_index = spd_index; /* enable IPsec on RX */ - vnet_feature_enable_disable ("ip4-unicast", "ipsec4-input", sw_if_index, - is_add, &config, sizeof (config)); - vnet_feature_enable_disable ("ip6-unicast", "ipsec6-input", sw_if_index, - is_add, &config, sizeof (config)); + vnet_feature_enable_disable ("ip4-unicast", "ipsec4-input-feature", + sw_if_index, is_add, &config, sizeof (config)); + vnet_feature_enable_disable ("ip6-unicast", "ipsec6-input-feature", + sw_if_index, is_add, &config, sizeof (config)); return 0; } @@ -611,13 +611,13 @@ ipsec_register_ah_backend (vlib_main_t * vm, ipsec_main_t * im, pool_get (im->ah_backends, b); b->name = format (NULL, "%s", name); - ipsec_add_node (vm, ah4_encrypt_node_name, "ipsec4-output", + ipsec_add_node (vm, ah4_encrypt_node_name, "ipsec4-output-feature", &b->ah4_encrypt_node_index, &b->ah4_encrypt_next_index); - ipsec_add_node (vm, ah4_decrypt_node_name, "ipsec4-input", + ipsec_add_node (vm, ah4_decrypt_node_name, "ipsec4-input-feature", &b->ah4_decrypt_node_index, &b->ah4_decrypt_next_index); - ipsec_add_node (vm, ah6_encrypt_node_name, "ipsec6-output", + ipsec_add_node (vm, ah6_encrypt_node_name, "ipsec6-output-feature", &b->ah6_encrypt_node_index, &b->ah6_encrypt_next_index); - ipsec_add_node (vm, ah6_decrypt_node_name, "ipsec6-input", + ipsec_add_node (vm, ah6_decrypt_node_name, "ipsec6-input-feature", &b->ah6_decrypt_node_index, &b->ah6_decrypt_next_index); b->check_support_cb = ah_check_support_cb; @@ -639,13 +639,13 @@ ipsec_register_esp_backend (vlib_main_t * vm, ipsec_main_t * im, pool_get (im->esp_backends, b); b->name = format (NULL, "%s", name); - ipsec_add_node (vm, esp4_encrypt_node_name, "ipsec4-output", + ipsec_add_node (vm, esp4_encrypt_node_name, "ipsec4-output-feature", &b->esp4_encrypt_node_index, &b->esp4_encrypt_next_index); - ipsec_add_node (vm, esp4_decrypt_node_name, "ipsec4-input", + ipsec_add_node (vm, esp4_decrypt_node_name, "ipsec4-input-feature", &b->esp4_decrypt_node_index, &b->esp4_decrypt_next_index); - ipsec_add_node (vm, esp6_encrypt_node_name, "ipsec6-output", + ipsec_add_node (vm, esp6_encrypt_node_name, "ipsec6-output-feature", &b->esp6_encrypt_node_index, &b->esp6_encrypt_next_index); - ipsec_add_node (vm, esp6_decrypt_node_name, "ipsec6-input", + ipsec_add_node (vm, esp6_decrypt_node_name, "ipsec6-input-feature", &b->esp6_decrypt_node_index, &b->esp6_decrypt_next_index); b->check_support_cb = esp_check_support_cb; diff --git a/src/vnet/ipsec/ipsec_if_in.c b/src/vnet/ipsec/ipsec_if_in.c index a9aab820b91..1dbd12710c9 100644 --- a/src/vnet/ipsec/ipsec_if_in.c +++ b/src/vnet/ipsec/ipsec_if_in.c @@ -230,7 +230,7 @@ VLIB_REGISTER_NODE (ipsec_if_input_node) = { .n_errors = ARRAY_LEN(ipsec_if_input_error_strings), .error_strings = ipsec_if_input_error_strings, - .sibling_of = "ipsec4-input", + .sibling_of = "ipsec4-input-feature", }; /* *INDENT-ON* */ diff --git a/src/vnet/ipsec/ipsec_input.c b/src/vnet/ipsec/ipsec_input.c index ef4113a1c09..1f3d6d01a93 100644 --- a/src/vnet/ipsec/ipsec_input.c +++ b/src/vnet/ipsec/ipsec_input.c @@ -335,7 +335,7 @@ VLIB_NODE_FN (ipsec4_input_node) (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (ipsec4_input_node,static) = { - .name = "ipsec4-input", + .name = "ipsec4-input-feature", .vector_size = sizeof (u32), .format_trace = format_ipsec_input_trace, .type = VLIB_NODE_TYPE_INTERNAL, @@ -482,7 +482,7 @@ VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (ipsec6_input_node,static) = { - .name = "ipsec6-input", + .name = "ipsec6-input-feature", .vector_size = sizeof (u32), .format_trace = format_ipsec_input_trace, .type = VLIB_NODE_TYPE_INTERNAL, @@ -490,7 +490,7 @@ VLIB_REGISTER_NODE (ipsec6_input_node,static) = { .n_errors = ARRAY_LEN(ipsec_input_error_strings), .error_strings = ipsec_input_error_strings, - .sibling_of = "ipsec4-input", + .sibling_of = "ipsec4-input-feature", }; /* *INDENT-ON* */ diff --git a/src/vnet/ipsec/ipsec_output.c b/src/vnet/ipsec/ipsec_output.c index 6b99965d501..2ab98e7e140 100644 --- a/src/vnet/ipsec/ipsec_output.c +++ b/src/vnet/ipsec/ipsec_output.c @@ -428,7 +428,7 @@ VLIB_NODE_FN (ipsec4_output_node) (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (ipsec4_output_node) = { - .name = "ipsec4-output", + .name = "ipsec4-output-feature", .vector_size = sizeof (u32), .format_trace = format_ipsec_output_trace, .type = VLIB_NODE_TYPE_INTERNAL, @@ -454,7 +454,7 @@ VLIB_NODE_FN (ipsec6_output_node) (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (ipsec6_output_node) = { - .name = "ipsec6-output", + .name = "ipsec6-output-feature", .vector_size = sizeof (u32), .format_trace = format_ipsec_output_trace, .type = VLIB_NODE_TYPE_INTERNAL, @@ -487,13 +487,13 @@ ipsec_output_node_fn (vlib_main_t * vm, VLIB_REGISTER_NODE (ipsec4_output_node) = { .vector_size = sizeof (u32), .function = ipsec_output_node_fn, - .name = "ipsec4-output", + .name = "ipsec4-output-feature", }; VLIB_REGISTER_NODE (ipsec6_output_node) = { .vector_size = sizeof (u32), .function = ipsec_output_node_fn, - .name = "ipsec6-output", + .name = "ipsec6-output-feature", }; /* *INDENT-ON* */ #endif |