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 3f28ccb08399ffa0fdd40bf7bf2dffc54982e9c5..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"
 
@@ -76,8 +75,8 @@ pktap_header_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
        hdr = (const pktap_header_t *)bp;
 
-       dlt = EXTRACT_LE_U_4(hdr->pkt_dlt);
-       hdrlen = EXTRACT_LE_U_4(hdr->pkt_len);
+       dlt = GET_LE_U_4(hdr->pkt_dlt);
+       hdrlen = GET_LE_U_4(hdr->pkt_len);
        dltname = pcap_datalink_val_to_name(dlt);
        if (!ndo->ndo_qflag) {
                ND_PRINT("DLT %s (%u) len %u",
@@ -95,7 +94,7 @@ pktap_header_print(netdissect_options *ndo, const u_char *bp, u_int length)
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 pktap_if_print(netdissect_options *ndo,
                const struct pcap_pkthdr *h, const u_char *p)
 {
@@ -106,13 +105,15 @@ pktap_if_print(netdissect_options *ndo,
        const pktap_header_t *hdr;
        struct pcap_pkthdr nhdr;
 
-       if (caplen < sizeof(pktap_header_t) || length < sizeof(pktap_header_t)) {
-               ND_PRINT("[|pktap]");
-               return (0);
+       ndo->ndo_protocol = "pktap";
+       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 = EXTRACT_LE_U_4(hdr->pkt_dlt);
-       hdrlen = EXTRACT_LE_U_4(hdr->pkt_len);
+       dlt = GET_LE_U_4(hdr->pkt_dlt);
+       hdrlen = GET_LE_U_4(hdr->pkt_len);
        if (hdrlen < sizeof(pktap_header_t)) {
                /*
                 * Claimed header length < structure length.
@@ -121,13 +122,16 @@ pktap_if_print(netdissect_options *ndo,
                 * is the length supplied so that the header can
                 * be expanded in the future)?
                 */
-               ND_PRINT("[|pktap]");
-               return (0);
+               ND_PRINT(" (pkt_len too small, %u < %zu)",
+                        hdrlen, sizeof(pktap_header_t));
+               goto invalid;
        }
-       if (caplen < hdrlen || length < hdrlen) {
-               ND_PRINT("[|pktap]");
-               return (hdrlen);
+       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);
@@ -136,7 +140,7 @@ pktap_if_print(netdissect_options *ndo,
        caplen -= hdrlen;
        p += hdrlen;
 
-       rectype = EXTRACT_LE_U_4(hdr->pkt_rectype);
+       rectype = GET_LE_U_4(hdr->pkt_rectype);
        switch (rectype) {
 
        case PKT_REC_NONE:
@@ -144,11 +148,13 @@ pktap_if_print(netdissect_options *ndo,
                break;
 
        case PKT_REC_PACKET:
-               if ((printer = lookup_printer(dlt)) != NULL) {
+               printer = lookup_printer(dlt);
+               if (printer != NULL) {
                        nhdr = *h;
                        nhdr.caplen = caplen;
                        nhdr.len = length;
-                       hdrlen += 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,
@@ -160,14 +166,10 @@ pktap_if_print(netdissect_options *ndo,
                break;
        }
 
-       return (hdrlen);
-}
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
+       ndo->ndo_ll_hdr_len += hdrlen;
+       return;
 
+invalid:
+       nd_print_invalid(ndo);
+}
 #endif /* DLT_PKTAP */