From: Matus Fabian <matfabia@cisco.com>
Date: Tue, 3 Jan 2017 12:56:09 +0000 (-0800)
Subject: SNAT: fix out2in ICMP worker lookup
X-Git-Tag: v17.04-rc1~434
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F27%2F4527%2F2;p=vpp.git

SNAT: fix out2in ICMP worker lookup

Change-Id: I113e7927739de876f07c3f17454ad7499a74c634
Signed-off-by: Matus Fabian <matfabia@cisco.com>
---

diff --git a/src/plugins/snat/out2in.c b/src/plugins/snat/out2in.c
index f1f4159cdce..9e5a8af8743 100644
--- a/src/plugins/snat/out2in.c
+++ b/src/plugins/snat/out2in.c
@@ -872,6 +872,13 @@ snat_out2in_worker_handoff_fn (vlib_main_t * vm,
       key0.port = udp0->dst_port;
       key0.fib_index = rx_fib_index0;
 
+      if (PREDICT_FALSE(ip0->protocol == IP_PROTOCOL_ICMP))
+        {
+          icmp46_header_t * icmp0 = (icmp46_header_t *) udp0;
+          icmp_echo_header_t *echo0 = (icmp_echo_header_t *)(icmp0+1);
+          key0.port = echo0->identifier;
+        }
+
       kv0.key = key0.as_u64;
 
       /* Ever heard of of the "user" before? */