From 5d0136f09944b0d7ea9d1db5c368d4d0b36cedd2 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Tue, 12 May 2020 08:51:02 +0000 Subject: feature: Config end nodes are user specific Type: fix it is possible for a user to change the end node of a feature arc, but this change should only apply to that 'instnace' of the arc, not all arcs. for example, if a tunnel has its ipx-output end node changed to adj-midchain-tx, this shouldn't affect all ipx-output arcs. obviously... Signed-off-by: Neale Ranns Change-Id: I41daea7ba6907963e42140307d065c8bcfdcb585 --- src/vnet/adj/adj_midchain.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/vnet/adj/adj_midchain.c') diff --git a/src/vnet/adj/adj_midchain.c b/src/vnet/adj/adj_midchain.c index 4741ec9a953..050c25a9e34 100644 --- a/src/vnet/adj/adj_midchain.c +++ b/src/vnet/adj/adj_midchain.c @@ -361,7 +361,7 @@ adj_midchain_teardown (ip_adjacency_t *adj) dpo_reset(&adj->sub_type.midchain.next_dpo); vlib_worker_thread_barrier_sync(vm); - vnet_feature_modify_end_node( + adj->ia_cfg_index = vnet_feature_modify_end_node( adj_midchain_get_feature_arc_index_for_link_type (adj), adj->rewrite_header.sw_if_index, vlib_get_node_by_name (vlib_get_main(), @@ -405,7 +405,7 @@ adj_midchain_setup (adj_index_t adj_index, tx_node = adj_nbr_midchain_get_tx_node(adj); vlib_worker_thread_barrier_sync(vm); - vnet_feature_modify_end_node( + adj->ia_cfg_index = vnet_feature_modify_end_node( adj_midchain_get_feature_arc_index_for_link_type (adj), adj->rewrite_header.sw_if_index, tx_node); @@ -481,7 +481,7 @@ adj_nbr_midchain_update_next_node (adj_index_t adj_index, adj->ia_node_index, next_node); - vnet_feature_modify_end_node( + adj->ia_cfg_index = vnet_feature_modify_end_node( adj_midchain_get_feature_arc_index_for_link_type (adj), adj->rewrite_header.sw_if_index, next_node); @@ -490,7 +490,7 @@ adj_nbr_midchain_update_next_node (adj_index_t adj_index, } void -adj_nbr_midchain_reset_next_node(adj_index_t adj_index) +adj_nbr_midchain_reset_next_node (adj_index_t adj_index) { ip_adjacency_t *adj; vlib_main_t * vm; @@ -507,7 +507,7 @@ adj_nbr_midchain_reset_next_node(adj_index_t adj_index) adj->ia_node_index, adj_nbr_midchain_get_tx_node(adj)); - vnet_feature_modify_end_node( + adj->ia_cfg_index = vnet_feature_modify_end_node( adj_midchain_get_feature_arc_index_for_link_type (adj), adj->rewrite_header.sw_if_index, adj_nbr_midchain_get_tx_node(adj)); -- cgit 1.2.3-korg