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

[tcpdump] / print-ppi.c

diff --git a/print-ppi.c b/print-ppi.c
index 398ed689134818492879f73d2e97797ff12d81fd..0795f276ac0a2f4df03b769620ee7d85fafa1d0a 100644 (file)
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -2,11 +2,14 @@
  * Oracle
  */
 
-/* \summary: Oracle DLT_PPI printer */
+/* \summary: Per-Packet Information (DLT_PPI) printer */
+
+/* Specification:
+ * Per-Packet Information Header Specification - Version 1.0.7
+ * https://web.archive.org/web/20160328114748/http://www.cacetech.com/documents/PPI%20Header%20format%201.0.7.pdf
+ */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -15,10 +18,12 @@
 
 
 typedef struct ppi_header {
-       nd_uint8_t      ppi_ver;
-       nd_uint8_t      ppi_flags;
-       nd_uint16_t     ppi_len;
-       nd_uint32_t     ppi_dlt;
+       nd_uint8_t      ppi_ver;        /* Version.  Currently 0 */
+       nd_uint8_t      ppi_flags;      /* Flags. */
+       nd_uint16_t     ppi_len;        /* Length of entire message, including
+                                        * this header and TLV payload. */
+       nd_uint32_t     ppi_dlt;        /* Data Link Type of the captured
+                                        * packet data. */
 } ppi_header_t;
 
 #define        PPI_HDRLEN      8
@@ -35,12 +40,12 @@ ppi_header_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
        hdr = (const ppi_header_t *)bp;
 
-       len = EXTRACT_LE_U_2(hdr->ppi_len);
-       dlt = EXTRACT_LE_U_4(hdr->ppi_dlt);
+       len = GET_LE_U_2(hdr->ppi_len);
+       dlt = GET_LE_U_4(hdr->ppi_dlt);
        dltname = pcap_datalink_val_to_name(dlt);
 
        if (!ndo->ndo_qflag) {
-               ND_PRINT("V.%u DLT %s (%u) len %u", EXTRACT_U_1(hdr->ppi_ver),
+               ND_PRINT("V.%u DLT %s (%u) len %u", GET_U_1(hdr->ppi_ver),
                          (dltname != NULL ? dltname : "UNKNOWN"), dlt,
                           len);
         } else {
@@ -50,9 +55,15 @@ ppi_header_print(netdissect_options *ndo, const u_char *bp, u_int length)
        ND_PRINT(", length %u: ", length);
 }
 
-static u_int
-ppi_print(netdissect_options *ndo,
-         const struct pcap_pkthdr *h, const u_char *p)
+/*
+ * This is the top level routine of the printer.  'p' points
+ * to the ether header of the packet, 'h->ts' is the timestamp,
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'
+ * is the number of bytes actually captured.
+ */
+void
+ppi_if_print(netdissect_options *ndo,
+            const struct pcap_pkthdr *h, const u_char *p)
 {
        if_printer printer;
        const ppi_header_t *hdr;
@@ -66,26 +77,30 @@ ppi_print(netdissect_options *ndo,
        ndo->ndo_protocol = "ppi";
        if (caplen < sizeof(ppi_header_t)) {
                nd_print_trunc(ndo);
-               return (caplen);
+               ndo->ndo_ll_hdr_len += caplen;
+               return;
        }
 
        hdr = (const ppi_header_t *)p;
-       ND_TCHECK_2(hdr->ppi_len);
-       len = EXTRACT_LE_U_2(hdr->ppi_len);
+       len = GET_LE_U_2(hdr->ppi_len);
+       if (len < sizeof(ppi_header_t) || len > 65532) {
+               /* It MUST be between 8 and 65,532 inclusive (spec 3.1.3) */
+               ND_PRINT(" [length %u < %zu or > 65532]", len,
+                        sizeof(ppi_header_t));
+               nd_print_invalid(ndo);
+               ndo->ndo_ll_hdr_len += caplen;
+               return;
+       }
        if (caplen < len) {
                /*
                 * If we don't have the entire PPI header, don't
                 * bother.
                 */
                nd_print_trunc(ndo);
-               return (caplen);
-       }
-       if (len < sizeof(ppi_header_t)) {
-               nd_print_trunc(ndo);
-               return (len);
+               ndo->ndo_ll_hdr_len += caplen;
+               return;
        }
-       ND_TCHECK_4(hdr->ppi_dlt);
-       dlt = EXTRACT_LE_U_4(hdr->ppi_dlt);
+       dlt = GET_LE_U_4(hdr->ppi_dlt);
 
        if (ndo->ndo_eflag)
                ppi_header_print(ndo, p, length);
@@ -94,11 +109,13 @@ ppi_print(netdissect_options *ndo,
        caplen -= len;
        p += len;
 
-       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)
                        ppi_header_print(ndo, (const u_char *)hdr, length + len);
@@ -107,22 +124,6 @@ ppi_print(netdissect_options *ndo,
                        ND_DEFAULTPRINT(p, caplen);
                hdrlen = 0;
        }
-       return (len + hdrlen);
-trunc:
-       return (caplen);
-}
-
-/*
- * This is the top level routine of the printer.  'p' points
- * to the ether header of the packet, 'h->ts' is the timestamp,
- * 'h->len' is the length of the packet off the wire, and 'h->caplen'
- * is the number of bytes actually captured.
- */
-u_int
-ppi_if_print(netdissect_options *ndo,
-            const struct pcap_pkthdr *h, const u_char *p)
-{
-       ndo->ndo_protocol = "ppi_if";
-       return (ppi_print(ndo, h, p));
+       ndo->ndo_ll_hdr_len += len + hdrlen;
 }
 #endif /* DLT_PPI */