diff options
32 files changed, 64 insertions, 58 deletions
diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c b/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c index 3aef24a223a..824fc50ec57 100644 --- a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c +++ b/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c @@ -252,7 +252,7 @@ static int flowperpkt_tx_interface_add_del_feature u32 ci; ip4_main_t *im = &ip4_main; ip_lookup_main_t *lm = &im->lookup_main; - ip_config_main_t *cm = &lm->feature_config_mains[VNET_IP_TX_FEAT]; + vnet_feature_config_main_t *cm = &lm->feature_config_mains[VNET_IP_TX_FEAT]; u32 feature_index; flow_report_main_t *frm = &flow_report_main; vnet_flow_report_add_del_args_t _a, *a = &_a; diff --git a/plugins/flowperpkt-plugin/flowperpkt/node.c b/plugins/flowperpkt-plugin/flowperpkt/node.c index 4deaae1a67c..0991c91d2dc 100644 --- a/plugins/flowperpkt-plugin/flowperpkt/node.c +++ b/plugins/flowperpkt-plugin/flowperpkt/node.c @@ -279,7 +279,7 @@ flowperpkt_node_fn (vlib_main_t * vm, flowperpkt_next_t next_index; ip4_main_t *im = &ip4_main; ip_lookup_main_t *lm = &im->lookup_main; - ip_config_main_t *cm = &lm->feature_config_mains[VNET_IP_TX_FEAT]; + vnet_feature_config_main_t *cm = &lm->feature_config_mains[VNET_IP_TX_FEAT]; flowperpkt_main_t *fm = &flowperpkt_main; f64 now = vlib_time_now (vm); diff --git a/plugins/ila-plugin/ila/ila.c b/plugins/ila-plugin/ila/ila.c index 90dde5f25af..61ce0f7bacd 100644 --- a/plugins/ila-plugin/ila/ila.c +++ b/plugins/ila-plugin/ila/ila.c @@ -427,7 +427,7 @@ ila_sir2ila (vlib_main_t * vm, { ip6_main_t *im = &ip6_main; ip_lookup_main_t *lm = &im->lookup_main; - ip_config_main_t *cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t *cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; u32 n_left_from, *from, next_index, *to_next, n_left_to_next; ila_main_t *ilm = &ila_main; @@ -827,7 +827,7 @@ ila_interface (u32 sw_if_index, u8 disable) ila_main_t *ilm = &ila_main; ip6_main_t *im = &ip6_main; ip_lookup_main_t *lm = &im->lookup_main; - ip_config_main_t *cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t *cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; vnet_config_main_t *vcm = &cm->config_main; u32 ci, feature_index; diff --git a/plugins/snat-plugin/snat/out2in.c b/plugins/snat-plugin/snat/out2in.c index 7601eb8dfdd..190350ada2b 100644 --- a/plugins/snat-plugin/snat/out2in.c +++ b/plugins/snat-plugin/snat/out2in.c @@ -285,7 +285,7 @@ snat_out2in_node_fn (vlib_main_t * vm, u32 pkts_processed = 0; snat_main_t * sm = &snat_main; ip_lookup_main_t * lm = sm->ip4_lookup_main; - ip_config_main_t * cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t * cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; f64 now = vlib_time_now (vm); from = vlib_frame_vector_args (frame); @@ -854,7 +854,7 @@ snat_out2in_fast_node_fn (vlib_main_t * vm, u32 pkts_processed = 0; snat_main_t * sm = &snat_main; ip_lookup_main_t * lm = sm->ip4_lookup_main; - ip_config_main_t * cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t * cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; from = vlib_frame_vector_args (frame); n_left_from = frame->n_vectors; diff --git a/plugins/snat-plugin/snat/snat.c b/plugins/snat-plugin/snat/snat.c index 1a8c93dcf72..0b972110f19 100644 --- a/plugins/snat-plugin/snat/snat.c +++ b/plugins/snat-plugin/snat/snat.c @@ -543,7 +543,7 @@ static int snat_interface_add_del (u32 sw_if_index, u8 is_inside, int is_del) u32 ci; ip4_main_t * im = &ip4_main; ip_lookup_main_t * lm = &im->lookup_main; - ip_config_main_t * rx_cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t * rx_cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; u32 feature_index; if (sm->static_mapping_only && !(sm->static_mapping_connection_tracking)) diff --git a/vnet/vnet/adj/adj_l2.c b/vnet/vnet/adj/adj_l2.c index 2bb28a20129..c49ec77ec78 100644 --- a/vnet/vnet/adj/adj_l2.c +++ b/vnet/vnet/adj/adj_l2.c @@ -53,7 +53,7 @@ adj_l2_rewrite_inline (vlib_main_t * vm, u32 * from = vlib_frame_vector_args (frame); u32 n_left_from, n_left_to_next, * to_next, next_index; u32 cpu_index = os_get_cpu_number(); - ip_config_main_t * cm = ðernet_main.feature_config_mains[VNET_IP_TX_FEAT]; + vnet_feature_config_main_t * cm = ðernet_main.feature_config_mains[VNET_IP_TX_FEAT]; n_left_from = frame->n_vectors; next_index = node->cached_next_index; diff --git a/vnet/vnet/adj/adj_midchain.c b/vnet/vnet/adj/adj_midchain.c index 6afff27ec49..52720a8544a 100644 --- a/vnet/vnet/adj/adj_midchain.c +++ b/vnet/vnet/adj/adj_midchain.c @@ -320,10 +320,10 @@ adj_get_midchain_node (vnet_link_t link) return (0); } -static ip_config_main_t * +static vnet_feature_config_main_t * adj_midchain_get_cofing_for_link_type (const ip_adjacency_t *adj) { - ip_config_main_t *cm = NULL; + vnet_feature_config_main_t *cm = NULL; switch (adj->ia_link) { @@ -374,7 +374,7 @@ adj_nbr_midchain_update_rewrite (adj_index_t adj_index, u8 *rewrite) { vnet_config_main_t * vcm; - ip_config_main_t *cm; + vnet_feature_config_main_t *cm; ip_adjacency_t *adj; u32 ci; diff --git a/vnet/vnet/classify/flow_classify.c b/vnet/vnet/classify/flow_classify.c index 32699946d36..527b13cb887 100644 --- a/vnet/vnet/classify/flow_classify.c +++ b/vnet/vnet/classify/flow_classify.c @@ -22,7 +22,7 @@ vnet_flow_classify_feature_enable (vlib_main_t * vnm, int feature_enable) { ip_lookup_main_t * lm; - ip_config_main_t * ifcm; + vnet_feature_config_main_t * ifcm; u32 ftype; u32 ci; diff --git a/vnet/vnet/classify/input_acl.c b/vnet/vnet/classify/input_acl.c index 91ae06852d1..ddb4332767a 100644 --- a/vnet/vnet/classify/input_acl.c +++ b/vnet/vnet/classify/input_acl.c @@ -34,7 +34,7 @@ vnet_inacl_ip_feature_enable (vlib_main_t * vnm, else { /* IP[46] */ ip_lookup_main_t * lm; - ip_config_main_t * ipcm; + vnet_feature_config_main_t * ipcm; u32 ftype; u32 ci; diff --git a/vnet/vnet/classify/policer_classify.c b/vnet/vnet/classify/policer_classify.c index 498f83b5e0d..ada0dae34d0 100644 --- a/vnet/vnet/classify/policer_classify.c +++ b/vnet/vnet/classify/policer_classify.c @@ -29,7 +29,7 @@ vnet_policer_classify_feature_enable (vlib_main_t * vnm, else { ip_lookup_main_t * lm; - ip_config_main_t * ipcm; + vnet_feature_config_main_t * ipcm; u32 ftype; u32 ci; diff --git a/vnet/vnet/ethernet/ethernet.h b/vnet/vnet/ethernet/ethernet.h index 34ddb82bb0a..11bbd923a93 100644 --- a/vnet/vnet/ethernet/ethernet.h +++ b/vnet/vnet/ethernet/ethernet.h @@ -264,7 +264,7 @@ typedef struct u8 next_by_ethertype_register_called; /** per-interface features */ - ip_config_main_t feature_config_mains[VNET_N_IP_FEAT]; + vnet_feature_config_main_t feature_config_mains[VNET_N_IP_FEAT]; /** Feature path configuration lists */ vnet_feature_registration_t *next_feature[VNET_N_IP_FEAT]; diff --git a/vnet/vnet/ethernet/init.c b/vnet/vnet/ethernet/init.c index 7590abdb831..21817296a54 100644 --- a/vnet/vnet/ethernet/init.c +++ b/vnet/vnet/ethernet/init.c @@ -78,7 +78,8 @@ VNET_ETHERNET_TX_FEATURE_INIT (ethernet_tx_drop, static) = static clib_error_t * ethernet_feature_init (vlib_main_t * vm) { - ip_config_main_t *cm = ðernet_main.feature_config_mains[VNET_IP_TX_FEAT]; + vnet_feature_config_main_t *cm = + ðernet_main.feature_config_mains[VNET_IP_TX_FEAT]; vnet_config_main_t *vcm = &cm->config_main; return (vnet_feature_arc_init (vm, vcm, diff --git a/vnet/vnet/ip/feature_registration.c b/vnet/vnet/ip/feature_registration.c index 3964617b521..fd94bf1932c 100644 --- a/vnet/vnet/ip/feature_registration.c +++ b/vnet/vnet/ip/feature_registration.c @@ -62,7 +62,7 @@ <CODE><PRE> ip4_main_t *im = \&ip4_main; ip_lookup_main_t *lm = &im->lookup_main; - ip_config_main_t *rx_cm = + vnet_feature_config_main_t *rx_cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; sw_if_index = <interface-handle> @@ -95,7 +95,7 @@ <CODE><PRE> ip_lookup_main_t * lm = sm->ip4_lookup_main; - ip_config_main_t * cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t * cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; Call @c vnet_get_config_data to set next0, and to advance @c b0->current_config_index: @@ -414,7 +414,7 @@ VLIB_CLI_COMMAND (show_ip_features_command, static) = { void ip_interface_features_show (vlib_main_t * vm, const char *pname, - ip_config_main_t * cm, u32 sw_if_index) + vnet_feature_config_main_t * cm, u32 sw_if_index) { u32 node_index, current_config_index; vnet_cast_t cast; diff --git a/vnet/vnet/ip/feature_registration.h b/vnet/vnet/ip/feature_registration.h index ba7f97ce252..fcdd96b61bc 100644 --- a/vnet/vnet/ip/feature_registration.h +++ b/vnet/vnet/ip/feature_registration.h @@ -31,11 +31,11 @@ typedef struct _vnet_feature_registration char **runs_after; } vnet_feature_registration_t; -typedef struct ip_config_main_t_ +typedef struct vnet_feature_config_main_t_ { vnet_config_main_t config_main; u32 *config_index_by_sw_if_index; -} ip_config_main_t; +} vnet_feature_config_main_t; /** Syntactic sugar, the c-compiler won't initialize registrations without it */ #define ORDER_CONSTRAINTS (char*[]) @@ -49,7 +49,8 @@ clib_error_t *vnet_feature_arc_init (vlib_main_t * vm, void ip_interface_features_show (vlib_main_t * vm, const char *pname, - ip_config_main_t * cm, u32 sw_if_index); + vnet_feature_config_main_t * cm, + u32 sw_if_index); #endif /* included_feature_registration_h */ diff --git a/vnet/vnet/ip/ip.h b/vnet/vnet/ip/ip.h index c5882c58dff..a57d162c8c3 100644 --- a/vnet/vnet/ip/ip.h +++ b/vnet/vnet/ip/ip.h @@ -219,7 +219,7 @@ extern vlib_node_registration_t ip6_inacl_node; void vnet_config_update_tx_feature_count (ip_lookup_main_t * lm, - ip_config_main_t * tx_cm, + vnet_feature_config_main_t * tx_cm, u32 sw_if_index, int is_add); diff --git a/vnet/vnet/ip/ip4_forward.c b/vnet/vnet/ip/ip4_forward.c index d69a3c37dd7..632925a4a59 100644 --- a/vnet/vnet/ip/ip4_forward.c +++ b/vnet/vnet/ip/ip4_forward.c @@ -734,7 +734,7 @@ ip4_sw_interface_enable_disable (u32 sw_if_index, for (cast = 0; cast <= VNET_IP_RX_MULTICAST_FEAT; cast++) { - ip_config_main_t * cm = &lm->feature_config_mains[cast]; + vnet_feature_config_main_t * cm = &lm->feature_config_mains[cast]; vnet_config_main_t * vcm = &cm->config_main; vec_validate_init_empty (cm->config_index_by_sw_if_index, sw_if_index, ~0); @@ -969,7 +969,7 @@ ip4_feature_init (vlib_main_t * vm, ip4_main_t * im) ip_lookup_main_t * lm = &im->lookup_main; clib_error_t * error; vnet_cast_t cast; - ip_config_main_t * cm; + vnet_feature_config_main_t * cm; vnet_config_main_t * vcm; char **feature_start_nodes; int feature_start_len; @@ -1017,7 +1017,7 @@ ip4_sw_interface_add_del (vnet_main_t * vnm, for (cast = 0; cast < VNET_N_IP_FEAT; cast++) { - ip_config_main_t * cm = &lm->feature_config_mains[cast]; + vnet_feature_config_main_t * cm = &lm->feature_config_mains[cast]; vnet_config_main_t * vcm = &cm->config_main; vec_validate_init_empty (cm->config_index_by_sw_if_index, sw_if_index, ~0); @@ -2184,7 +2184,7 @@ ip4_rewrite_inline (vlib_main_t * vm, u32 n_left_from, n_left_to_next, * to_next, next_index; vlib_node_runtime_t * error_node = vlib_node_get_runtime (vm, ip4_input_node.index); vlib_rx_or_tx_t adj_rx_tx = rewrite_for_locally_received_packets ? VLIB_RX : VLIB_TX; - ip_config_main_t * cm = &lm->feature_config_mains[VNET_IP_TX_FEAT]; + vnet_feature_config_main_t * cm = &lm->feature_config_mains[VNET_IP_TX_FEAT]; n_left_from = frame->n_vectors; next_index = node->cached_next_index; diff --git a/vnet/vnet/ip/ip4_input.c b/vnet/vnet/ip/ip4_input.c index 2de2d4756b3..268f7afa828 100644 --- a/vnet/vnet/ip/ip4_input.c +++ b/vnet/vnet/ip/ip4_input.c @@ -108,7 +108,7 @@ ip4_input_inline (vlib_main_t * vm, { vlib_buffer_t * p0, * p1; ip4_header_t * ip0, * ip1; - ip_config_main_t * cm0, * cm1; + vnet_feature_config_main_t * cm0, * cm1; u32 sw_if_index0, pi0, ip_len0, cur_len0, next0; u32 sw_if_index1, pi1, ip_len1, cur_len1, next1; i32 len_diff0, len_diff1; @@ -245,7 +245,7 @@ ip4_input_inline (vlib_main_t * vm, { vlib_buffer_t * p0; ip4_header_t * ip0; - ip_config_main_t * cm0; + vnet_feature_config_main_t * cm0; u32 sw_if_index0, pi0, ip_len0, cur_len0, next0; i32 len_diff0; u8 error0, cast0; @@ -343,7 +343,7 @@ ip4_input_inline (vlib_main_t * vm, @par Graph mechanics: buffer metadata, next index usage @em Uses: - - ip_config_main_t cm corresponding to each pkt's dst address unicast / + - vnet_feature_config_main_t cm corresponding to each pkt's dst address unicast / multicast status. - <code>b->current_config_index</code> corresponding to each pkt's rx sw_if_index. diff --git a/vnet/vnet/ip/ip4_source_and_port_range_check.c b/vnet/vnet/ip/ip4_source_and_port_range_check.c index 6ee648cea51..8b69522aebe 100644 --- a/vnet/vnet/ip/ip4_source_and_port_range_check.c +++ b/vnet/vnet/ip/ip4_source_and_port_range_check.c @@ -156,9 +156,10 @@ ip4_source_and_port_range_check_inline (vlib_main_t * vm, { ip4_main_t *im = &ip4_main; ip_lookup_main_t *lm = &im->lookup_main; - ip_config_main_t *rx_cm = + vnet_feature_config_main_t *rx_cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; - ip_config_main_t *tx_cm = &lm->feature_config_mains[VNET_IP_TX_FEAT]; + vnet_feature_config_main_t *tx_cm = + &lm->feature_config_mains[VNET_IP_TX_FEAT]; u32 n_left_from, *from, *to_next; u32 next_index; vlib_node_runtime_t *error_node = node; @@ -640,9 +641,10 @@ set_ip_source_and_port_range_check (vlib_main_t * vm, { ip4_main_t *im = &ip4_main; ip_lookup_main_t *lm = &im->lookup_main; - ip_config_main_t *rx_cm = + vnet_feature_config_main_t *rx_cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; - ip_config_main_t *tx_cm = &lm->feature_config_mains[VNET_IP_TX_FEAT]; + vnet_feature_config_main_t *tx_cm = + &lm->feature_config_mains[VNET_IP_TX_FEAT]; u32 ci; ip_source_and_port_range_check_config_t config; u32 feature_index; diff --git a/vnet/vnet/ip/ip4_source_check.c b/vnet/vnet/ip/ip4_source_check.c index b7913845bac..62ebcb7268a 100644 --- a/vnet/vnet/ip/ip4_source_check.c +++ b/vnet/vnet/ip/ip4_source_check.c @@ -90,7 +90,7 @@ ip4_source_check_inline (vlib_main_t * vm, { ip4_main_t * im = &ip4_main; ip_lookup_main_t * lm = &im->lookup_main; - ip_config_main_t * cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t * cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; u32 n_left_from, * from, * to_next; u32 next_index; vlib_node_runtime_t * error_node = vlib_node_get_runtime (vm, ip4_input_node.index); @@ -335,7 +335,7 @@ set_ip_source_check (vlib_main_t * vm, vnet_main_t * vnm = vnet_get_main(); ip4_main_t * im = &ip4_main; ip_lookup_main_t * lm = &im->lookup_main; - ip_config_main_t * rx_cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t * rx_cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; clib_error_t * error = 0; u32 sw_if_index, is_del, ci; ip4_source_check_config_t config; diff --git a/vnet/vnet/ip/ip6_forward.c b/vnet/vnet/ip/ip6_forward.c index bdcdbf0dc82..2873e2bdaeb 100644 --- a/vnet/vnet/ip/ip6_forward.c +++ b/vnet/vnet/ip/ip6_forward.c @@ -435,7 +435,7 @@ ip6_sw_interface_enable_disable (u32 sw_if_index, for (cast = 0; cast <= VNET_IP_RX_MULTICAST_FEAT; cast++) { - ip_config_main_t * cm = &lm->feature_config_mains[cast]; + vnet_feature_config_main_t * cm = &lm->feature_config_mains[cast]; vnet_config_main_t * vcm = &cm->config_main; vec_validate_init_empty (cm->config_index_by_sw_if_index, sw_if_index, ~0); @@ -671,7 +671,7 @@ ip6_feature_init (vlib_main_t * vm, ip6_main_t * im) ip_lookup_main_t * lm = &im->lookup_main; clib_error_t * error; vnet_cast_t cast; - ip_config_main_t * cm; + vnet_feature_config_main_t * cm; vnet_config_main_t * vcm; char **feature_start_nodes; int feature_start_len; @@ -715,7 +715,7 @@ ip6_sw_interface_add_del (vnet_main_t * vnm, for (cast = 0; cast < VNET_N_IP_FEAT; cast++) { - ip_config_main_t * cm = &lm->feature_config_mains[cast]; + vnet_feature_config_main_t * cm = &lm->feature_config_mains[cast]; vnet_config_main_t * vcm = &cm->config_main; vec_validate_init_empty (cm->config_index_by_sw_if_index, sw_if_index, ~0); @@ -1827,7 +1827,7 @@ ip6_rewrite_inline (vlib_main_t * vm, u32 n_left_from, n_left_to_next, * to_next, next_index; vlib_node_runtime_t * error_node = vlib_node_get_runtime (vm, ip6_input_node.index); vlib_rx_or_tx_t adj_rx_tx = rewrite_for_locally_received_packets ? VLIB_RX : VLIB_TX; - ip_config_main_t * cm = &lm->feature_config_mains[VNET_IP_TX_FEAT]; + vnet_feature_config_main_t * cm = &lm->feature_config_mains[VNET_IP_TX_FEAT]; n_left_from = frame->n_vectors; next_index = node->cached_next_index; diff --git a/vnet/vnet/ip/ip6_input.c b/vnet/vnet/ip/ip6_input.c index 15791245176..a355abfdb39 100644 --- a/vnet/vnet/ip/ip6_input.c +++ b/vnet/vnet/ip/ip6_input.c @@ -105,7 +105,7 @@ ip6_input (vlib_main_t * vm, { vlib_buffer_t * p0, * p1; ip6_header_t * ip0, * ip1; - ip_config_main_t * cm0, * cm1; + vnet_feature_config_main_t * cm0, * cm1; u32 pi0, sw_if_index0, next0; u32 pi1, sw_if_index1, next1; u8 error0, error1, cast0, cast1; @@ -217,7 +217,7 @@ ip6_input (vlib_main_t * vm, { vlib_buffer_t * p0; ip6_header_t * ip0; - ip_config_main_t * cm0; + vnet_feature_config_main_t * cm0; u32 pi0, sw_if_index0, next0; u8 error0, cast0; diff --git a/vnet/vnet/ip/ip_init.c b/vnet/vnet/ip/ip_init.c index 603d1f7e172..c89f60c09d7 100644 --- a/vnet/vnet/ip/ip_init.c +++ b/vnet/vnet/ip/ip_init.c @@ -146,7 +146,7 @@ VLIB_INIT_FUNCTION (ip_main_init); void vnet_config_update_tx_feature_count (ip_lookup_main_t * lm, - ip_config_main_t * tx_cm, + vnet_feature_config_main_t * tx_cm, u32 sw_if_index, int is_add) { diff --git a/vnet/vnet/ip/lookup.h b/vnet/vnet/ip/lookup.h index b73191cc4d8..a1fbe6eb289 100644 --- a/vnet/vnet/ip/lookup.h +++ b/vnet/vnet/ip/lookup.h @@ -357,7 +357,7 @@ typedef struct ip_lookup_main_t { u32 * classify_table_index_by_sw_if_index; /** rx unicast, multicast, tx interface/feature configuration. */ - ip_config_main_t feature_config_mains[VNET_N_IP_FEAT]; + vnet_feature_config_main_t feature_config_mains[VNET_N_IP_FEAT]; /** Number of bytes in a fib result. Must be at least sizeof (uword). First word is always adjacency index. */ diff --git a/vnet/vnet/ipsec/ipsec.c b/vnet/vnet/ipsec/ipsec.c index 3e343834a42..3f2bad9fc1f 100644 --- a/vnet/vnet/ipsec/ipsec.c +++ b/vnet/vnet/ipsec/ipsec.c @@ -41,7 +41,7 @@ ipsec_set_interface_spd (vlib_main_t * vm, u32 sw_if_index, u32 spd_id, { ipsec_main_t *im = &ipsec_main; ip_lookup_main_t *lm; - ip_config_main_t *rx_cm; + vnet_feature_config_main_t *rx_cm; ip4_ipsec_config_t config; u32 spd_index, ci; diff --git a/vnet/vnet/ipsec/ipsec_input.c b/vnet/vnet/ipsec/ipsec_input.c index c499b2db5e3..8b75c1255a7 100644 --- a/vnet/vnet/ipsec/ipsec_input.c +++ b/vnet/vnet/ipsec/ipsec_input.c @@ -189,7 +189,8 @@ ipsec_input_ip4_node_fn (vlib_main_t * vm, { ip4_main_t *i4m = &ip4_main; ip_lookup_main_t *lm = &i4m->lookup_main; - ip_config_main_t *cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t *cm = + &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; u32 n_left_from, *from, next_index, *to_next; ipsec_main_t *im = &ipsec_main; @@ -324,7 +325,8 @@ VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn) { ip6_main_t *i6m = &ip6_main; ip_lookup_main_t *lm = &i6m->lookup_main; - ip_config_main_t *cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t *cm = + &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; u32 n_left_from, *from, next_index, *to_next; ipsec_main_t *im = &ipsec_main; diff --git a/vnet/vnet/l2tp/decap.c b/vnet/vnet/l2tp/decap.c index dfd846aced3..e041fdf2cd4 100644 --- a/vnet/vnet/l2tp/decap.c +++ b/vnet/vnet/l2tp/decap.c @@ -220,7 +220,7 @@ done: /* Go to next node on the ip6 configuration chain */ ip6_main_t *im = &ip6_main; ip_lookup_main_t *lm = &im->lookup_main; - ip_config_main_t *cm = + vnet_feature_config_main_t *cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; ip6_l2tpv3_config_t *c0; diff --git a/vnet/vnet/l2tp/l2tp.c b/vnet/vnet/l2tp/l2tp.c index 13854e2ff30..c6da86607e3 100644 --- a/vnet/vnet/l2tp/l2tp.c +++ b/vnet/vnet/l2tp/l2tp.c @@ -602,7 +602,7 @@ l2tpv3_interface_enable_disable (vnet_main_t * vnm, { ip6_main_t *im = &ip6_main; ip_lookup_main_t *lm = &im->lookup_main; - ip_config_main_t *rx_cm = + vnet_feature_config_main_t *rx_cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; u32 ci; ip6_l2tpv3_config_t config; diff --git a/vnet/vnet/mpls/interface.c b/vnet/vnet/mpls/interface.c index af0428cec8d..9fd93ff8701 100644 --- a/vnet/vnet/mpls/interface.c +++ b/vnet/vnet/mpls/interface.c @@ -277,7 +277,7 @@ mpls_sw_interface_enable_disable (mpls_main_t * mm, u8 is_enable) { vlib_main_t * vm = vlib_get_main(); - ip_config_main_t * cm = &mm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t * cm = &mm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; vnet_config_main_t * vcm = &cm->config_main; u32 lookup_feature_index; fib_node_index_t lfib_index; diff --git a/vnet/vnet/mpls/mpls.h b/vnet/vnet/mpls/mpls.h index da663b0b788..85973d862dc 100644 --- a/vnet/vnet/mpls/mpls.h +++ b/vnet/vnet/mpls/mpls.h @@ -95,7 +95,7 @@ typedef struct { uword *fib_index_by_table_id; /* rx/tx interface/feature configuration. */ - ip_config_main_t feature_config_mains[VNET_N_IP_FEAT]; + vnet_feature_config_main_t feature_config_mains[VNET_N_IP_FEAT]; /* Built-in unicast feature path indices, see vnet_feature_arc_init(...) */ u32 mpls_rx_feature_lookup; diff --git a/vnet/vnet/mpls/mpls_features.c b/vnet/vnet/mpls/mpls_features.c index 3eb469c8768..10a58cfb09c 100644 --- a/vnet/vnet/mpls/mpls_features.c +++ b/vnet/vnet/mpls/mpls_features.c @@ -133,7 +133,7 @@ static char * tx_feature_start_nodes[] = clib_error_t * mpls_feature_init (vlib_main_t * vm) { - ip_config_main_t * cm = &mpls_main.feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; + vnet_feature_config_main_t * cm = &mpls_main.feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; vnet_config_main_t * vcm = &cm->config_main; clib_error_t *error; @@ -171,7 +171,7 @@ mpls_sw_interface_add_del (vnet_main_t * vnm, for (cast = 0; cast < VNET_N_IP_FEAT; cast++) { - ip_config_main_t * cm = &mm->feature_config_mains[cast]; + vnet_feature_config_main_t * cm = &mm->feature_config_mains[cast]; vnet_config_main_t * vcm = &cm->config_main; if (VNET_IP_RX_MULTICAST_FEAT == cast) diff --git a/vnet/vnet/mpls/node.c b/vnet/vnet/mpls/node.c index 5b8f2569e77..7a4a302315a 100644 --- a/vnet/vnet/mpls/node.c +++ b/vnet/vnet/mpls/node.c @@ -96,7 +96,7 @@ mpls_input_inline (vlib_main_t * vm, mpls_unicast_header_t * h0; u32 label0; u32 next0; - ip_config_main_t * cm0; + vnet_feature_config_main_t * cm0; u32 sw_if_index0; bi0 = from[0]; diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c index 832ea66e914..81cd8c358ff 100644 --- a/vpp/vpp-api/api.c +++ b/vpp/vpp-api/api.c @@ -1581,13 +1581,13 @@ vl_api_sw_interface_set_vpath_t_handler (vl_api_sw_interface_set_vpath_t * mp) ip6_main_t *ip6m = &ip6_main; ip_lookup_main_t *ip4lm = &ip4m->lookup_main; ip_lookup_main_t *ip6lm = &ip6m->lookup_main; - ip_config_main_t *rx_cm4u = + vnet_feature_config_main_t *rx_cm4u = &ip4lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; - ip_config_main_t *rx_cm4m = + vnet_feature_config_main_t *rx_cm4m = &ip4lm->feature_config_mains[VNET_IP_RX_MULTICAST_FEAT]; - ip_config_main_t *rx_cm6u = + vnet_feature_config_main_t *rx_cm6u = &ip6lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT]; - ip_config_main_t *rx_cm6m = + vnet_feature_config_main_t *rx_cm6m = &ip6lm->feature_config_mains[VNET_IP_RX_MULTICAST_FEAT]; VALIDATE_SW_IF_INDEX (mp); |