* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
*/
#ifndef lint
-static const char rcsid[] =
-"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.21 2002-12-19 09:39:14 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.24.2.6 2004-08-27 03:56:22 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
};
#define PPPOE_HDRLEN 6
+#define MAXTAGPRINT 80
u_int
pppoe_if_print(const struct pcap_pkthdr *h, register const u_char *p)
u_int
pppoe_print(register const u_char *bp, u_int length)
{
- u_short pppoe_ver, pppoe_type, pppoe_code, pppoe_sessionid, pppoe_length;
+ u_int16_t pppoe_ver, pppoe_type, pppoe_code, pppoe_sessionid;
+ u_int pppoe_length;
const u_char *pppoe_packet, *pppoe_payload;
- pppoe_packet = bp;
- if (pppoe_packet > snapend) {
- printf("[|pppoe]");
- return (PPPOE_HDRLEN);
+ if (length < PPPOE_HDRLEN) {
+ (void)printf("truncated-pppoe %u", length);
+ return (length);
}
-
+ length -= PPPOE_HDRLEN;
+ pppoe_packet = bp;
+ TCHECK2(*pppoe_packet, PPPOE_HDRLEN);
pppoe_ver = (pppoe_packet[0] & 0xF0) >> 4;
pppoe_type = (pppoe_packet[0] & 0x0F);
pppoe_code = pppoe_packet[1];
pppoe_length = EXTRACT_16BITS(pppoe_packet + 4);
pppoe_payload = pppoe_packet + PPPOE_HDRLEN;
- if (snapend < pppoe_payload) {
- printf(" truncated PPPoE");
- return (PPPOE_HDRLEN);
- }
-
if (pppoe_ver != 1) {
printf(" [ver %d]",pppoe_ver);
}
printf("PPPoE %s", tok2str(pppoecode2str, "PAD-%x", pppoe_code));
if (pppoe_code == PPPOE_PADI && pppoe_length > 1484 - PPPOE_HDRLEN) {
- printf(" [len %d!]",pppoe_length);
+ printf(" [len %u!]",pppoe_length);
+ }
+ if (pppoe_length > length) {
+ printf(" [len %u > %u!]", pppoe_length, length);
+ pppoe_length = length;
}
if (pppoe_sessionid) {
printf(" [ses 0x%x]", pppoe_sessionid);
}
- if (pppoe_payload + pppoe_length < snapend) {
-#if 0
- const u_char *x = pppoe_payload + pppoe_length;
- printf(" [length %d (%d extra bytes)]",
- pppoe_length, snapend - pppoe_payload - pppoe_length);
- default_print(x, snapend - x);
+ if (pppoe_length < length && length + ETHER_HDRLEN > 60) {
+ /* (small packets are probably just padded up to the ethernet
+ minimum of 60 bytes of data + 4 bytes of CRC) */
+ printf(" [length %u (%u extra bytes)]",
+ pppoe_length, length - pppoe_length);
+#if RESPECT_PAYLOAD_LENGTH
+ if (snaplend > pppoe_payload+pppoe_length)
+ snapend = pppoe_payload+pppoe_length;
+#else
+ /* Actual PPPoE implementations appear to ignore the payload
+ length and use the full ethernet frame anyways */
+ pppoe_length = length;
#endif
- snapend = pppoe_payload+pppoe_length;
}
if (pppoe_code) {
/*
* loop invariant:
- * p points to next tag,
+ * p points to current tag,
* tag_type is previous tag or 0xffff for first iteration
*/
- while (tag_type && p + 4 < pppoe_payload + length &&
- p + 4 < snapend) {
+ while (tag_type && p < pppoe_payload + pppoe_length) {
+ TCHECK2(*p, 4);
tag_type = EXTRACT_16BITS(p);
tag_len = EXTRACT_16BITS(p + 2);
p += 4;
/* p points to tag_value */
if (tag_len) {
- int isascii = 1;
+ unsigned isascii = 0, isgarbage = 0;
const u_char *v = p;
- u_short l;
-
- for (v = p; v < p + tag_len; v++)
- if (*v >= 127 || *v < 32) {
- isascii = 0;
- break;
+ char tag_str[MAXTAGPRINT];
+ unsigned tag_str_len = 0;
+
+ /* TODO print UTF-8 decoded text */
+ TCHECK2(*p, tag_len);
+ for (v = p; v < p + tag_len && tag_str_len < MAXTAGPRINT-1; v++)
+ if (*v >= 32 && *v < 127) {
+ tag_str[tag_str_len++] = *v;
+ isascii++;
+ } else {
+ tag_str[tag_str_len++] = '.';
+ isgarbage++;
}
+ tag_str[tag_str_len] = 0;
- /* TODO print UTF8 decoded text */
- if (isascii) {
- l = (tag_len < 80 ? tag_len : 80);
+ if (isascii > isgarbage) {
printf(" [%s \"%*.*s\"]",
- tok2str(pppoetag2str, "TAG-0x%x", tag_type),
- l, l, p);
- } else
- printf(" [%s UTF8]",
- tok2str(pppoetag2str, "TAG-0x%x", tag_type));
+ tok2str(pppoetag2str, "TAG-0x%x", tag_type),
+ (int)tag_str_len,
+ (int)tag_str_len,
+ tag_str);
+ } else {
+ /* Print hex, not fast to abuse printf but this doesn't get used much */
+ printf(" [%s 0x", tok2str(pppoetag2str, "TAG-0x%x", tag_type));
+ for (v=p; v<p+tag_len; v++) {
+ printf("%02X", *v);
+ }
+ printf("]");
+ }
+
+
} else
printf(" [%s]", tok2str(pppoetag2str,
"TAG-0x%x", tag_type));
printf(" ");
return (PPPOE_HDRLEN + ppp_print(pppoe_payload, pppoe_length));
}
+
+trunc:
+ printf("[|pppoe]");
+ return (PPPOE_HDRLEN);
}
projects / tcpdump / blobdiff