diff options
| author |   Filip Varga <fivarga@cisco.com> | 2019-02-13 01:42:59 -0800 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-02-18 16:46:50 +0000 |
| commit | e69e423743630b52e13db58c3f0229df8a46c07f (patch) | |
| tree | 5471b64b7fe38031f47791c987f9791fc8207fa7 /src/plugins/nat/nat_det_out2in.c | |
| parent | 7dcb80a202f1ce075434a17ace3334a7a311e84e (diff) | |
NAT: VPP-1552 code migration from old multiarch scheme
Change-Id: I88f3df8aaa521e7707ef3335acdbf1ab41e7ee28
Signed-off-by: Filip Varga <fivarga@cisco.com>
Diffstat (limited to 'src/plugins/nat/nat_det_out2in.c')
| -rw-r--r-- | src/plugins/nat/nat_det_out2in.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/plugins/nat/nat_det_out2in.c b/src/plugins/nat/nat_det_out2in.c index 9e8ba27285b..45fba18b248 100644 --- a/src/plugins/nat/nat_det_out2in.c +++ b/src/plugins/nat/nat_det_out2in.c @@ -62,8 +62,6 @@ static char *nat_det_out2in_error_strings[] = { #undef _ }; -vlib_node_registration_t snat_det_out2in_node; - static u8 * format_nat_det_out2in_trace (u8 * s, va_list * args) { @@ -78,6 +76,7 @@ format_nat_det_out2in_trace (u8 * s, va_list * args) return s; } +#ifndef CLIB_MARCH_VARIANT /** * Get address and port values to be used for ICMP packet translation * and create session if needed @@ -217,10 +216,11 @@ out: *(snat_det_map_t **) e = dm0; return next0; } +#endif -static uword -snat_det_out2in_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (snat_det_out2in_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { u32 n_left_from, *from, *to_next; nat_det_out2in_next_t next_index; @@ -680,7 +680,7 @@ snat_det_out2in_node_fn (vlib_main_t * vm, vlib_put_next_frame (vm, node, next_index, n_left_to_next); } - vlib_node_increment_counter (vm, snat_det_out2in_node.index, + vlib_node_increment_counter (vm, sm->det_out2in_node_index, NAT_DET_OUT2IN_ERROR_OUT2IN_PACKETS, pkts_processed); return frame->n_vectors; @@ -688,7 +688,6 @@ snat_det_out2in_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (snat_det_out2in_node) = { - .function = snat_det_out2in_node_fn, .name = "nat44-det-out2in", .vector_size = sizeof (u32), .format_trace = format_nat_det_out2in_trace, @@ -706,8 +705,6 @@ VLIB_REGISTER_NODE (snat_det_out2in_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (snat_det_out2in_node, snat_det_out2in_node_fn); - /* * fd.io coding-style-patch-verification: ON * |