X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/4dee61760d291060f08e68eed2e7a1b98ce7e4a4..299fc72fea7a32b18a77457c70028e9679fd5c0d:/print-arcnet.c diff --git a/print-arcnet.c b/print-arcnet.c index b5831c23..e5e9bbfe 100644 --- a/print-arcnet.c +++ b/print-arcnet.c @@ -191,7 +191,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch u_char arc_type; ndo->ndo_protocol = "arcnet_if"; - if (caplen < ARC_HDRLEN || length < ARC_HDRLEN) { + if (caplen < ARC_HDRLEN) { nd_print_trunc(ndo); return (caplen); } @@ -212,17 +212,19 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch } if (phds) { - if (caplen < ARC_HDRNEWLEN || length < ARC_HDRNEWLEN) { + if (caplen < ARC_HDRNEWLEN) { arcnet_print(ndo, p, length, 0, 0, 0); - ND_PRINT("[|phds]"); + ND_PRINT(" phds"); + nd_print_trunc(ndo); return (caplen); } flag = EXTRACT_U_1(ap->arc_flag); if (flag == 0xff) { - if (caplen < ARC_HDRNEWLEN_EXC || length < ARC_HDRNEWLEN_EXC) { + if (caplen < ARC_HDRNEWLEN_EXC) { arcnet_print(ndo, p, length, 0, 0, 0); - ND_PRINT("[|phds extended]"); + ND_PRINT(" phds extended"); + nd_print_trunc(ndo); return (caplen); } flag = EXTRACT_U_1(ap->arc_flag2); @@ -279,7 +281,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons u_char arc_type; ndo->ndo_protocol = "arcnet_linux_if"; - if (caplen < ARC_LINUX_HDRLEN || length < ARC_LINUX_HDRLEN) { + if (caplen < ARC_LINUX_HDRLEN) { nd_print_trunc(ndo); return (caplen); } @@ -290,7 +292,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons switch (arc_type) { default: archdrlen = ARC_LINUX_HDRNEWLEN; - if (caplen < ARC_LINUX_HDRNEWLEN || length < ARC_LINUX_HDRNEWLEN) { + if (caplen < ARC_LINUX_HDRNEWLEN) { nd_print_trunc(ndo); return (caplen); }