]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-gre.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
On Solaris, for 64-bit builds, use the 64-bit pcap-config.
[tcpdump] / print-gre.c
diff --git a/print-gre.c b/print-gre.c
index ddb7ddc952d0d73e282deee53211d9f941ccb171..b1a814298b5571cb3bc292cf47e2cec0a5cd169b 100644 (file)
--- a/print-gre.c
+++ b/print-gre.c
@@ -39,8 +39,6 @@
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
 #include "netdissect.h"
 #include "addrtostr.h"
 #include "extract.h"
@@ -52,7 +50,6 @@
 #define        GRE_KP          0x2000          /* key present */
 #define        GRE_SP          0x1000          /* sequence# present */
 #define        GRE_sP          0x0800          /* source routing */
-#define        GRE_RECRS       0x0700          /* recursion count */
 #define        GRE_AP          0x0080          /* acknowledgment# present */
 
 static const struct tok gre_flag_values[] = {
@@ -61,11 +58,11 @@ static const struct tok gre_flag_values[] = {
     { GRE_KP, "key present"},
     { GRE_SP, "sequence# present"},
     { GRE_sP, "source routing present"},
-    { GRE_RECRS, "recursion count"},
     { GRE_AP, "ack present"},
     { 0, NULL }
 };
 
+#define        GRE_RECRS_MASK  0x0700          /* recursion count */
 #define        GRE_VERS_MASK   0x0007          /* protocol version */
 
 /* source route entry types */
@@ -87,25 +84,24 @@ gre_print(netdissect_options *ndo, const u_char *bp, u_int length)
        ND_TCHECK_2(bp);
        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;
+       vers = GET_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;
        default:
-            ND_PRINT(" ERROR: unknown-version");
-            break;
-        }
-        return;
+               ND_PRINT(" ERROR: unknown-version");
+               break;
+       }
+       return;
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 static void
@@ -115,10 +111,10 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        uint16_t flags, prot;
 
        /* 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));
+       flags = GET_BE_U_2(bp);
+       if (ndo->ndo_vflag)
+               ND_PRINT(", Flags [%s]",
+                        bittok2str(gre_flag_values,"none",flags));
 
        len -= 2;
        bp += 2;
@@ -126,7 +122,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        ND_TCHECK_2(bp);
        if (len < 2)
                goto trunc;
-       prot = EXTRACT_BE_U_2(bp);
+       prot = GET_BE_U_2(bp);
        len -= 2;
        bp += 2;
 
@@ -135,14 +131,14 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                if (len < 2)
                        goto trunc;
                if (ndo->ndo_vflag)
-                       ND_PRINT(", sum 0x%x", EXTRACT_BE_U_2(bp));
+                       ND_PRINT(", sum 0x%x", GET_BE_U_2(bp));
                bp += 2;
                len -= 2;
 
                ND_TCHECK_2(bp);
                if (len < 2)
                        goto trunc;
-               ND_PRINT(", off 0x%x", EXTRACT_BE_U_2(bp));
+               ND_PRINT(", off 0x%x", GET_BE_U_2(bp));
                bp += 2;
                len -= 2;
        }
@@ -151,7 +147,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                ND_TCHECK_4(bp);
                if (len < 4)
                        goto trunc;
-               ND_PRINT(", key=0x%x", EXTRACT_BE_U_4(bp));
+               ND_PRINT(", key=0x%x", GET_BE_U_4(bp));
                bp += 4;
                len -= 4;
        }
@@ -160,7 +156,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                ND_TCHECK_4(bp);
                if (len < 4)
                        goto trunc;
-               ND_PRINT(", seq %u", EXTRACT_BE_U_4(bp));
+               ND_PRINT(", seq %u", GET_BE_U_4(bp));
                bp += 4;
                len -= 4;
        }
@@ -174,9 +170,9 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                        ND_TCHECK_4(bp);
                        if (len < 4)
                                goto trunc;
-                       af = EXTRACT_BE_U_2(bp);
-                       sreoff = EXTRACT_U_1(bp + 2);
-                       srelen = EXTRACT_U_1(bp + 3);
+                       af = GET_BE_U_2(bp);
+                       sreoff = GET_U_1(bp + 2);
+                       srelen = GET_U_1(bp + 3);
                        bp += 4;
                        len -= 4;
 
@@ -193,21 +189,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:
-               ip_print(ndo, bp, len);
+               ip_print(ndo, bp, len);
                break;
        case ETHERTYPE_IPV6:
                ip6_print(ndo, bp, len);
@@ -225,7 +220,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                isoclns_print(ndo, bp, len);
                break;
        case ETHERTYPE_TEB:
-               ether_print(ndo, bp, len, ndo->ndo_snapend - bp, NULL, NULL);
+               ether_print(ndo, bp, len, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL);
                break;
        default:
                ND_PRINT("gre-proto-0x%x", prot);
@@ -243,18 +238,18 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
        uint16_t flags, prot;
 
        /* 16 bits ND_TCHECKed in gre_print() */
-       flags = EXTRACT_BE_U_2(bp);
+       flags = GET_BE_U_2(bp);
        len -= 2;
        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)
                goto trunc;
-       prot = EXTRACT_BE_U_2(bp);
+       prot = GET_BE_U_2(bp);
        len -= 2;
        bp += 2;
 
@@ -265,7 +260,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
                ND_TCHECK_4(bp);
                if (len < 4)
                        goto trunc;
-               k = EXTRACT_BE_U_4(bp);
+               k = GET_BE_U_4(bp);
                ND_PRINT(", call %u", k & 0xffff);
                len -= 4;
                bp += 4;
@@ -275,7 +270,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
                ND_TCHECK_4(bp);
                if (len < 4)
                        goto trunc;
-               ND_PRINT(", seq %u", EXTRACT_BE_U_4(bp));
+               ND_PRINT(", seq %u", GET_BE_U_4(bp));
                bp += 4;
                len -= 4;
        }
@@ -284,7 +279,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
                ND_TCHECK_4(bp);
                if (len < 4)
                        goto trunc;
-               ND_PRINT(", ack %u", EXTRACT_BE_U_4(bp));
+               ND_PRINT(", ack %u", GET_BE_U_4(bp));
                bp += 4;
                len -= 4;
        }
@@ -292,20 +287,19 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
        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:
@@ -323,7 +317,7 @@ trunc:
 
 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;
 
@@ -347,7 +341,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,
-                 const u_char *bp, u_int len)
+                const u_char *bp, u_int len)
 {
        const u_char *up = bp;
        char buf[INET_ADDRSTRLEN];
@@ -366,25 +360,26 @@ gre_sre_ip_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
        }
 
        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",
-                   ((bp - up) == sreoff) ? "*" : "", buf);
+                        ((bp - up) == sreoff) ? "*" : "", buf);
 
                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,
-                  const u_char *bp, u_int len)
+                 const u_char *bp, u_int len)
 {
        const u_char *up = bp;
 
@@ -402,18 +397,18 @@ gre_sre_asn_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
        }
 
        while (srelen != 0) {
-               if (!ND_TTEST_2(bp))
-                       return (0);
+               ND_TCHECK_2(bp);
                if (len < 2)
                        return (0);
 
                ND_PRINT(" %s%x",
-                   ((bp - up) == sreoff) ? "*" : "",
-                   EXTRACT_BE_U_2(bp));
+                        ((bp - up) == sreoff) ? "*" : "", GET_BE_U_2(bp));
 
                bp += 2;
                len -= 2;
                srelen -= 2;
        }
        return (1);
+trunc:
+       return 0;
 }
[mirror] the TCPdump network dissector