X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/882a7b5776f350e108936064628238888d43bcad..2d02497b02b040bd885825dba9230f86a8ffce0e:/print-cdp.c diff --git a/print-cdp.c b/print-cdp.c index a725eb6e..6f8f3567 100644 --- a/print-cdp.c +++ b/print-cdp.c @@ -24,18 +24,19 @@ * http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm */ -#define NETDISSECT_REWORKED +/* \summary: Cisco Discovery Protocol (CDP) printer */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include #include -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" -#include "extract.h" /* must come after interface.h */ +#include "extract.h" #include "nlpid.h" static const char tstr[] = "[|cdp]"; @@ -147,7 +148,7 @@ cdp_print(netdissect_options *ndo, if (!ndo->ndo_vflag) ND_PRINT((ndo, ", Device-ID ")); ND_PRINT((ndo, "'")); - fn_printn(ndo, tptr, len, NULL); + (void)fn_printn(ndo, tptr, len, NULL); ND_PRINT((ndo, "'")); break; case 0x02: /* Address */ @@ -156,7 +157,7 @@ cdp_print(netdissect_options *ndo, break; case 0x03: /* Port-ID */ ND_PRINT((ndo, "'")); - fn_printn(ndo, tptr, len, NULL); + (void)fn_printn(ndo, tptr, len, NULL); ND_PRINT((ndo, "'")); break; case 0x04: /* Capabilities */ @@ -170,14 +171,16 @@ cdp_print(netdissect_options *ndo, ND_PRINT((ndo, "\n\t ")); for (i=0;i 1) { ND_PRINT((ndo, "/")); - fn_printn(ndo, tptr + 1, len - 1, NULL); + (void)fn_printn(ndo, tptr + 1, len - 1, NULL); } break; default: @@ -278,11 +281,9 @@ cdp_print_addr(netdissect_options *ndo, { int pt, pl, al, num; const u_char *endp = p + l; -#ifdef INET6 static const u_char prot_ipv6[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00, 0x86, 0xdd }; -#endif ND_TCHECK2(*p, 4); if (p + 4 > endp) @@ -317,7 +318,6 @@ cdp_print_addr(netdissect_options *ndo, ND_PRINT((ndo, "IPv4 (%u) %s", num, ipaddr_string(ndo, p))); p += 4; } -#ifdef INET6 else if (pt == PT_IEEE_802_2 && pl == 8 && memcmp(p, prot_ipv6, 8) == 0 && al == 16) { /* @@ -334,7 +334,6 @@ cdp_print_addr(netdissect_options *ndo, ND_PRINT((ndo, "IPv6 (%u) %s", num, ip6addr_string(ndo, p))); p += al; } -#endif else { /* * Generic case: just print raw data