diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-09-14 17:34:47 +0200 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-09-14 18:04:38 +0200 |
| commit | 3976533f2cdbf4373a9ea71197aead3e5699aef0 (patch) | |
| tree | c0b6a68780a712fe736f77874a77612925154300 /print-arcnet.c | |
| parent | 6795da23af1f0df9013634d4d2d22a7f8fe24e93 (diff) | |
| download | tcpdump-3976533f2cdbf4373a9ea71197aead3e5699aef0.tar.gz | |
Remove some useless tests
Because packet length (length) >= capture length (caplen).
(see the sanity checks in print.c, pretty_print_packet() function)
Diffstat (limited to 'print-arcnet.c')
| -rw-r--r-- | print-arcnet.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/print-arcnet.c b/print-arcnet.c index b5831c23..adc846ff 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,7 +212,7 @@ 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]"); return (caplen); @@ -220,7 +220,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch 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]"); return (caplen); @@ -279,7 +279,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 +290,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); } |