- register const struct ether_header *eh;
- register u_short pppoe_ver, pppoe_type, pppoe_code, pppoe_sessionid, pppoe_length;
- const u_char *pppoe_packet, *pppoe_payload;
-
- eh = (struct ether_header *)packetp;
- pppoe_packet = packetp+sizeof(struct ether_header);
- if (pppoe_packet > snapend) {
- printf("[|pppoe]");
- return;
- }
-
- pppoe_ver = (pppoe_packet[0]&0xF0)>>4;
- pppoe_type = (pppoe_packet[0]&0x0F);
- pppoe_code = (pppoe_packet[1]);
- pppoe_sessionid = (EXTRACT_16BITS(pppoe_packet+2));
- pppoe_length = (EXTRACT_16BITS(pppoe_packet+4));
- pppoe_payload = pppoe_packet+6;
-
- if (snapend < pppoe_payload) {
- printf(" truncated PPPoE");
- return;
- }
-
- if (pppoe_ver != 1) {
- printf(" [ver %d]",pppoe_ver);
- }
- if (pppoe_type != 1) {
- printf(" [type %d]",pppoe_type);
- }
-
- printf("PPPoE %s", tok2str(pppoecode2str, "PAD-%x", pppoe_code));
- if (pppoe_code == PPPOE_PADI && pppoe_length > 1484-PPPOE_HDRLEN) {
- printf(" [len %d!]",pppoe_length);
- }
- if (pppoe_sessionid) {
- printf(" [ses 0x%x]",pppoe_sessionid);
- }
-
- if (pppoe_payload + pppoe_length < snapend) {
- /*
- printf(" [length %d (%d extra bytes)]", pppoe_length, snapend-pppoe_payload-pppoe_length);
- {
- const u_char *x = pppoe_payload+pppoe_length;
- default_print(x, snapend - x);
- }
- */
- snapend = pppoe_payload+pppoe_length;
- }
-
-
- if (pppoe_code) {
- /* PPP session packets don't contain tags */
- u_short tag_type = -1, tag_len;
- const u_char *p = pppoe_payload;
-
- /* loop invariant:
- p points to next tag,
- tag_type is previous tag or -1 for first iteration
- */
- while (tag_type &&
- p+4 < pppoe_payload + length &&
- p+4 < snapend) {
- tag_type = EXTRACT_16BITS(p);
- tag_len = EXTRACT_16BITS(p+2);
- p += 4;
- /* p points to tag_value */
-
- if (tag_len) {
- int isascii = 1;
- const u_char *v = p;
-
- for (v=p; v<p+tag_len; v++)
- if (*v >= 127 || *v < 32) {
- isascii = 0;
- break;
- }
-
- /* TODO print UTF8 decoded text */
- if (isascii)
- printf(" [%s \"%*.*s\"]",
- tok2str(pppoetag2str, "TAG-0x%x", tag_type),
- tag_len < 80 ? tag_len : 80,
- tag_len < 80 ? tag_len : 80,
- p
- );
- else
- printf(" [%s UTF8]", tok2str(pppoetag2str, "TAG-0x%x", tag_type));
- } else
- printf(" [%s]", tok2str(pppoetag2str, "TAG-0x%x", tag_type));
-
- p += tag_len;
- /* p points to next tag */
- }
- } else {
- u_short ptype;
- if (pppoe_payload[0] & 0x1) {
- ptype = pppoe_payload[0];
- pppoe_payload +=1;
- pppoe_length -=1;
- } else if (pppoe_payload[1] & 0x1) {
- ptype = ntohs(*(u_short *)pppoe_payload);
- pppoe_payload +=2;
- pppoe_length -=2;
- } else {
- printf(" Invalid PPP protocol ID: %x %x", pppoe_payload[0],pppoe_payload[1]);
- return;
- }
- printf(" ");
- if (ptype == PPP_IP)
- ip_print(pppoe_payload, pppoe_length);
- else if (ptype == PPP_LCP)
- lcp_print(pppoe_payload, pppoe_length);
- else
- printf("%s ", tok2str(ppptype2str, "proto-0x%x", ptype));
- }
- return;
+ u_int16_t pppoe_ver, pppoe_type, pppoe_code, pppoe_sessionid;
+ u_int pppoe_length;
+ const u_char *pppoe_packet, *pppoe_payload;
+
+ 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_sessionid = EXTRACT_16BITS(pppoe_packet + 2);
+ pppoe_length = EXTRACT_16BITS(pppoe_packet + 4);
+ pppoe_payload = pppoe_packet + PPPOE_HDRLEN;
+
+ if (pppoe_ver != 1) {
+ printf(" [ver %d]",pppoe_ver);
+ }
+ if (pppoe_type != 1) {
+ printf(" [type %d]",pppoe_type);
+ }
+
+ printf("PPPoE %s", tok2str(pppoecode2str, "PAD-%x", pppoe_code));
+ if (pppoe_code == PPPOE_PADI && pppoe_length > 1484 - PPPOE_HDRLEN) {
+ 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_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
+ }
+
+ if (pppoe_code) {
+ /* PPP session packets don't contain tags */
+ u_short tag_type = 0xffff, tag_len;
+ const u_char *p = pppoe_payload;
+
+ /*
+ * loop invariant:
+ * p points to current tag,
+ * tag_type is previous tag or 0xffff for first iteration
+ */
+ 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) {
+ unsigned isascii = 0, isgarbage = 0;
+ const u_char *v = p;
+ 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;
+
+ if (isascii > isgarbage) {
+ printf(" [%s \"%*.*s\"]",
+ 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));
+
+ p += tag_len;
+ /* p points to next tag */
+ }
+ return (0);
+ } else {
+ /* PPPoE data */
+ printf(" ");
+ return (PPPOE_HDRLEN + ppp_print(pppoe_payload, pppoe_length));
+ }
+
+trunc:
+ printf("[|pppoe]");
+ return (PPPOE_HDRLEN);
projects / tcpdump / blobdiff