Regenerate config files.

[tcpdump] / print-gre.c

diff --git a/print-gre.c b/print-gre.c
index 6c77be2370ee1bcd4f6154623c120e0708677c91..505752a1b8fad1b0ccd213b1e1ed7f6764707274 100644 (file)
--- a/print-gre.c
+++ b/print-gre.c
@@ -31,21 +31,23 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* \summary: Generic Routing Encapsulation (GRE) printer */
+
 /*
- * tcpdump filter for GRE - Generic Routing Encapsulation
+ * netdissect printer for GRE - Generic Routing Encapsulation
  * RFC1701 (GRE), RFC1702 (GRE IPv4), and RFC2637 (Enhanced GRE)
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
+#include "addrtostr.h"
 #include "extract.h"
 #include "ethertype.h"
 
@@ -78,19 +80,18 @@ 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 *, u_int16_t, u_int8_t, u_int8_t, const u_char *, u_int);
-static void gre_sre_ip_print(netdissect_options *, u_int8_t, u_int8_t, const u_char *, u_int);
-static void gre_sre_asn_print(netdissect_options *, u_int8_t, u_int8_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;
-       }
+       ND_TCHECK2(*bp, 2);
+       if (len < 2)
+               goto trunc;
        vers = EXTRACT_16BITS(bp) & GRE_VERS_MASK;
         ND_PRINT((ndo, "GREv%u",vers));
 
@@ -105,13 +106,18 @@ 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
 gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
 {
        u_int len = length;
-       u_int16_t flags, prot;
+       uint16_t flags, prot;
 
        flags = EXTRACT_16BITS(bp);
         if (ndo->ndo_vflag)
@@ -121,6 +127,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        len -= 2;
        bp += 2;
 
+       ND_TCHECK2(*bp, 2);
        if (len < 2)
                goto trunc;
        prot = EXTRACT_16BITS(bp);
@@ -128,6 +135,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        bp += 2;
 
        if ((flags & GRE_CP) | (flags & GRE_RP)) {
+               ND_TCHECK2(*bp, 2);
                if (len < 2)
                        goto trunc;
                if (ndo->ndo_vflag)
@@ -135,6 +143,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                bp += 2;
                len -= 2;
 
+               ND_TCHECK2(*bp, 2);
                if (len < 2)
                        goto trunc;
                ND_PRINT((ndo, ", off 0x%x", EXTRACT_16BITS(bp)));
@@ -143,6 +152,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        }
 
        if (flags & GRE_KP) {
+               ND_TCHECK2(*bp, 4);
                if (len < 4)
                        goto trunc;
                ND_PRINT((ndo, ", key=0x%x", EXTRACT_32BITS(bp)));
@@ -151,6 +161,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        }
 
        if (flags & GRE_SP) {
+               ND_TCHECK2(*bp, 4);
                if (len < 4)
                        goto trunc;
                ND_PRINT((ndo, ", seq %u", EXTRACT_32BITS(bp)));
@@ -160,10 +171,11 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
 
        if (flags & GRE_RP) {
                for (;;) {
-                       u_int16_t af;
-                       u_int8_t sreoff;
-                       u_int8_t srelen;
+                       uint16_t af;
+                       uint8_t sreoff;
+                       uint8_t srelen;
 
+                       ND_TCHECK2(*bp, 4);
                        if (len < 4)
                                goto trunc;
                        af = EXTRACT_16BITS(bp);
@@ -175,7 +187,8 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                        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;
@@ -200,11 +213,9 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        case ETHERTYPE_IP:
                ip_print(ndo, bp, len);
                break;
-#ifdef INET6
        case ETHERTYPE_IPV6:
                ip6_print(ndo, bp, len);
                break;
-#endif
        case ETHERTYPE_MPLS:
                mpls_print(ndo, bp, len);
                break;
@@ -212,13 +223,13 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                ipx_print(ndo, bp, len);
                break;
        case ETHERTYPE_ATALK:
-               atalk_print(bp, len);
+               atalk_print(ndo, bp, len);
                break;
        case ETHERTYPE_GRE_ISO:
-               isoclns_print(bp, len, len);
+               isoclns_print(ndo, bp, len, ndo->ndo_snapend - bp);
                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 +244,7 @@ static void
 gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
 {
        u_int len = length;
-       u_int16_t flags, prot;
+       uint16_t flags, prot;
 
        flags = EXTRACT_16BITS(bp);
        len -= 2;
@@ -243,6 +254,7 @@ 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_TCHECK2(*bp, 2);
        if (len < 2)
                goto trunc;
        prot = EXTRACT_16BITS(bp);
@@ -251,8 +263,9 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
 
 
        if (flags & GRE_KP) {
-               u_int32_t k;
+               uint32_t k;
 
+               ND_TCHECK2(*bp, 4);
                if (len < 4)
                        goto trunc;
                k = EXTRACT_32BITS(bp);
@@ -262,6 +275,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
        }
 
        if (flags & GRE_SP) {
+               ND_TCHECK2(*bp, 4);
                if (len < 4)
                        goto trunc;
                ND_PRINT((ndo, ", seq %u", EXTRACT_32BITS(bp)));
@@ -270,6 +284,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
        }
 
        if (flags & GRE_AP) {
+               ND_TCHECK2(*bp, 4);
                if (len < 4)
                        goto trunc;
                ND_PRINT((ndo, ", ack %u", EXTRACT_32BITS(bp)));
@@ -297,7 +312,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
 
        switch (prot) {
        case ETHERTYPE_PPP:
-                ppp_print(bp, len);
+               ppp_print(ndo, bp, len);
                break;
        default:
                ND_PRINT((ndo, "gre-proto-0x%x", prot));
@@ -309,83 +324,91 @@ trunc:
        ND_PRINT((ndo, "%s", tstr));
 }
 
-static void
-gre_sre_print(netdissect_options *ndo, u_int16_t af, u_int8_t sreoff,
-    u_int8_t srelen, const u_char *bp, u_int len)
+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);
-               ND_PRINT((ndo, ") "));
+               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);
-               ND_PRINT((ndo, ") "));
+               ret = gre_sre_asn_print(ndo, sreoff, srelen, bp, len);
+               ND_PRINT((ndo, ")"));
                break;
        default:
-               ND_PRINT((ndo, ", (rtaf=0x%x) ", af));
+               ND_PRINT((ndo, ", (rtaf=0x%x)", af));
+               ret = 1;
        }
+       return (ret);
 }
 
-static void
-gre_sre_ip_print(netdissect_options *ndo, u_int8_t sreoff, u_int8_t srelen,
+static int
+gre_sre_ip_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
                  const u_char *bp, u_int len)
 {
-       struct in_addr a;
        const u_char *up = bp;
+       char buf[INET_ADDRSTRLEN];
 
        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_TTEST2(*bp, 4))
+                       return (0);
+               if (len < 4)
+                       return (0);
 
-               memcpy(&a, bp, sizeof(a));
+               addrtostr(bp, buf, sizeof(buf));
                ND_PRINT((ndo, " %s%s",
-                   ((bp - up) == sreoff) ? "*" : "",
-                   inet_ntoa(a)));
+                   ((bp - up) == sreoff) ? "*" : "", buf));
 
                bp += 4;
                len -= 4;
                srelen -= 4;
        }
+       return (1);
 }
 
-static void
-gre_sre_asn_print(netdissect_options *ndo, u_int8_t sreoff, u_int8_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 *up = bp;
 
        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_TTEST2(*bp, 2))
+                       return (0);
+               if (len < 2)
+                       return (0);
 
                ND_PRINT((ndo, " %s%x",
                    ((bp - up) == sreoff) ? "*" : "",
@@ -395,4 +418,5 @@ gre_sre_asn_print(netdissect_options *ndo, u_int8_t sreoff, u_int8_t srelen,
                len -= 2;
                srelen -= 2;
        }
+       return (1);
 }