From: Klement Sekera <ksekera@cisco.com>
Date: Wed, 25 Nov 2020 16:47:00 +0000 (+0000)
Subject: ip: trace icmp echo request/reply id
X-Git-Tag: v21.06-rc0~114
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=78ef61e4a081b8bad57f06d34d66ccb9f7d39848;p=vpp.git

ip: trace icmp echo request/reply id

Type: improvement
Change-Id: Ie3a5b182e446c407f258c043c22d1cf25eb7ee59
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---

diff --git a/src/vnet/ip/icmp4.c b/src/vnet/ip/icmp4.c
index 48bcf67ac4e..05262e6f8e4 100644
--- a/src/vnet/ip/icmp4.c
+++ b/src/vnet/ip/icmp4.c
@@ -101,6 +101,12 @@ format_ip4_icmp_header (u8 * s, va_list * args)
 	      format_ip4_icmp_type_and_code, icmp->type, icmp->code,
 	      clib_net_to_host_u16 (icmp->checksum));
 
+  if ((ICMP4_echo_request == icmp->type || ICMP4_echo_reply == icmp->type)
+      && sizeof (icmp[0]) + sizeof (u16) < max_header_bytes)
+    {
+      s = format (s, " id %u", clib_net_to_host_u16 (*(u16 *) (icmp + 1)));
+    }
+
   return s;
 }