Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-gre.c

diff --git a/print-gre.c b/print-gre.c
index 187a5b9f48297a9b260ea4d1e4a3328d01ccc871..672ed956bf5502bfeea26b876a505f2eba236f8b 100644 (file)
--- a/print-gre.c
+++ b/print-gre.c
@@ -31,6 +31,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* \summary: Generic Routing Encapsulation (GRE) printer */
+
 /*
  * netdissect printer for GRE - Generic Routing Encapsulation
  * RFC1701 (GRE), RFC1702 (GRE IPv4), and RFC2637 (Enhanced GRE)
@@ -78,20 +80,19 @@ static const struct tok gre_flag_values[] = {
 
 static void gre_print_0(netdissect_options *, const u_char *, u_int);
 static void gre_print_1(netdissect_options *, const u_char *, u_int);
-static void gre_sre_print(netdissect_options *, uint16_t, uint8_t, uint8_t, const u_char *, u_int);
-static void gre_sre_ip_print(netdissect_options *, uint8_t, uint8_t, const u_char *, u_int);
-static void gre_sre_asn_print(netdissect_options *, uint8_t, uint8_t, const u_char *, u_int);
+static int gre_sre_print(netdissect_options *, uint16_t, uint8_t, uint8_t, const u_char *, u_int);
+static int gre_sre_ip_print(netdissect_options *, uint8_t, uint8_t, const u_char *, u_int);
+static int gre_sre_asn_print(netdissect_options *, uint8_t, uint8_t, const u_char *, u_int);
 
 void
 gre_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
        u_int len = length, vers;
 
-       if (len < 2) {
-               ND_PRINT((ndo, "%s", tstr));
-               return;
-       }
-       vers = EXTRACT_16BITS(bp) & GRE_VERS_MASK;
+       ND_TCHECK_2(bp);
+       if (len < 2)
+               goto trunc;
+       vers = EXTRACT_BE_U_2(bp) & GRE_VERS_MASK;
         ND_PRINT((ndo, "GREv%u",vers));
 
         switch(vers) {
@@ -105,6 +106,11 @@ gre_print(netdissect_options *ndo, const u_char *bp, u_int length)
             ND_PRINT((ndo, " ERROR: unknown-version"));
             break;
         }
+        return;
+
+trunc:
+       ND_PRINT((ndo, "%s", tstr));
+       return;
 }
 
 static void
@@ -113,7 +119,8 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        u_int len = length;
        uint16_t flags, prot;
 
-       flags = EXTRACT_16BITS(bp);
+       /* 16 bits ND_TCHECKed in gre_print() */
+       flags = EXTRACT_BE_U_2(bp);
         if (ndo->ndo_vflag)
             ND_PRINT((ndo, ", Flags [%s]",
                    bittok2str(gre_flag_values,"none",flags)));
@@ -121,39 +128,44 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        len -= 2;
        bp += 2;
 
+       ND_TCHECK_2(bp);
        if (len < 2)
                goto trunc;
-       prot = EXTRACT_16BITS(bp);
+       prot = EXTRACT_BE_U_2(bp);
        len -= 2;
        bp += 2;
 
        if ((flags & GRE_CP) | (flags & GRE_RP)) {
+               ND_TCHECK_2(bp);
                if (len < 2)
                        goto trunc;
                if (ndo->ndo_vflag)
-                       ND_PRINT((ndo, ", sum 0x%x", EXTRACT_16BITS(bp)));
+                       ND_PRINT((ndo, ", sum 0x%x", EXTRACT_BE_U_2(bp)));
                bp += 2;
                len -= 2;
 
+               ND_TCHECK_2(bp);
                if (len < 2)
                        goto trunc;
-               ND_PRINT((ndo, ", off 0x%x", EXTRACT_16BITS(bp)));
+               ND_PRINT((ndo, ", off 0x%x", EXTRACT_BE_U_2(bp)));
                bp += 2;
                len -= 2;
        }
 
        if (flags & GRE_KP) {
+               ND_TCHECK_4(bp);
                if (len < 4)
                        goto trunc;
-               ND_PRINT((ndo, ", key=0x%x", EXTRACT_32BITS(bp)));
+               ND_PRINT((ndo, ", key=0x%x", EXTRACT_BE_U_4(bp)));
                bp += 4;
                len -= 4;
        }
 
        if (flags & GRE_SP) {
+               ND_TCHECK_4(bp);
                if (len < 4)
                        goto trunc;
-               ND_PRINT((ndo, ", seq %u", EXTRACT_32BITS(bp)));
+               ND_PRINT((ndo, ", seq %u", EXTRACT_BE_U_4(bp)));
                bp += 4;
                len -= 4;
        }
@@ -164,18 +176,20 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                        uint8_t sreoff;
                        uint8_t srelen;
 
+                       ND_TCHECK_4(bp);
                        if (len < 4)
                                goto trunc;
-                       af = EXTRACT_16BITS(bp);
-                       sreoff = *(bp + 2);
-                       srelen = *(bp + 3);
+                       af = EXTRACT_BE_U_2(bp);
+                       sreoff = EXTRACT_U_1(bp + 2);
+                       srelen = EXTRACT_U_1(bp + 3);
                        bp += 4;
                        len -= 4;
 
                        if (af == 0 && srelen == 0)
                                break;
 
-                       gre_sre_print(ndo, af, sreoff, srelen, bp, len);
+                       if (!gre_sre_print(ndo, af, sreoff, srelen, bp, len))
+                               goto trunc;
 
                        if (len < srelen)
                                goto trunc;
@@ -213,10 +227,10 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                atalk_print(ndo, bp, len);
                break;
        case ETHERTYPE_GRE_ISO:
-               isoclns_print(ndo, bp, len, len);
+               isoclns_print(ndo, bp, len);
                break;
        case ETHERTYPE_TEB:
-               ether_print(ndo, bp, len, len, NULL, NULL);
+               ether_print(ndo, bp, len, ndo->ndo_snapend - bp, NULL, NULL);
                break;
        default:
                ND_PRINT((ndo, "gre-proto-0x%x", prot));
@@ -233,7 +247,8 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
        u_int len = length;
        uint16_t flags, prot;
 
-       flags = EXTRACT_16BITS(bp);
+       /* 16 bits ND_TCHECKed in gre_print() */
+       flags = EXTRACT_BE_U_2(bp);
        len -= 2;
        bp += 2;
 
@@ -241,9 +256,10 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
             ND_PRINT((ndo, ", Flags [%s]",
                    bittok2str(gre_flag_values,"none",flags)));
 
+       ND_TCHECK_2(bp);
        if (len < 2)
                goto trunc;
-       prot = EXTRACT_16BITS(bp);
+       prot = EXTRACT_BE_U_2(bp);
        len -= 2;
        bp += 2;
 
@@ -251,26 +267,29 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
        if (flags & GRE_KP) {
                uint32_t k;
 
+               ND_TCHECK_4(bp);
                if (len < 4)
                        goto trunc;
-               k = EXTRACT_32BITS(bp);
+               k = EXTRACT_BE_U_4(bp);
                ND_PRINT((ndo, ", call %d", k & 0xffff));
                len -= 4;
                bp += 4;
        }
 
        if (flags & GRE_SP) {
+               ND_TCHECK_4(bp);
                if (len < 4)
                        goto trunc;
-               ND_PRINT((ndo, ", seq %u", EXTRACT_32BITS(bp)));
+               ND_PRINT((ndo, ", seq %u", EXTRACT_BE_U_4(bp)));
                bp += 4;
                len -= 4;
        }
 
        if (flags & GRE_AP) {
+               ND_TCHECK_4(bp);
                if (len < 4)
                        goto trunc;
-               ND_PRINT((ndo, ", ack %u", EXTRACT_32BITS(bp)));
+               ND_PRINT((ndo, ", ack %u", EXTRACT_BE_U_4(bp)));
                bp += 4;
                len -= 4;
        }
@@ -307,27 +326,31 @@ trunc:
        ND_PRINT((ndo, "%s", tstr));
 }
 
-static void
+static int
 gre_sre_print(netdissect_options *ndo, uint16_t af, uint8_t sreoff,
     uint8_t srelen, const u_char *bp, u_int len)
 {
+       int ret;
+
        switch (af) {
        case GRESRE_IP:
                ND_PRINT((ndo, ", (rtaf=ip"));
-               gre_sre_ip_print(ndo, sreoff, srelen, bp, len);
+               ret = gre_sre_ip_print(ndo, sreoff, srelen, bp, len);
                ND_PRINT((ndo, ")"));
                break;
        case GRESRE_ASN:
                ND_PRINT((ndo, ", (rtaf=asn"));
-               gre_sre_asn_print(ndo, sreoff, srelen, bp, len);
+               ret = gre_sre_asn_print(ndo, sreoff, srelen, bp, len);
                ND_PRINT((ndo, ")"));
                break;
        default:
                ND_PRINT((ndo, ", (rtaf=0x%x)", af));
+               ret = 1;
        }
+       return (ret);
 }
 
-static void
+static int
 gre_sre_ip_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
                  const u_char *bp, u_int len)
 {
@@ -336,20 +359,22 @@ gre_sre_ip_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
 
        if (sreoff & 3) {
                ND_PRINT((ndo, ", badoffset=%u", sreoff));
-               return;
+               return (1);
        }
        if (srelen & 3) {
                ND_PRINT((ndo, ", badlength=%u", srelen));
-               return;
+               return (1);
        }
        if (sreoff >= srelen) {
                ND_PRINT((ndo, ", badoff/len=%u/%u", sreoff, srelen));
-               return;
+               return (1);
        }
 
-       for (;;) {
-               if (len < 4 || srelen == 0)
-                       return;
+       while (srelen != 0) {
+               if (!ND_TTEST_4(bp))
+                       return (0);
+               if (len < 4)
+                       return (0);
 
                addrtostr(bp, buf, sizeof(buf));
                ND_PRINT((ndo, " %s%s",
@@ -359,9 +384,10 @@ gre_sre_ip_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
                len -= 4;
                srelen -= 4;
        }
+       return (1);
 }
 
-static void
+static int
 gre_sre_asn_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
                   const u_char *bp, u_int len)
 {
@@ -369,27 +395,30 @@ gre_sre_asn_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
 
        if (sreoff & 1) {
                ND_PRINT((ndo, ", badoffset=%u", sreoff));
-               return;
+               return (1);
        }
        if (srelen & 1) {
                ND_PRINT((ndo, ", badlength=%u", srelen));
-               return;
+               return (1);
        }
        if (sreoff >= srelen) {
                ND_PRINT((ndo, ", badoff/len=%u/%u", sreoff, srelen));
-               return;
+               return (1);
        }
 
-       for (;;) {
-               if (len < 2 || srelen == 0)
-                       return;
+       while (srelen != 0) {
+               if (!ND_TTEST_2(bp))
+                       return (0);
+               if (len < 2)
+                       return (0);
 
                ND_PRINT((ndo, " %s%x",
                    ((bp - up) == sreoff) ? "*" : "",
-                   EXTRACT_16BITS(bp)));
+                   EXTRACT_BE_U_2(bp)));
 
                bp += 2;
                len -= 2;
                srelen -= 2;
        }
+       return (1);
 }