GRE: Replace the ND_TTEST_*() calls with ND_TCHECK_*() calls

[tcpdump] / print-gre.c

diff --git a/print-gre.c b/print-gre.c
index b82d1d58a10283463949425281045ba3403759f6..f363f8b1cfcb1a54497a495debb277b1c83bbf85 100644 (file)
--- a/print-gre.c
+++ b/print-gre.c
@@ -12,11 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by Jason L. Wright
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.

  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED


@@ -93,20 +88,20 @@ gre_print(netdissect_options *ndo, const u_char *bp, u_int length)
        if (len < 2)
                goto trunc;
        vers = EXTRACT_BE_U_2(bp) & GRE_VERS_MASK;
        if (len < 2)
                goto trunc;
        vers = EXTRACT_BE_U_2(bp) & GRE_VERS_MASK;

-        ND_PRINT("GREv%u",vers);
-
-        switch(vers) {
-        case 0:
-            gre_print_0(ndo, bp, len);
-            break;
-        case 1:
-            gre_print_1(ndo, bp, len);
-            break;
+       ND_PRINT("GREv%u",vers);
+
+       switch(vers) {
+       case 0:
+               gre_print_0(ndo, bp, len);
+               break;
+       case 1:
+               gre_print_1(ndo, bp, len);
+               break;

        default:
        default:

-            ND_PRINT(" ERROR: unknown-version");
-            break;
-        }
-        return;
+               ND_PRINT(" ERROR: unknown-version");
+               break;
+       }
+       return;

 
 trunc:
        nd_print_trunc(ndo);
 
 trunc:
        nd_print_trunc(ndo);


@@ -121,9 +116,9 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
 
        /* 16 bits ND_TCHECKed in gre_print() */
        flags = EXTRACT_BE_U_2(bp);
 
        /* 16 bits ND_TCHECKed in gre_print() */
        flags = EXTRACT_BE_U_2(bp);

-        if (ndo->ndo_vflag)
-            ND_PRINT(", Flags [%s]",
-                   bittok2str(gre_flag_values,"none",flags));
+       if (ndo->ndo_vflag)
+               ND_PRINT(", Flags [%s]",
+                        bittok2str(gre_flag_values,"none",flags));

 
        len -= 2;
        bp += 2;
 
        len -= 2;
        bp += 2;


@@ -198,21 +193,20 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                }
        }
 
                }
        }
 

-        if (ndo->ndo_eflag)
-            ND_PRINT(", proto %s (0x%04x)",
-                   tok2str(ethertype_values,"unknown",prot),
-                   prot);
+       if (ndo->ndo_eflag)
+               ND_PRINT(", proto %s (0x%04x)",
+                        tok2str(ethertype_values,"unknown",prot), prot);

 
 

-        ND_PRINT(", length %u",length);
+       ND_PRINT(", length %u",length);

 
 

-        if (ndo->ndo_vflag < 1)
-            ND_PRINT(": "); /* put in a colon as protocol demarc */
-        else
-            ND_PRINT("\n\t"); /* if verbose go multiline */
+       if (ndo->ndo_vflag < 1)
+               ND_PRINT(": "); /* put in a colon as protocol demarc */
+       else
+               ND_PRINT("\n\t"); /* if verbose go multiline */

 
        switch (prot) {
        case ETHERTYPE_IP:
 
        switch (prot) {
        case ETHERTYPE_IP:

-               ip_print(ndo, bp, len);
+               ip_print(ndo, bp, len);

                break;
        case ETHERTYPE_IPV6:
                ip6_print(ndo, bp, len);
                break;
        case ETHERTYPE_IPV6:
                ip6_print(ndo, bp, len);


@@ -253,8 +247,8 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
        bp += 2;
 
        if (ndo->ndo_vflag)
        bp += 2;
 
        if (ndo->ndo_vflag)

-            ND_PRINT(", Flags [%s]",
-                   bittok2str(gre_flag_values,"none",flags));
+               ND_PRINT(", Flags [%s]",
+                        bittok2str(gre_flag_values,"none",flags));

 
        ND_TCHECK_2(bp);
        if (len < 2)
 
        ND_TCHECK_2(bp);
        if (len < 2)


@@ -297,20 +291,19 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
        if ((flags & GRE_SP) == 0)
                ND_PRINT(", no-payload");
 
        if ((flags & GRE_SP) == 0)
                ND_PRINT(", no-payload");
 

-        if (ndo->ndo_eflag)
-            ND_PRINT(", proto %s (0x%04x)",
-                   tok2str(ethertype_values,"unknown",prot),
-                   prot);
+       if (ndo->ndo_eflag)
+               ND_PRINT(", proto %s (0x%04x)",
+                        tok2str(ethertype_values,"unknown",prot), prot);

 
 

-        ND_PRINT(", length %u",length);
+       ND_PRINT(", length %u",length);

 
 

-        if ((flags & GRE_SP) == 0)
-            return;
+       if ((flags & GRE_SP) == 0)
+               return;

 
 

-        if (ndo->ndo_vflag < 1)
-            ND_PRINT(": "); /* put in a colon as protocol demarc */
-        else
-            ND_PRINT("\n\t"); /* if verbose go multiline */
+       if (ndo->ndo_vflag < 1)
+               ND_PRINT(": "); /* put in a colon as protocol demarc */
+       else
+               ND_PRINT("\n\t"); /* if verbose go multiline */

 
        switch (prot) {
        case ETHERTYPE_PPP:
 
        switch (prot) {
        case ETHERTYPE_PPP:


@@ -328,7 +321,7 @@ trunc:
 
 static int
 gre_sre_print(netdissect_options *ndo, uint16_t af, uint8_t sreoff,
 
 static int
 gre_sre_print(netdissect_options *ndo, uint16_t af, uint8_t sreoff,

-    uint8_t srelen, const u_char *bp, u_int len)
+             uint8_t srelen, const u_char *bp, u_int len)

 {
        int ret;
 
 {
        int ret;
 


@@ -352,7 +345,7 @@ gre_sre_print(netdissect_options *ndo, uint16_t af, uint8_t sreoff,
 
 static int
 gre_sre_ip_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
 
 static int
 gre_sre_ip_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,

-                 const u_char *bp, u_int len)
+                const u_char *bp, u_int len)

 {
        const u_char *up = bp;
        char buf[INET_ADDRSTRLEN];
 {
        const u_char *up = bp;
        char buf[INET_ADDRSTRLEN];


@@ -371,25 +364,26 @@ gre_sre_ip_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
        }
 
        while (srelen != 0) {
        }
 
        while (srelen != 0) {

-               if (!ND_TTEST_4(bp))
-                       return (0);
+               ND_TCHECK_4(bp);

                if (len < 4)
                        return (0);
 
                addrtostr(bp, buf, sizeof(buf));
                ND_PRINT(" %s%s",
                if (len < 4)
                        return (0);
 
                addrtostr(bp, buf, sizeof(buf));
                ND_PRINT(" %s%s",

-                   ((bp - up) == sreoff) ? "*" : "", buf);
+                        ((bp - up) == sreoff) ? "*" : "", buf);

 
                bp += 4;
                len -= 4;
                srelen -= 4;
        }
        return (1);
 
                bp += 4;
                len -= 4;
                srelen -= 4;
        }
        return (1);

+trunc:
+       return 0;

 }
 
 static int
 gre_sre_asn_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
 }
 
 static int
 gre_sre_asn_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,

-                  const u_char *bp, u_int len)
+                 const u_char *bp, u_int len)

 {
        const u_char *up = bp;
 
 {
        const u_char *up = bp;
 


@@ -407,18 +401,18 @@ gre_sre_asn_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
        }
 
        while (srelen != 0) {
        }
 
        while (srelen != 0) {

-               if (!ND_TTEST_2(bp))
-                       return (0);
+               ND_TCHECK_2(bp);

                if (len < 2)
                        return (0);
 
                ND_PRINT(" %s%x",
                if (len < 2)
                        return (0);
 
                ND_PRINT(" %s%x",

-                   ((bp - up) == sreoff) ? "*" : "",
-                   EXTRACT_BE_U_2(bp));
+                        ((bp - up) == sreoff) ? "*" : "", EXTRACT_BE_U_2(bp));

 
                bp += 2;
                len -= 2;
                srelen -= 2;
        }
        return (1);
 
                bp += 2;
                len -= 2;
                srelen -= 2;
        }
        return (1);

+trunc:
+       return 0;

 }
 }