X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/513f782ae18791f0c925b9235da749b38159b607..6bda3d15156ec0cf40f82fc2e868c68c1cb05ff7:/print-arcnet.c diff --git a/print-arcnet.c b/print-arcnet.c index 268e2b8a..b5831c23 100644 --- a/print-arcnet.c +++ b/print-arcnet.c @@ -24,7 +24,7 @@ /* \summary: Attached Resource Computer NETwork (ARCNET) printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "netdissect-stdinc.h" @@ -118,17 +118,16 @@ static const struct tok arctypemap[] = { { 0, 0 } }; -static inline void +static void arcnet_print(netdissect_options *ndo, const u_char *bp, u_int length, int phds, u_int flag, u_int seqid) { const struct arc_header *ap; const char *arctypename; - + ndo->ndo_protocol = "arcnet"; ap = (const struct arc_header *)bp; - if (ndo->ndo_qflag) { ND_PRINT("%02x %02x %u: ", EXTRACT_U_1(ap->arc_shost), @@ -191,8 +190,9 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch u_int seqid = 0; u_char arc_type; + ndo->ndo_protocol = "arcnet_if"; if (caplen < ARC_HDRLEN || length < ARC_HDRLEN) { - ND_PRINT("[|arcnet]"); + nd_print_trunc(ndo); return (caplen); } @@ -278,8 +278,9 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons int archdrlen = 0; u_char arc_type; + ndo->ndo_protocol = "arcnet_linux_if"; if (caplen < ARC_LINUX_HDRLEN || length < ARC_LINUX_HDRLEN) { - ND_PRINT("[|arcnet]"); + nd_print_trunc(ndo); return (caplen); } @@ -290,7 +291,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons default: archdrlen = ARC_LINUX_HDRNEWLEN; if (caplen < ARC_LINUX_HDRNEWLEN || length < ARC_LINUX_HDRNEWLEN) { - ND_PRINT("[|arcnet]"); + nd_print_trunc(ndo); return (caplen); } break; @@ -360,10 +361,3 @@ arcnet_encap_print(netdissect_options *ndo, u_char arctype, const u_char *p, return (0); } } - -/* - * Local Variables: - * c-style: bsd - * End: - */ -