diff options
Diffstat (limited to 'src/plugins/nat/nat44_classify.c')
| -rw-r--r-- | src/plugins/nat/nat44_classify.c | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/src/plugins/nat/nat44_classify.c b/src/plugins/nat/nat44_classify.c index ed0c37ea21a..5401b5b70ee 100644 --- a/src/plugins/nat/nat44_classify.c +++ b/src/plugins/nat/nat44_classify.c @@ -24,11 +24,6 @@ #include <nat/nat_reass.h> #include <nat/nat_inlines.h> -vlib_node_registration_t nat44_classify_node; -vlib_node_registration_t nat44_ed_classify_node; -vlib_node_registration_t nat44_det_classify_node; -vlib_node_registration_t nat44_handoff_classify_node; - #define foreach_nat44_classify_error \ _(MAX_REASS, "Maximum reassemblies exceeded") \ _(MAX_FRAG, "Maximum fragments per reassembly exceeded") \ @@ -418,16 +413,15 @@ nat44_classify_node_fn_inline (vlib_main_t * vm, return frame->n_vectors; } -static uword -nat44_classify_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (nat44_classify_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return nat44_classify_node_fn_inline (vm, node, frame, 0); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat44_classify_node) = { - .function = nat44_classify_node_fn, .name = "nat44-classify", .vector_size = sizeof (u32), .format_trace = format_nat44_classify_trace, @@ -443,17 +437,15 @@ VLIB_REGISTER_NODE (nat44_classify_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (nat44_classify_node, nat44_classify_node_fn); -static uword -nat44_ed_classify_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (nat44_ed_classify_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return nat44_classify_node_fn_inline (vm, node, frame, 1); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat44_ed_classify_node) = { - .function = nat44_ed_classify_node_fn, .name = "nat44-ed-classify", .vector_size = sizeof (u32), .format_trace = format_nat44_classify_trace, @@ -467,19 +459,15 @@ VLIB_REGISTER_NODE (nat44_ed_classify_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_classify_node, - nat44_ed_classify_node_fn); - -static uword -nat44_det_classify_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (nat44_det_classify_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return nat44_classify_node_fn_inline (vm, node, frame, 0); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat44_det_classify_node) = { - .function = nat44_det_classify_node_fn, .name = "nat44-det-classify", .vector_size = sizeof (u32), .format_trace = format_nat44_classify_trace, @@ -493,20 +481,15 @@ VLIB_REGISTER_NODE (nat44_det_classify_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (nat44_det_classify_node, - nat44_det_classify_node_fn); - -static uword -nat44_handoff_classify_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame) +VLIB_NODE_FN (nat44_handoff_classify_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return nat44_classify_node_fn_inline (vm, node, frame, 0); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat44_handoff_classify_node) = { - .function = nat44_handoff_classify_node_fn, .name = "nat44-handoff-classify", .vector_size = sizeof (u32), .format_trace = format_nat44_classify_trace, @@ -519,8 +502,6 @@ VLIB_REGISTER_NODE (nat44_handoff_classify_node) = { }, }; -VLIB_NODE_FUNCTION_MULTIARCH (nat44_handoff_classify_node, - nat44_handoff_classify_node_fn); /* *INDENT-ON* */ /* |