X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/cb9b66505924ae735e5ef772a434e72089231076..refs/pull/1034/head:/print-gre.c diff --git a/print-gre.c b/print-gre.c index a11cb9b8..136fb69d 100644 --- 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. - * 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 @@ -39,26 +34,23 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include - -#include +#include "netdissect-stdinc.h" +#define ND_LONGJMP_FROM_TCHECK #include "netdissect.h" #include "addrtostr.h" #include "extract.h" #include "ethertype.h" -static const char tstr[] = "[|gre]"; #define GRE_CP 0x8000 /* checksum present */ #define GRE_RP 0x4000 /* routing present */ #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[] = { @@ -67,11 +59,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,30 +79,29 @@ static int gre_sre_asn_print(netdissect_options *, uint8_t, uint8_t, const u_cha void gre_print(netdissect_options *ndo, const u_char *bp, u_int length) { - u_int len = length, vers; - - ND_TCHECK2(*bp, 2); - if (len < 2) - goto trunc; - vers = EXTRACT_BE_16BITS(bp) & GRE_VERS_MASK; - ND_PRINT((ndo, "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((ndo, " ERROR: unknown-version")); - break; - } - return; + u_int vers; -trunc: - ND_PRINT((ndo, "%s", tstr)); + ndo->ndo_protocol = "gre"; + nd_print_protocol_caps(ndo); + ND_ICHECK_U(length, <, 2); + vers = GET_BE_U_2(bp) & GRE_VERS_MASK; + ND_PRINT("v%u",vers); + + switch(vers) { + case 0: + gre_print_0(ndo, bp, length); + break; + case 1: + gre_print_1(ndo, bp, length); + break; + default: + ND_PRINT(" ERROR: unknown-version"); + break; + } return; + +invalid: + nd_print_invalid(ndo); } static void @@ -119,53 +110,46 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length) u_int len = length; uint16_t flags, prot; - /* 16 bits ND_TCHECKed in gre_print() */ - flags = EXTRACT_BE_16BITS(bp); - if (ndo->ndo_vflag) - ND_PRINT((ndo, ", Flags [%s]", - bittok2str(gre_flag_values,"none",flags))); + ND_ICHECK_U(len, <, 2); + flags = GET_BE_U_2(bp); + if (ndo->ndo_vflag) + ND_PRINT(", Flags [%s]", + bittok2str(gre_flag_values,"none",flags)); len -= 2; bp += 2; - ND_TCHECK2(*bp, 2); - if (len < 2) - goto trunc; - prot = EXTRACT_BE_16BITS(bp); + ND_ICHECK_U(len, <, 2); + prot = GET_BE_U_2(bp); len -= 2; bp += 2; if ((flags & GRE_CP) | (flags & GRE_RP)) { - ND_TCHECK2(*bp, 2); - if (len < 2) - goto trunc; + uint16_t sum; + + ND_ICHECK_U(len, <, 2); + sum = GET_BE_U_2(bp); if (ndo->ndo_vflag) - ND_PRINT((ndo, ", sum 0x%x", EXTRACT_BE_16BITS(bp))); + ND_PRINT(", sum 0x%x", sum); bp += 2; len -= 2; - ND_TCHECK2(*bp, 2); - if (len < 2) - goto trunc; - ND_PRINT((ndo, ", off 0x%x", EXTRACT_BE_16BITS(bp))); + ND_ICHECK_U(len, <, 2); + ND_PRINT(", off 0x%x", GET_BE_U_2(bp)); bp += 2; len -= 2; } if (flags & GRE_KP) { - ND_TCHECK2(*bp, 4); - if (len < 4) - goto trunc; - ND_PRINT((ndo, ", key=0x%x", EXTRACT_BE_32BITS(bp))); + ND_ICHECK_U(len, <, 4); + ND_PRINT(", key=0x%x", GET_BE_U_4(bp)); bp += 4; len -= 4; } if (flags & GRE_SP) { - ND_TCHECK2(*bp, 4); - if (len < 4) - goto trunc; - ND_PRINT((ndo, ", seq %u", EXTRACT_BE_32BITS(bp))); + ND_ICHECK_U(len, <, 4); + ND_PRINT(", seq %u", GET_BE_U_4(bp)); bp += 4; len -= 4; } @@ -176,12 +160,10 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length) uint8_t sreoff; uint8_t srelen; - ND_TCHECK2(*bp, 4); - if (len < 4) - goto trunc; - af = EXTRACT_BE_16BITS(bp); - sreoff = EXTRACT_8BITS(bp + 2); - srelen = EXTRACT_8BITS(bp + 3); + ND_ICHECK_U(len, <, 4); + af = GET_BE_U_2(bp); + sreoff = GET_U_1(bp + 2); + srelen = GET_U_1(bp + 3); bp += 4; len -= 4; @@ -189,30 +171,28 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length) break; if (!gre_sre_print(ndo, af, sreoff, srelen, bp, len)) - goto trunc; + goto invalid; - if (len < srelen) - goto trunc; + ND_ICHECK_U(len, <, srelen); bp += srelen; len -= srelen; } } - if (ndo->ndo_eflag) - ND_PRINT((ndo, ", 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((ndo, ", length %u",length)); + ND_PRINT(", length %u",length); - if (ndo->ndo_vflag < 1) - ND_PRINT((ndo, ": ")); /* put in a colon as protocol demarc */ - else - ND_PRINT((ndo, "\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); @@ -230,15 +210,15 @@ 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((ndo, "gre-proto-0x%x", prot)); + ND_PRINT("gre-proto-0x%x", prot); } return; -trunc: - ND_PRINT((ndo, "%s", tstr)); +invalid: + nd_print_invalid(ndo); } static void @@ -247,19 +227,17 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length) u_int len = length; uint16_t flags, prot; - /* 16 bits ND_TCHECKed in gre_print() */ - flags = EXTRACT_BE_16BITS(bp); + ND_ICHECK_U(len, <, 2); + flags = GET_BE_U_2(bp); len -= 2; bp += 2; if (ndo->ndo_vflag) - ND_PRINT((ndo, ", Flags [%s]", - bittok2str(gre_flag_values,"none",flags))); + ND_PRINT(", Flags [%s]", + bittok2str(gre_flag_values,"none",flags)); - ND_TCHECK2(*bp, 2); - if (len < 2) - goto trunc; - prot = EXTRACT_BE_16BITS(bp); + ND_ICHECK_U(len, <, 2); + prot = GET_BE_U_2(bp); len -= 2; bp += 2; @@ -267,84 +245,77 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length) if (flags & GRE_KP) { uint32_t k; - ND_TCHECK2(*bp, 4); - if (len < 4) - goto trunc; - k = EXTRACT_BE_32BITS(bp); - ND_PRINT((ndo, ", call %d", k & 0xffff)); + ND_ICHECK_U(len, <, 4); + k = GET_BE_U_4(bp); + ND_PRINT(", call %u", k & 0xffff); len -= 4; bp += 4; } if (flags & GRE_SP) { - ND_TCHECK2(*bp, 4); - if (len < 4) - goto trunc; - ND_PRINT((ndo, ", seq %u", EXTRACT_BE_32BITS(bp))); + ND_ICHECK_U(len, <, 4); + ND_PRINT(", seq %u", GET_BE_U_4(bp)); bp += 4; len -= 4; } if (flags & GRE_AP) { - ND_TCHECK2(*bp, 4); - if (len < 4) - goto trunc; - ND_PRINT((ndo, ", ack %u", EXTRACT_BE_32BITS(bp))); + ND_ICHECK_U(len, <, 4); + ND_PRINT(", ack %u", GET_BE_U_4(bp)); bp += 4; len -= 4; } if ((flags & GRE_SP) == 0) - ND_PRINT((ndo, ", no-payload")); + ND_PRINT(", no-payload"); - if (ndo->ndo_eflag) - ND_PRINT((ndo, ", 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((ndo, ", 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((ndo, ": ")); /* put in a colon as protocol demarc */ - else - ND_PRINT((ndo, "\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: ppp_print(ndo, bp, len); break; default: - ND_PRINT((ndo, "gre-proto-0x%x", prot)); + ND_PRINT("gre-proto-0x%x", prot); break; } return; -trunc: - ND_PRINT((ndo, "%s", tstr)); +invalid: + nd_print_invalid(ndo); } 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; switch (af) { case GRESRE_IP: - ND_PRINT((ndo, ", (rtaf=ip")); + ND_PRINT(", (rtaf=ip"); ret = gre_sre_ip_print(ndo, sreoff, srelen, bp, len); - ND_PRINT((ndo, ")")); + ND_PRINT(")"); break; case GRESRE_ASN: - ND_PRINT((ndo, ", (rtaf=asn")); + ND_PRINT(", (rtaf=asn"); ret = gre_sre_asn_print(ndo, sreoff, srelen, bp, len); - ND_PRINT((ndo, ")")); + ND_PRINT(")"); break; default: - ND_PRINT((ndo, ", (rtaf=0x%x)", af)); + ND_PRINT(", (rtaf=0x%x)", af); ret = 1; } return (ret); @@ -352,73 +323,73 @@ 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]; if (sreoff & 3) { - ND_PRINT((ndo, ", badoffset=%u", sreoff)); - return (1); + ND_PRINT(", badoffset=%u", sreoff); + goto invalid; } if (srelen & 3) { - ND_PRINT((ndo, ", badlength=%u", srelen)); - return (1); + ND_PRINT(", badlength=%u", srelen); + goto invalid; } if (sreoff >= srelen) { - ND_PRINT((ndo, ", badoff/len=%u/%u", sreoff, srelen)); - return (1); + ND_PRINT(", badoff/len=%u/%u", sreoff, srelen); + goto invalid; } while (srelen != 0) { - if (!ND_TTEST2(*bp, 4)) - return (0); - if (len < 4) - return (0); + ND_ICHECK_U(len, <, 4); + ND_TCHECK_LEN(bp, sizeof(nd_ipv4)); addrtostr(bp, buf, sizeof(buf)); - ND_PRINT((ndo, " %s%s", - ((bp - up) == sreoff) ? "*" : "", buf)); + ND_PRINT(" %s%s", + ((bp - up) == sreoff) ? "*" : "", buf); bp += 4; len -= 4; srelen -= 4; } - return (1); + return 1; + +invalid: + 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; if (sreoff & 1) { - ND_PRINT((ndo, ", badoffset=%u", sreoff)); - return (1); + ND_PRINT(", badoffset=%u", sreoff); + goto invalid; } if (srelen & 1) { - ND_PRINT((ndo, ", badlength=%u", srelen)); - return (1); + ND_PRINT(", badlength=%u", srelen); + goto invalid; } if (sreoff >= srelen) { - ND_PRINT((ndo, ", badoff/len=%u/%u", sreoff, srelen)); - return (1); + ND_PRINT(", badoff/len=%u/%u", sreoff, srelen); + goto invalid; } while (srelen != 0) { - if (!ND_TTEST2(*bp, 2)) - return (0); - if (len < 2) - return (0); + ND_ICHECK_U(len, <, 2); - ND_PRINT((ndo, " %s%x", - ((bp - up) == sreoff) ? "*" : "", - EXTRACT_BE_16BITS(bp))); + ND_PRINT(" %s%x", + ((bp - up) == sreoff) ? "*" : "", GET_BE_U_2(bp)); bp += 2; len -= 2; srelen -= 2; } - return (1); + return 1; + +invalid: + return 0; }