diff options
Diffstat (limited to 'src/vnet/ipsec/ipsec.c')
| -rw-r--r-- | src/vnet/ipsec/ipsec.c | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/src/vnet/ipsec/ipsec.c b/src/vnet/ipsec/ipsec.c index 6b31926be4f..95e322e87a6 100644 --- a/src/vnet/ipsec/ipsec.c +++ b/src/vnet/ipsec/ipsec.c @@ -124,17 +124,6 @@ ipsec_add_node (vlib_main_t * vm, const char *node_name, *out_next_index = vlib_node_add_next (vm, prev_node->index, node->index); } -void -ipsec_add_feature (const char *arc_name, - const char *node_name, u32 * out_feature_index) -{ - u8 arc; - - arc = vnet_get_feature_arc_index (arc_name); - ASSERT (arc != (u8) ~ 0); - *out_feature_index = vnet_get_feature_index (arc, node_name); -} - u32 ipsec_register_ah_backend (vlib_main_t * vm, ipsec_main_t * im, const char *name, @@ -198,14 +187,10 @@ ipsec_register_esp_backend (vlib_main_t * vm, ipsec_main_t * im, &b->esp6_decrypt_tun_node_index, &b->esp6_decrypt_tun_next_index); - ipsec_add_feature ("ip4-output", esp4_encrypt_node_tun_name, - &b->esp44_encrypt_tun_feature_index); - ipsec_add_feature ("ip4-output", esp6_encrypt_node_tun_name, - &b->esp46_encrypt_tun_feature_index); - ipsec_add_feature ("ip6-output", esp6_encrypt_node_tun_name, - &b->esp66_encrypt_tun_feature_index); - ipsec_add_feature ("ip6-output", esp4_encrypt_node_tun_name, - &b->esp64_encrypt_tun_feature_index); + b->esp6_encrypt_tun_node_index = + vlib_get_node_by_name (vm, (u8 *) esp6_encrypt_node_tun_name)->index; + b->esp4_encrypt_tun_node_index = + vlib_get_node_by_name (vm, (u8 *) esp4_encrypt_node_tun_name)->index; b->check_support_cb = esp_check_support_cb; b->add_del_sa_sess_cb = esp_add_del_sa_sess_cb; @@ -284,11 +269,8 @@ ipsec_select_esp_backend (ipsec_main_t * im, u32 backend_idx) im->esp4_decrypt_tun_next_index = b->esp4_decrypt_tun_next_index; im->esp6_decrypt_tun_node_index = b->esp6_decrypt_tun_node_index; im->esp6_decrypt_tun_next_index = b->esp6_decrypt_tun_next_index; - - im->esp44_encrypt_tun_feature_index = b->esp44_encrypt_tun_feature_index; - im->esp64_encrypt_tun_feature_index = b->esp64_encrypt_tun_feature_index; - im->esp46_encrypt_tun_feature_index = b->esp46_encrypt_tun_feature_index; - im->esp66_encrypt_tun_feature_index = b->esp66_encrypt_tun_feature_index; + im->esp4_encrypt_tun_node_index = b->esp4_encrypt_tun_node_index; + im->esp6_encrypt_tun_node_index = b->esp6_encrypt_tun_node_index; if (b->enable_disable_cb) { |