From d5b1b85d2e776718169f930f592af5184a18100a Mon Sep 17 00:00:00 2001 From: dongjuan Date: Fri, 15 Sep 2017 10:21:07 +0800 Subject: Modify return value of snat_out2in_lb(VPP-985) in order to trace session_index Change-Id: I4433155fbe21635f8a997523e2c7900c6a7569af Signed-off-by: dongjuan --- src/plugins/nat/out2in.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) mode change 100644 => 100755 src/plugins/nat/out2in.c (limited to 'src/plugins/nat/out2in.c') diff --git a/src/plugins/nat/out2in.c b/src/plugins/nat/out2in.c old mode 100644 new mode 100755 index 55a750e4..52adc8a8 --- a/src/plugins/nat/out2in.c +++ b/src/plugins/nat/out2in.c @@ -750,7 +750,7 @@ snat_out2in_unknown_proto (snat_main_t *sm, s->per_user_index); } -static void +static snat_session_t * snat_out2in_lb (snat_main_t *sm, vlib_buffer_t * b, ip4_header_t * ip, @@ -797,7 +797,7 @@ snat_out2in_lb (snat_main_t *sm, e_key.protocol = proto; e_key.fib_index = rx_fib_index; if (snat_static_mapping_match(sm, e_key, &l_key, 1, 0)) - return; + return 0; u_key.addr = l_key.addr; u_key.fib_index = l_key.fib_index; @@ -894,6 +894,7 @@ snat_out2in_lb (snat_main_t *sm, s->last_heard = now; s->total_pkts++; s->total_bytes += vlib_buffer_length_in_chain (vm, b); + return s; } static uword @@ -1044,7 +1045,7 @@ snat_out2in_node_fn (vlib_main_t * vm, { if (PREDICT_FALSE (value0.value == ~0ULL)) { - snat_out2in_lb(sm, b0, ip0, rx_fib_index0, thread_index, now, + s0 = snat_out2in_lb(sm, b0, ip0, rx_fib_index0, thread_index, now, vm); goto trace0; } @@ -1195,7 +1196,7 @@ snat_out2in_node_fn (vlib_main_t * vm, { if (PREDICT_FALSE (value1.value == ~0ULL)) { - snat_out2in_lb(sm, b1, ip1, rx_fib_index1, thread_index, now, + s1 = snat_out2in_lb(sm, b1, ip1, rx_fib_index1, thread_index, now, vm); goto trace1; } @@ -1383,7 +1384,7 @@ snat_out2in_node_fn (vlib_main_t * vm, { if (PREDICT_FALSE (value0.value == ~0ULL)) { - snat_out2in_lb(sm, b0, ip0, rx_fib_index0, thread_index, now, + s0 = snat_out2in_lb(sm, b0, ip0, rx_fib_index0, thread_index, now, vm); goto trace00; } -- cgit 1.2.3-korg