X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/06c19e9b09117698d4c6e19c396eb098c4fbb33f..b51a0dafc7861eb31d21524ec067d7c529a664b8:/print-pppoe.c diff --git a/print-pppoe.c b/print-pppoe.c index 8040c7ae..65518dff 100644 --- a/print-pppoe.c +++ b/print-pppoe.c @@ -17,30 +17,23 @@ * 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 + * + * Original code by Greg Stark */ -#ifndef lint -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 +/* \summary: PPP-over-Ethernet (PPPoE) printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" -#include -#include +#include "netdissect-ctype.h" -#include "interface.h" -#include "addrtoname.h" -#include "ppp.h" -#include "ethertype.h" -#include "ether.h" -#include "extract.h" /* must come after interface.h */ +#define ND_LONGJMP_FROM_TCHECK +#include "netdissect.h" +#include "extract.h" /* Codes */ enum { @@ -51,7 +44,7 @@ enum { PPPOE_PADT = 0xa7 }; -static struct tok pppoecode2str[] = { +static const struct tok pppoecode2str[] = { { PPPOE_PADI, "PADI" }, { PPPOE_PADO, "PADO" }, { PPPOE_PADR, "PADR" }, @@ -76,7 +69,7 @@ enum { PPPOE_GENERIC_ERROR = 0x0203 }; -static struct tok pppoetag2str[] = { +static const struct tok pppoetag2str[] = { { PPPOE_EOL, "EOL" }, { PPPOE_SERVICE_NAME, "Service-Name" }, { PPPOE_AC_NAME, "AC-Name" }, @@ -94,50 +87,52 @@ static struct tok pppoetag2str[] = { #define PPPOE_HDRLEN 6 #define MAXTAGPRINT 80 -u_int -pppoe_if_print(const struct pcap_pkthdr *h, register const u_char *p) +void +pppoe_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { - return (pppoe_print(p, h->len)); + ndo->ndo_protocol = "pppoe"; + ndo->ndo_ll_hdr_len += pppoe_print(ndo, p, h->len); } u_int -pppoe_print(register const u_char *bp, u_int length) +pppoe_print(netdissect_options *ndo, const u_char *bp, u_int length) { - u_int16_t pppoe_ver, pppoe_type, pppoe_code, pppoe_sessionid; + uint16_t pppoe_ver, pppoe_type, pppoe_code, pppoe_sessionid; u_int pppoe_length; const u_char *pppoe_packet, *pppoe_payload; + ndo->ndo_protocol = "pppoe"; if (length < PPPOE_HDRLEN) { - (void)printf("truncated-pppoe %u", length); - return (length); + ND_PRINT(" (length %u < %u)", length, PPPOE_HDRLEN); + goto invalid; } 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); + ND_TCHECK_LEN(pppoe_packet, PPPOE_HDRLEN); + pppoe_ver = (GET_U_1(pppoe_packet) & 0xF0) >> 4; + pppoe_type = (GET_U_1(pppoe_packet) & 0x0F); + pppoe_code = GET_U_1(pppoe_packet + 1); + pppoe_sessionid = GET_BE_U_2(pppoe_packet + 2); + pppoe_length = GET_BE_U_2(pppoe_packet + 4); pppoe_payload = pppoe_packet + PPPOE_HDRLEN; if (pppoe_ver != 1) { - printf(" [ver %d]",pppoe_ver); + ND_PRINT(" [ver %u]",pppoe_ver); } if (pppoe_type != 1) { - printf(" [type %d]",pppoe_type); + ND_PRINT(" [type %u]",pppoe_type); } - printf("PPPoE %s", tok2str(pppoecode2str, "PAD-%x", pppoe_code)); + ND_PRINT("PPPoE %s", tok2str(pppoecode2str, "PAD-%x", pppoe_code)); if (pppoe_code == PPPOE_PADI && pppoe_length > 1484 - PPPOE_HDRLEN) { - printf(" [len %u!]",pppoe_length); + ND_PRINT(" [len %u!]",pppoe_length); } if (pppoe_length > length) { - printf(" [len %u > %u!]", pppoe_length, length); + ND_PRINT(" [len %u > %u!]", pppoe_length, length); pppoe_length = length; } if (pppoe_sessionid) { - printf(" [ses 0x%x]", pppoe_sessionid); + ND_PRINT(" [ses 0x%x]", pppoe_sessionid); } if (pppoe_code) { @@ -151,61 +146,61 @@ pppoe_print(register const u_char *bp, u_int length) * 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); + tag_type = GET_BE_U_2(p); + tag_len = GET_BE_U_2(p + 2); p += 4; /* p points to tag_value */ if (tag_len) { - unsigned isascii = 0, isgarbage = 0; + unsigned ascii_count = 0, garbage_count = 0; const u_char *v; char tag_str[MAXTAGPRINT]; unsigned tag_str_len = 0; /* TODO print UTF-8 decoded text */ - TCHECK2(*p, tag_len); + ND_TCHECK_LEN(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++; + if (ND_ASCII_ISPRINT(GET_U_1(v))) { + tag_str[tag_str_len++] = GET_U_1(v); + ascii_count++; } else { tag_str[tag_str_len++] = '.'; - isgarbage++; + garbage_count++; } tag_str[tag_str_len] = 0; - if (isascii > isgarbage) { - printf(" [%s \"%*.*s\"]", + if (ascii_count > garbage_count) { + ND_PRINT(" [%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)); + ND_PRINT(" [%s 0x", tok2str(pppoetag2str, "TAG-0x%x", tag_type)); for (v=p; v