X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/9d046ee0503d4c8cbfcb200c88986de876f6cae7..5ef0bcb5edd748de9d9af13c40da0395dfdd94e8:/print-brcmtag.c diff --git a/print-brcmtag.c b/print-brcmtag.c index 15449786..1e0c5884 100644 --- a/print-brcmtag.c +++ b/print-brcmtag.c @@ -110,7 +110,7 @@ brcm_tag_print(netdissect_options *ndo, const u_char *bp) ND_PRINT(", "); } -u_int +void brcm_tag_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { @@ -118,11 +118,12 @@ brcm_tag_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, u_int length = h->len; ndo->ndo_protocol = "brcm-tag"; - return (ether_print_switch_tag(ndo, p, length, caplen, - brcm_tag_print, BRCM_TAG_LEN)); + ndo->ndo_ll_hdr_len += + ether_switch_tag_print(ndo, p, length, caplen, + brcm_tag_print, BRCM_TAG_LEN); } -u_int +void brcm_tag_prepend_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { @@ -131,13 +132,9 @@ brcm_tag_prepend_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, ndo->ndo_protocol = "brcm-tag-prepend"; if (caplen < BRCM_TAG_LEN) { + ndo->ndo_ll_hdr_len += caplen; nd_print_trunc(ndo); - return (caplen); - } - - if (length < BRCM_TAG_LEN) { - nd_print_trunc(ndo); - return (length); + return; } if (ndo->ndo_eflag) { @@ -151,5 +148,6 @@ brcm_tag_prepend_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, /* * Now print the Ethernet frame following it. */ - return ether_print(ndo, p, length, caplen, NULL, NULL); + ndo->ndo_ll_hdr_len += + ether_print(ndo, p, length, caplen, NULL, NULL); }