Use more the ND_TCHECK_n() macros

diff --git a/print-erspan.c b/print-erspan.c
index 1f8c9f00aa012730b11c9b356b17a91a06bfd1c6..498c0ba5f5b3fe3a0fa6f547c61ef4353defe9fd 100644 (file)
--- a/print-erspan.c
+++ b/print-erspan.c
@@ -244,13 +244,13 @@ erspan_iii_print(netdissect_options *ndo, const u_char *bp, u_int len)
 
        /* Skip timestamp */
        ND_ICHECK_U(len, <, 4);
-       ND_TCHECK_LEN(bp, 4);
+       ND_TCHECK_4(bp);
        bp += 4;
        len -= 4;
 
        /* Skip SGT */
        ND_ICHECK_U(len, <, 2);
-       ND_TCHECK_LEN(bp, 2);
+       ND_TCHECK_2(bp);
        bp += 2;
        len -= 2;
 
@@ -269,7 +269,7 @@ erspan_iii_print(netdissect_options *ndo, const u_char *bp, u_int len)
        if (hdr2 & ERSPAN3_O_MASK) {
                /* Yes.  Skip it. */
                ND_ICHECK_U(len, <, 8);
-               ND_TCHECK_LEN(bp, 8);
+               ND_TCHECK_8(bp);
                bp += 8;
                len -= 8;
        }

diff --git a/print-ether.c b/print-ether.c
index fd41e9a7c8408f8d954b1338a663e18d52dd0784..324d089fc3138836b663bbe185cad7a7752c488e 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -479,7 +479,7 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
         * Fail if we don't have enough data for the Hilscher pseudo-header.
         */
        ndo->ndo_protocol = "netanalyzer";
-       ND_TCHECK_LEN(p, 4);
+       ND_TCHECK_4(p);
 
        /* Skip the pseudo-header. */
        ndo->ndo_ll_hdr_len += 4;

diff --git a/print-gre.c b/print-gre.c
index b04769ee1f256b0c727333b0ab794461f63f06f1..1d545b3f8b076a2039e2e8b3300d34d7551b8f86 100644 (file)
--- a/print-gre.c
+++ b/print-gre.c
@@ -371,7 +371,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
        if (flags & GRE_KP) {
                /* Skip payload length? */
                ND_ICHECK_U(len, <, 2);
-               ND_TCHECK_LEN(bp, 2);
+               ND_TCHECK_2(bp);
                len -= 2;
                bp += 2;
 

diff --git a/print-msdp.c b/print-msdp.c
index 922a93b24b5bae83649264b4c72574e1e890a15e..d4cb0a2d397a260f3a177d9f83a2738cbb3289ff 100644 (file)
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -70,7 +70,7 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
                        /* RP Address */
                        ND_ICHECK_U(len, <, 8);
                        /* XXX -print this based on ndo_vflag? */
-                       ND_TCHECK_LEN(sp + 4, 4);
+                       ND_TCHECK_4(sp + 4);
 
                        /* Entries */
                        ND_TCHECK_LEN(sp + 8, entry_count*12);