From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Thu, 14 Dec 2017 21:15:11 +0000 (+0100)
Subject: ICMP: Replace ND_TTEST2 calls by ND_TTEST_LEN calls
X-Git-Tag: tcpdump-4.99-bp~1634
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/607d4a5c335795f96f2a81074ff7a624e5cee33f?hp=329b43101ea97896a3e5b9dcfe97f7f9c672784b

ICMP: Replace ND_TTEST2 calls by ND_TTEST_LEN calls
---

diff --git a/print-icmp.c b/print-icmp.c
index 4ebd977b..a9a72014 100644
--- a/print-icmp.c
+++ b/print-icmp.c
@@ -602,7 +602,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
              * however not all implementations set the length field proper.
              */
             if (!ext_dp->icmp_length &&
-                ND_TTEST2(ext_dp->icmp_ext_version_res, plen - ICMP_EXTD_MINLEN)) {
+                ND_TTEST_LEN(ext_dp->icmp_ext_version_res, plen - ICMP_EXTD_MINLEN)) {
                 vec[0].ptr = (const uint8_t *)(const void *)&ext_dp->icmp_ext_version_res;
                 vec[0].len = plen - ICMP_EXTD_MINLEN;
                 if (in_cksum(vec, 1)) {
@@ -623,7 +623,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
             }
 
             hlen = plen - ICMP_EXTD_MINLEN;
-            if (ND_TTEST2(ext_dp->icmp_ext_version_res, hlen)) {
+            if (ND_TTEST_LEN(ext_dp->icmp_ext_version_res, hlen)) {
                 vec[0].ptr = (const uint8_t *)(const void *)&ext_dp->icmp_ext_version_res;
                 vec[0].len = hlen;
                 ND_PRINT((ndo, ", checksum 0x%04x (%scorrect), length %u",