aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatus Fabian <matfabia@cisco.com>2018-09-24 03:44:49 -0700
committerOle Trøan <otroan@employees.org>2018-09-25 07:32:46 +0000
commit51a0b0bc3b1b51a7fe1c3cb45214c6de1ff2a865 (patch)
tree6dd7c40fb8487273d0d18bf9087a242247c18183
parent8fdc015ddde7620d37d5a46cc66deb9791e634c1 (diff)
NAT44: fix nat44_o2i_ed_is_idle_session_cb (VPP-1424)
Change-Id: I47e1fc789ddf3dbfdf9768b99d5c3a8804d6b750 Signed-off-by: Matus Fabian <matfabia@cisco.com>
-rw-r--r--src/plugins/nat/in2out_ed.c3
-rw-r--r--src/plugins/nat/out2in_ed.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/nat/in2out_ed.c b/src/plugins/nat/in2out_ed.c
index 77630268047..31977acf2a3 100644
--- a/src/plugins/nat/in2out_ed.c
+++ b/src/plugins/nat/in2out_ed.c
@@ -238,9 +238,6 @@ icmp_in2out_ed_slow_path (snat_main_t * sm, vlib_buffer_t * b0,
snat_session_t *s0 = *p_s0;
if (PREDICT_TRUE (next0 != NAT_IN2OUT_ED_NEXT_DROP && s0))
{
- /* Hairpinning */
- if (vnet_buffer (b0)->sw_if_index[VLIB_TX] == ~0)
- snat_icmp_hairpinning (sm, b0, ip0, icmp0, sm->endpoint_dependent);
/* Accounting */
nat44_session_update_counters (s0, now,
vlib_buffer_length_in_chain
diff --git a/src/plugins/nat/out2in_ed.c b/src/plugins/nat/out2in_ed.c
index ef772334292..1a9f8979c42 100644
--- a/src/plugins/nat/out2in_ed.c
+++ b/src/plugins/nat/out2in_ed.c
@@ -137,7 +137,7 @@ nat44_o2i_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg)
{
ed_key.l_addr = s->in2out.addr;
ed_key.r_addr = s->ext_host_addr;
- ed_key.fib_index = s->out2in.fib_index;
+ ed_key.fib_index = s->in2out.fib_index;
if (snat_is_unk_proto_session (s))
{
ed_key.proto = s->in2out.port;