X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b9ac23ce92ca22483d56ee3192c54aa8f782f9ac..4c2790a43252b9cac1fe7f6b50b51c3c55d2370a:/print-pppoe.c diff --git a/print-pppoe.c b/print-pppoe.c index 88dac89f..bcc976c4 100644 --- a/print-pppoe.c +++ b/print-pppoe.c @@ -17,33 +17,21 @@ * 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. + * + * Original code by Greg Stark */ #ifndef lint -static const char rcsid[] = -"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.2 1999-11-21 09:36:59 fenner Exp $ (LBL)"; +static const char rcsid[] _U_ = +"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.31 2005-04-26 19:48:38 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include -#include -#include +#include -#if __STDC__ -struct mbuf; -struct rtentry; -#endif -#include - -#include -#include - -#ifdef HAVE_MEMORY_H -#include -#endif #include #include @@ -51,174 +39,173 @@ struct rtentry; #include "addrtoname.h" #include "ppp.h" #include "ethertype.h" +#include "ether.h" #include "extract.h" /* must come after interface.h */ /* Codes */ -enum { - PPPOE_PADI = 0x09, - PPPOE_PADO = 0x07, - PPPOE_PADR = 0x19, - PPPOE_PADS = 0x65, - PPPOE_PADT = 0xa7 +enum { + PPPOE_PADI = 0x09, + PPPOE_PADO = 0x07, + PPPOE_PADR = 0x19, + PPPOE_PADS = 0x65, + PPPOE_PADT = 0xa7 }; static struct tok pppoecode2str[] = { - { PPPOE_PADI, "PADI"}, - { PPPOE_PADO, "PADO"}, - { PPPOE_PADR, "PADR"}, - { PPPOE_PADS, "PADS"}, - { PPPOE_PADT, "PADT"}, - { 0, ""}, /* PPP Data */ - { 0, NULL } + { PPPOE_PADI, "PADI" }, + { PPPOE_PADO, "PADO" }, + { PPPOE_PADR, "PADR" }, + { PPPOE_PADS, "PADS" }, + { PPPOE_PADT, "PADT" }, + { 0, "" }, /* PPP Data */ + { 0, NULL } }; /* Tags */ enum { - PPPOE_EOL = 0, - PPPOE_SERVICE_NAME = 0x0101, - PPPOE_AC_NAME = 0x0102, - PPPOE_HOST_UNIQ = 0x0103, - PPPOE_AC_COOKIE = 0x0104, - PPPOE_VENDOR = 0x0105, - PPPOE_RELAY_SID = 0x0110, - PPPOE_SERVICE_NAME_ERROR = 0x0201, - PPPOE_AC_SYSTEM_ERROR = 0x0202, - PPPOE_GENERIC_ERROR = 0x0203, + PPPOE_EOL = 0, + PPPOE_SERVICE_NAME = 0x0101, + PPPOE_AC_NAME = 0x0102, + PPPOE_HOST_UNIQ = 0x0103, + PPPOE_AC_COOKIE = 0x0104, + PPPOE_VENDOR = 0x0105, + PPPOE_RELAY_SID = 0x0110, + PPPOE_MAX_PAYLOAD = 0x0120, + PPPOE_SERVICE_NAME_ERROR = 0x0201, + PPPOE_AC_SYSTEM_ERROR = 0x0202, + PPPOE_GENERIC_ERROR = 0x0203 }; static struct tok pppoetag2str[] = { - { PPPOE_EOL, "EOL"}, - { PPPOE_SERVICE_NAME, "Service-Name" }, - { PPPOE_AC_NAME, "AC-Name" }, - { PPPOE_HOST_UNIQ, "Host-Uniq" }, - { PPPOE_AC_COOKIE, "AC-Cookie" }, - { PPPOE_VENDOR, "Vendor-Specific" }, - { PPPOE_RELAY_SID, "Relay-Session-ID" }, - { PPPOE_SERVICE_NAME_ERROR, "Service-Name-Error" }, - { PPPOE_AC_SYSTEM_ERROR, "AC-System-Error" }, - { PPPOE_GENERIC_ERROR, "Generic-Error" }, - { 0, NULL} + { PPPOE_EOL, "EOL" }, + { PPPOE_SERVICE_NAME, "Service-Name" }, + { PPPOE_AC_NAME, "AC-Name" }, + { PPPOE_HOST_UNIQ, "Host-Uniq" }, + { PPPOE_AC_COOKIE, "AC-Cookie" }, + { PPPOE_VENDOR, "Vendor-Specific" }, + { PPPOE_RELAY_SID, "Relay-Session-ID" }, + { PPPOE_MAX_PAYLOAD, "PPP-Max-Payload" }, + { PPPOE_SERVICE_NAME_ERROR, "Service-Name-Error" }, + { PPPOE_AC_SYSTEM_ERROR, "AC-System-Error" }, + { PPPOE_GENERIC_ERROR, "Generic-Error" }, + { 0, NULL } }; #define PPPOE_HDRLEN 6 +#define MAXTAGPRINT 80 + +u_int +pppoe_if_print(const struct pcap_pkthdr *h, register const u_char *p) +{ + return (pppoe_print(p, h->len)); +} -void -pppoe_print(register const u_char *bp, u_int length, u_int caplen) +u_int +pppoe_print(register const u_char *bp, u_int length) { - 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= 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_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