]> The Tcpdump Group git mirrors - tcpdump/commitdiff
ARCnet: Switch to nd_trunc_longjmp(). [skip ci]
authorDenis Ovsienko <[email protected]>
Sat, 10 Oct 2020 21:36:27 +0000 (22:36 +0100)
committerDenis Ovsienko <[email protected]>
Sat, 10 Oct 2020 21:36:27 +0000 (22:36 +0100)
print-arcnet.c

index 0acd6ad61ac8d5711633fc68d5d14f4e0ee7c9f3..5f6aaf9c4308bdab67c744012475df55736202c8 100644 (file)
@@ -192,9 +192,8 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
 
        ndo->ndo_protocol = "arcnet";
        if (caplen < ARC_HDRLEN) {
-               nd_print_trunc(ndo);
                ndo->ndo_ll_hdr_len += caplen;
-               return;
+               nd_trunc_longjmp(ndo);
        }
 
        ap = (const struct arc_header *)p;
@@ -216,9 +215,8 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
                if (caplen < ARC_HDRNEWLEN) {
                        arcnet_print(ndo, p, length, 0, 0, 0);
                        ND_PRINT(" phds");
-                       nd_print_trunc(ndo);
                        ndo->ndo_ll_hdr_len += caplen;
-                       return;
+                       nd_trunc_longjmp(ndo);
                }
 
                flag = GET_U_1(ap->arc_flag);
@@ -226,9 +224,8 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
                        if (caplen < ARC_HDRNEWLEN_EXC) {
                                arcnet_print(ndo, p, length, 0, 0, 0);
                                ND_PRINT(" phds extended");
-                               nd_print_trunc(ndo);
                                ndo->ndo_ll_hdr_len += caplen;
-                               return;
+                               nd_trunc_longjmp(ndo);
                        }
                        flag = GET_U_1(ap->arc_flag2);
                        seqid = GET_BE_U_2(ap->arc_seqid2);
@@ -286,9 +283,8 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
 
        ndo->ndo_protocol = "arcnet_linux";
        if (caplen < ARC_LINUX_HDRLEN) {
-               nd_print_trunc(ndo);
                ndo->ndo_ll_hdr_len += caplen;
-               return;
+               nd_trunc_longjmp(ndo);
        }
 
        ap = (const struct arc_linux_header *)p;
@@ -298,9 +294,8 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
        default:
                archdrlen = ARC_LINUX_HDRNEWLEN;
                if (caplen < ARC_LINUX_HDRNEWLEN) {
-                       nd_print_trunc(ndo);
                        ndo->ndo_ll_hdr_len += caplen;
-                       return;
+                       nd_trunc_longjmp(ndo);
                }
                break;
        case ARCTYPE_IP_OLD: