X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3d932490b826facb568937a1290910a1265267f5..a4a13734bb167ab42f86da26c3aa1cb4da9954fd:/print-cdp.c diff --git a/print-cdp.c b/print-cdp.c index 587166f2..7bc617a9 100644 --- a/print-cdp.c +++ b/print-cdp.c @@ -25,8 +25,8 @@ */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-cdp.c,v 1.15 2002-08-01 08:53:02 risso Exp $"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-cdp.c,v 1.25 2004-10-07 14:53:11 hannes Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -41,138 +41,196 @@ static const char rcsid[] = #include "interface.h" #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ +#include "nlpid.h" + +#define CDP_HEADER_LEN 4 + +static struct tok cdp_tlv_values[] = { + { 0x01, "Device-ID"}, + { 0x02, "Address"}, + { 0x03, "Port-ID"}, + { 0x04, "Capability"}, + { 0x05, "Version String"}, + { 0x06, "Platform"}, + { 0x07, "Prefixes"}, + { 0x08, "Protocol-Hello option"}, + { 0x09, "VTP Management Domain"}, + { 0x0a, "Native VLAN ID"}, + { 0x0b, "Duplex"}, + { 0x0e, "ATA-186 VoIP VLAN request"}, + { 0x0f, "ATA-186 VoIP VLAN assignment"}, + { 0x10, "power consumption"}, + { 0x11, "MTU"}, + { 0x12, "AVVID trust bitmap"}, + { 0x13, "AVVID untrusted ports CoS"}, + { 0x14, "System Name"}, + { 0x15, "System Object ID (not decoded)"}, + { 0x16, "Management Addresses"}, + { 0x17, "Physical Location"}, + { 0, NULL} +}; + +static struct tok cdp_capability_values[] = { + { 0x01, "Router" }, + { 0x02, "Transparent Bridge" }, + { 0x04, "Source Route Bridge" }, + { 0x08, "L2 Switch" }, + { 0x10, "L3 capable" }, + { 0x20, "IGMP snooping" }, + { 0x40, "L1 capable" }, + { 0, NULL } +}; static int cdp_print_addr(const u_char *, int); static int cdp_print_prefixes(const u_char *, int); static unsigned long cdp_get_number(const u_char *, int); void -cdp_print(const u_char *p, u_int length, u_int caplen, - const u_char *esrc, const u_char *edst) +cdp_print(const u_char *pptr, u_int length, u_int caplen) { - u_int i; - int type, len; + int type, len, i, j; + const u_char *tptr; - /* Cisco Discovery Protocol */ - - if (caplen < 4) { + if (caplen < CDP_HEADER_LEN) { (void)printf("[|cdp]"); return; } - i = 0; /* CDP data starts at offset 0 */ - printf("CDP v%u, ttl=%us", p[i], p[i + 1]); - i += 4; /* skip version, TTL and chksum */ + tptr = pptr; /* temporary pointer */ - while (i < length) { - if (i + 4 > caplen) - goto trunc; - type = (p[i] << 8) + p[i + 1]; - len = (p[i + 2] << 8) + p[i + 3]; + if (!TTEST2(*tptr, CDP_HEADER_LEN)) + goto trunc; + printf("CDPv%u, ttl: %us", *tptr, *(tptr+1)); + if (vflag) + printf(", checksum: %u (unverified), length %u", EXTRACT_16BITS(tptr), length); + tptr += CDP_HEADER_LEN; - if (vflag > 1) - printf("\n\t"); + while (tptr < (pptr+length)) { - if (vflag) - printf(" %02x/%02x", type, len); + if (!TTEST2(*tptr, 4)) /* read out Type and Length */ + goto trunc; + type = EXTRACT_16BITS(tptr); + len = EXTRACT_16BITS(tptr+2); /* object length includes the 4 bytes header length */ + tptr += 4; + len -= 4; - if (i + len > caplen) + if (!TTEST2(*tptr, len)) goto trunc; - switch (type) { - case 0x00: - printf(" Goodbye"); - break; - case 0x01: - printf(" DevID '%.*s'", len - 4, p + i + 4); + if (vflag || type == 1) { /* in non-verbose mode just print Device-ID */ + + if (vflag) + printf("\n\t%s (0x%02x), length: %u byte%s: ", + tok2str(cdp_tlv_values,"unknown field type", type), + type, + len, + PLURAL_SUFFIX(len)); /* plural */ + + switch (type) { + + case 0x01: /* Device-ID */ + if (!vflag) + printf(", Device-ID "); + printf("'"); + fn_printn(tptr, len, NULL); + printf("'"); break; - case 0x02: - printf(" Addr"); - if (cdp_print_addr(p + i + 4, len - 4) < 0) - goto trunc; + case 0x02: /* Address */ + if (cdp_print_addr(tptr, len) < 0) + goto trunc; break; - case 0x03: - printf(" PortID '%.*s'", len - 4, p + i + 4); + case 0x03: /* Port-ID */ + printf("'"); + fn_printn(tptr, len, NULL); + printf("'"); break; - case 0x04: - printf(" CAP 0x%02x", (unsigned) p[i + 7]); + case 0x04: /* Capabilities */ + printf("(0x%08x): %s", + EXTRACT_32BITS(tptr), + bittok2str(cdp_capability_values, "none",EXTRACT_32BITS(tptr))); break; - case 0x05: - if (vflag > 1) - printf(" Version:\n%.*s", len - 4, p + i + 4); - else - printf(" Version: (suppressed)"); + case 0x05: /* Version */ + printf("\n\t "); + for (i=0;i 1) { + printf("/"); + fn_printn(tptr + 1, len - 1, NULL); + } break; - default: - printf(" unknown field type %02x, len %d", type, len); + default: + print_unknown_data(tptr,"\n\t ",len); break; - } - + } + } /* avoid infinite loop */ if (len == 0) break; - i += len; + tptr = tptr+len; } + if (vflag < 1) + printf(", length %u",caplen); return; - trunc: printf("[|cdp]"); } @@ -199,23 +257,24 @@ cdp_print_addr(const u_char * p, int l) }; #endif + TCHECK2(*p, 2); num = EXTRACT_32BITS(p); p += 4; - printf(" (%d): ", num); - while (p < endp && num >= 0) { + TCHECK2(*p, 2); if (p + 2 > endp) goto trunc; pt = p[0]; /* type of "protocol" field */ pl = p[1]; /* length of "protocol" field */ p += 2; + TCHECK2(p[pl], 2); if (p + pl + 2 > endp) goto trunc; al = EXTRACT_16BITS(&p[pl]); /* address length */ - if (pt == PT_NLPID && pl == 1 && *p == 0xcc && al == 4) { + if (pt == PT_NLPID && pl == 1 && *p == NLPID_IP && al == 4) { /* * IPv4: protocol type = NLPID, protocol length = 1 * (1-byte NLPID), protocol = 0xcc (NLPID for IPv4), @@ -223,9 +282,12 @@ cdp_print_addr(const u_char * p, int l) */ p += 3; + TCHECK2(*p, 4); if (p + 4 > endp) goto trunc; - printf("IPv4 %u.%u.%u.%u", p[0], p[1], p[2], p[3]); + printf("IPv4 (%u) %s", + num, + ipaddr_string(p)); p += 4; } #ifdef INET6 @@ -238,10 +300,13 @@ cdp_print_addr(const u_char * p, int l) * Ethertype, address length = 16 */ p += 10; + TCHECK2(*p, al); if (p + al > endp) goto trunc; - printf("IPv6 %s", ip6addr_string(p)); + printf("IPv6 (%u) %s", + num, + ip6addr_string(p)); p += al; } #endif @@ -249,16 +314,19 @@ cdp_print_addr(const u_char * p, int l) /* * Generic case: just print raw data */ + TCHECK2(*p, pl); if (p + pl > endp) goto trunc; printf("pt=0x%02x, pl=%d, pb=", *(p - 2), pl); while (pl-- > 0) printf(" %02x", *p++); + TCHECK2(*p, 2); if (p + 2 > endp) goto trunc; al = (*p << 8) + *(p + 1); printf(", al=%d, a=", al); p += 2; + TCHECK2(*p, al); if (p + al > endp) goto trunc; while (al-- > 0)