* 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
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <netdissect-stdinc.h>
-
-#include <string.h>
+#include "netdissect-stdinc.h"
#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[] = {
{ 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 */
{
u_int len = length, vers;
+ ndo->ndo_protocol = "gre";
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) {
- 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((ndo, " ERROR: unknown-version"));
- break;
- }
- return;
+ ND_PRINT(" ERROR: unknown-version");
+ break;
+ }
+ return;
trunc:
- ND_PRINT((ndo, "%s", tstr));
- return;
+ nd_print_trunc(ndo);
}
static void
uint16_t flags, prot;
/* 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)));
+ 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_TCHECK_2(bp);
if (len < 2)
goto trunc;
- prot = EXTRACT_BE_U_2(bp);
+ prot = GET_BE_U_2(bp);
len -= 2;
bp += 2;
if (len < 2)
goto trunc;
if (ndo->ndo_vflag)
- ND_PRINT((ndo, ", 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((ndo, ", off 0x%x", EXTRACT_BE_U_2(bp)));
+ ND_PRINT(", off 0x%x", GET_BE_U_2(bp));
bp += 2;
len -= 2;
}
ND_TCHECK_4(bp);
if (len < 4)
goto trunc;
- ND_PRINT((ndo, ", key=0x%x", EXTRACT_BE_U_4(bp)));
+ ND_PRINT(", key=0x%x", GET_BE_U_4(bp));
bp += 4;
len -= 4;
}
ND_TCHECK_4(bp);
if (len < 4)
goto trunc;
- ND_PRINT((ndo, ", seq %u", EXTRACT_BE_U_4(bp)));
+ ND_PRINT(", seq %u", GET_BE_U_4(bp));
bp += 4;
len -= 4;
}
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;
}
}
- 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);
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));
+ nd_print_trunc(ndo);
}
static void
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((ndo, ", 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;
ND_TCHECK_4(bp);
if (len < 4)
goto trunc;
- k = EXTRACT_BE_U_4(bp);
- ND_PRINT((ndo, ", call %d", k & 0xffff));
+ k = GET_BE_U_4(bp);
+ ND_PRINT(", call %u", k & 0xffff);
len -= 4;
bp += 4;
}
ND_TCHECK_4(bp);
if (len < 4)
goto trunc;
- ND_PRINT((ndo, ", seq %u", EXTRACT_BE_U_4(bp)));
+ ND_PRINT(", seq %u", GET_BE_U_4(bp));
bp += 4;
len -= 4;
}
ND_TCHECK_4(bp);
if (len < 4)
goto trunc;
- ND_PRINT((ndo, ", ack %u", EXTRACT_BE_U_4(bp)));
+ 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));
+ nd_print_trunc(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);
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));
+ ND_PRINT(", badoffset=%u", sreoff);
return (1);
}
if (srelen & 3) {
- ND_PRINT((ndo, ", badlength=%u", srelen));
+ ND_PRINT(", badlength=%u", srelen);
return (1);
}
if (sreoff >= srelen) {
- ND_PRINT((ndo, ", badoff/len=%u/%u", sreoff, srelen));
+ ND_PRINT(", badoff/len=%u/%u", sreoff, srelen);
return (1);
}
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((ndo, " %s%s",
- ((bp - up) == sreoff) ? "*" : "", buf));
+ ND_PRINT(" %s%s",
+ ((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;
if (sreoff & 1) {
- ND_PRINT((ndo, ", badoffset=%u", sreoff));
+ ND_PRINT(", badoffset=%u", sreoff);
return (1);
}
if (srelen & 1) {
- ND_PRINT((ndo, ", badlength=%u", srelen));
+ ND_PRINT(", badlength=%u", srelen);
return (1);
}
if (sreoff >= srelen) {
- ND_PRINT((ndo, ", badoff/len=%u/%u", sreoff, srelen));
+ ND_PRINT(", badoff/len=%u/%u", sreoff, srelen);
return (1);
}
while (srelen != 0) {
- if (!ND_TTEST_2(bp))
- return (0);
+ ND_TCHECK_2(bp);
if (len < 2)
return (0);
- ND_PRINT((ndo, " %s%x",
- ((bp - up) == sreoff) ? "*" : "",
- EXTRACT_BE_U_2(bp)));
+ ND_PRINT(" %s%x",
+ ((bp - up) == sreoff) ? "*" : "", GET_BE_U_2(bp));
bp += 2;
len -= 2;
srelen -= 2;
}
return (1);
+trunc:
+ return 0;
}
projects / tcpdump / blobdiff