summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2016-08-17 11:54:30 -0400
committerKeith Burns <alagalah@gmail.com>2016-08-19 18:42:04 +0000
commit5331c72daa9f7d345915a865df898cff652289ac (patch)
tree91f6d8fa0fa32f4052790d83d97c1402158ef67e /plugins
parent5e15c91b6c2b5fbd7f989c5dc4edde506d254926 (diff)
VPP-337 Add per interface IN filtering
- ip post-rewrite feature subgraph arc support Change-Id: Ia4b07197463021ade916326231af246e2559a290 Signed-off-by: Dave Barach <dave@barachs.net> Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/ila-plugin/ila/ila.c11
-rw-r--r--plugins/snat-plugin/snat/out2in.c2
-rw-r--r--plugins/snat-plugin/snat/snat.c8
3 files changed, 11 insertions, 10 deletions
diff --git a/plugins/ila-plugin/ila/ila.c b/plugins/ila-plugin/ila/ila.c
index 2673c6269d2..99d1db8a047 100644
--- a/plugins/ila-plugin/ila/ila.c
+++ b/plugins/ila-plugin/ila/ila.c
@@ -421,7 +421,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->rx_config_mains[VNET_UNICAST];
+ ip_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;
@@ -592,9 +592,10 @@ VLIB_REGISTER_NODE (ila_sir2ila_node, static) =
VNET_IP6_UNICAST_FEATURE_INIT (ila_sir2ila, static) =
{
- .node_name = "sir-to-ila",.runs_before =
- {
-"ip6-lookup", 0},.feature_index = &ila_main.ila_sir2ila_feature_index,};
+ .node_name = "sir-to-ila",
+ .runs_before = ORDER_CONSTRAINTS{"ip6-lookup", 0},
+ .feature_index = &ila_main.ila_sir2ila_feature_index,
+};
int
ila_add_del_entry (ila_add_del_entry_args_t * args)
@@ -769,7 +770,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->rx_config_mains[VNET_UNICAST];
+ ip_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 0fa96c97f83..861dae63b0a 100644
--- a/plugins/snat-plugin/snat/out2in.c
+++ b/plugins/snat-plugin/snat/out2in.c
@@ -163,7 +163,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->rx_config_mains[VNET_UNICAST];
+ ip_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);
diff --git a/plugins/snat-plugin/snat/snat.c b/plugins/snat-plugin/snat/snat.c
index 3675602e917..f3e278bfad6 100644
--- a/plugins/snat-plugin/snat/snat.c
+++ b/plugins/snat-plugin/snat/snat.c
@@ -80,12 +80,12 @@ do { \
/* Hook up input features */
VNET_IP4_UNICAST_FEATURE_INIT (ip4_snat_in2out, static) = {
.node_name = "snat-in2out",
- .runs_before = {"snat-out2in", 0},
+ .runs_before = (char *[]){"snat-out2in", 0},
.feature_index = &snat_main.rx_feature_in2out,
};
VNET_IP4_UNICAST_FEATURE_INIT (ip4_snat_out2in, static) = {
.node_name = "snat-out2in",
- .runs_before = {"ip4-lookup", 0},
+ .runs_before = (char *[]){"ip4-lookup", 0},
.feature_index = &snat_main.rx_feature_out2in,
};
@@ -257,7 +257,7 @@ vl_api_snat_interface_add_del_feature_t_handler
u32 ci;
ip4_main_t * im = &ip4_main;
ip_lookup_main_t * lm = &im->lookup_main;
- ip_config_main_t * rx_cm = &lm->rx_config_mains[VNET_UNICAST];
+ ip_config_main_t * rx_cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT];
u32 feature_index;
int rv = 0;
@@ -471,7 +471,7 @@ snat_feature_command_fn (vlib_main_t * vm,
snat_main_t * sm = &snat_main;
ip4_main_t * im = &ip4_main;
ip_lookup_main_t * lm = &im->lookup_main;
- ip_config_main_t * rx_cm = &lm->rx_config_mains[VNET_UNICAST];
+ ip_config_main_t * rx_cm = &lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT];
clib_error_t * error = 0;
u32 sw_if_index, ci;
u32 feature_index;