CI: Add warning exemptions for Sun C (suncc-5.15) on Solaris 10

[tcpdump] / print-pktap.c

diff --git a/print-pktap.c b/print-pktap.c
index b38ad6419b783c08fe3c55de0398a617c363078f..d1c391d5ce1b21adef3bb814c671f2b3c1f48237 100644 (file)
--- a/print-pktap.c
+++ b/print-pktap.c
@@ -21,12 +21,11 @@
 
 /* \summary: Apple's DLT_PKTAP printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 
@@ -102,15 +101,15 @@ pktap_if_print(netdissect_options *ndo,
        uint32_t dlt, hdrlen, rectype;
        u_int caplen = h->caplen;
        u_int length = h->len;
-       if_printer_t printer;
+       if_printer printer;
        const pktap_header_t *hdr;
        struct pcap_pkthdr nhdr;
 
        ndo->ndo_protocol = "pktap";
-       if (caplen < sizeof(pktap_header_t)) {
-               nd_print_trunc(ndo);
-               ndo->ndo_ll_header_length += caplen;
-               return;
+       if (length < sizeof(pktap_header_t)) {
+               ND_PRINT(" (packet too short, %u < %zu)",
+                        length, sizeof(pktap_header_t));
+               goto invalid;
        }
        hdr = (const pktap_header_t *)p;
        dlt = GET_LE_U_4(hdr->pkt_dlt);
@@ -123,15 +122,16 @@ pktap_if_print(netdissect_options *ndo,
                 * is the length supplied so that the header can
                 * be expanded in the future)?
                 */
-               nd_print_trunc(ndo);
-               ndo->ndo_ll_header_length += caplen;
-               return;
+               ND_PRINT(" (pkt_len too small, %u < %zu)",
+                        hdrlen, sizeof(pktap_header_t));
+               goto invalid;
        }
-       if (caplen < hdrlen) {
-               nd_print_trunc(ndo);
-               ndo->ndo_ll_header_length += caplen;
-               return;
+       if (hdrlen > length) {
+               ND_PRINT(" (pkt_len too big, %u > %u)",
+                        hdrlen, length);
+               goto invalid;
        }
+       ND_TCHECK_LEN(p, hdrlen);
 
        if (ndo->ndo_eflag)
                pktap_header_print(ndo, p, length);
@@ -148,16 +148,13 @@ pktap_if_print(netdissect_options *ndo,
                break;
 
        case PKT_REC_PACKET:
-               printer = lookup_printer(ndo, dlt);
-               if (printer.printer != NULL) {
+               printer = lookup_printer(dlt);
+               if (printer != NULL) {
                        nhdr = *h;
                        nhdr.caplen = caplen;
                        nhdr.len = length;
-                       if (ndo->ndo_void_printer == TRUE) {
-                               printer.void_printer(ndo, &nhdr, p);
-                               hdrlen += ndo->ndo_ll_header_length;
-                       } else
-                               hdrlen += printer.uint_printer(ndo, &nhdr, p);
+                       printer(ndo, &nhdr, p);
+                       hdrlen += ndo->ndo_ll_hdr_len;
                } else {
                        if (!ndo->ndo_eflag)
                                pktap_header_print(ndo, (const u_char *)hdr,
@@ -169,7 +166,10 @@ pktap_if_print(netdissect_options *ndo,
                break;
        }
 
-       ndo->ndo_ll_header_length += hdrlen;
+       ndo->ndo_ll_hdr_len += hdrlen;
        return;
+
+invalid:
+       nd_print_invalid(ndo);
 }
 #endif /* DLT_PKTAP */