X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/57534b8c0a4699cd71415dbaf10a691a9ee5814c..9b1c2ba51b6dbc57af17c8c054ff8b55486d674c:/print-ether.c diff --git a/print-ether.c b/print-ether.c index 0a331d18..373103dc 100644 --- a/print-ether.c +++ b/print-ether.c @@ -157,12 +157,13 @@ ether_print(netdissect_options *ndo, int llc_hdrlen; struct lladdr_info src, dst; + ndo->ndo_protocol = "ether"; if (caplen < ETHER_HDRLEN) { - ND_PRINT("[|ether]"); + nd_print_trunc(ndo); return (caplen); } if (length < ETHER_HDRLEN) { - ND_PRINT("[|ether]"); + nd_print_trunc(ndo); return (length); } @@ -274,6 +275,7 @@ u_int ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { + ndo->ndo_protocol = "ether_if"; return (ether_print(ndo, p, h->len, h->caplen, NULL, NULL)); } @@ -293,8 +295,9 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, /* * Fail if we don't have enough data for the Hilscher pseudo-header. */ + ndo->ndo_protocol = "netanalyzer_if"; if (h->len < 4 || h->caplen < 4) { - ND_PRINT("[|netanalyzer]"); + nd_print_trunc(ndo); return (h->caplen); } @@ -321,8 +324,9 @@ netanalyzer_transparent_if_print(netdissect_options *ndo, * Fail if we don't have enough data for the Hilscher pseudo-header, * preamble, and SOF. */ + ndo->ndo_protocol = "netanalyzer_transparent_if"; if (h->len < 12 || h->caplen < 12) { - ND_PRINT("[|netanalyzer-transparent]"); + nd_print_trunc(ndo); return (h->caplen); } @@ -472,12 +476,3 @@ ethertype_print(netdissect_options *ndo, return (0); } } - - -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */ -