From 5581de6d6d69388f899692f2dc201ff76a06af3d Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Fri, 24 Apr 2020 12:24:41 +0000 Subject: nat: make usage of vnet_buffer2 transparent Type: fix Signed-off-by: Klement Sekera Change-Id: I50df248afb3f6b46c49e6695b3f124cfd584f016 --- src/plugins/nat/in2out_ed.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins/nat/in2out_ed.c') diff --git a/src/plugins/nat/in2out_ed.c b/src/plugins/nat/in2out_ed.c index 295958927cd..ca1d0cd56ca 100644 --- a/src/plugins/nat/in2out_ed.c +++ b/src/plugins/nat/in2out_ed.c @@ -1027,11 +1027,11 @@ nat44_ed_in2out_fast_path_node_fn_inline (vlib_main_t * vm, if (is_output_feature) { - vnet_feature_next (&nat_buffer_opaque (b0)->arc_next, b0); + vnet_feature_next (&vnet_buffer2 (b0)->nat.arc_next, b0); iph_offset0 = vnet_buffer (b0)->ip.reass.save_rewrite_length; } - next0 = nat_buffer_opaque (b0)->arc_next; + next0 = vnet_buffer2 (b0)->nat.arc_next; ip0 = (ip4_header_t *) ((u8 *) vlib_buffer_get_current (b0) + iph_offset0); @@ -1232,7 +1232,7 @@ nat44_ed_in2out_fast_path_node_fn_inline (vlib_main_t * vm, t->session_index = ~0; } - pkts_processed += next0 == nat_buffer_opaque (b0)->arc_next; + pkts_processed += next0 == vnet_buffer2 (b0)->nat.arc_next; /* verify speculative enqueue, maybe switch current next frame */ vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, n_left_to_next, @@ -1312,7 +1312,7 @@ nat44_ed_in2out_slow_path_node_fn_inline (vlib_main_t * vm, if (is_output_feature) iph_offset0 = vnet_buffer (b0)->ip.reass.save_rewrite_length; - next0 = nat_buffer_opaque (b0)->arc_next; + next0 = vnet_buffer2 (b0)->nat.arc_next; ip0 = (ip4_header_t *) ((u8 *) vlib_buffer_get_current (b0) + iph_offset0); @@ -1536,7 +1536,7 @@ nat44_ed_in2out_slow_path_node_fn_inline (vlib_main_t * vm, t->session_index = ~0; } - pkts_processed += next0 == nat_buffer_opaque (b0)->arc_next; + pkts_processed += next0 == vnet_buffer2 (b0)->nat.arc_next; /* verify speculative enqueue, maybe switch current next frame */ vlib_validate_buffer_enqueue_x1 (vm, node, next_index, -- cgit 1.2.3-korg