X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/4350892475ad3a3405745fb3a71084eb45e4dc3a..69f03c1c03b280b9c5863bfb47e8847d59b4ee6b:/print-cdp.c diff --git a/print-cdp.c b/print-cdp.c index 9f5c24bc..dfb55fa7 100644 --- a/print-cdp.c +++ b/print-cdp.c @@ -309,7 +309,7 @@ cdp_print(netdissect_options *ndo, } } - if (!covered) { + if (ndo->ndo_vflag && !covered) { ND_TCHECK_LEN(tptr, len); print_unknown_data(ndo, tptr, "\n\t ", len); } @@ -389,8 +389,7 @@ cdp_print_addr(netdissect_options *ndo, ND_PRINT("IPv4 (%u) %s", num, GET_IPADDR_STRING(p)); p += al; l -= al; - } - else if (pt == PT_IEEE_802_2 && pl == 8 && + } else if (pt == PT_IEEE_802_2 && pl == 8 && memcmp(p, prot_ipv6, 8) == 0 && al == 16) { /* * IPv6: protocol type = IEEE 802.2 header, @@ -408,8 +407,7 @@ cdp_print_addr(netdissect_options *ndo, ND_PRINT("IPv6 (%u) %s", num, GET_IP6ADDR_STRING(p)); p += al; l -= al; - } - else { + } else { /* * Generic case: just print raw data */