Include the metadata *and* link-layer header in the header length.

Also, don't use the length of the fixed-length portion of the PPI header
as the metadata length, use the *entire* length.

Otherwise, "-x" doesn't start printing at the link-layer payload.

diff --git a/CHANGES b/CHANGES
index 5c590e38fba731afa1e0d86ac7e9d05b103855e9..3cd618cc05163ed34bcd47db9e2f98221186e994 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 Tuesday April 14, 2015 [email protected]
   Summary for 4.8.0 tcpdump release
-       Fix "-x" for Apple DLT_PKTAP packets
+       Fix "-x" for Apple PKTAP and PPI packets
 
 Friday April 10, 2015 [email protected]
   Summary for 4.7.4 tcpdump release

diff --git a/print-ppi.c b/print-ppi.c
index 9fa052086cb11a0120706d0f33dd1f5e643e7d3f..dde1cdb0be51de95ade781f047080e64c99aa86c 100644 (file)
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -45,7 +45,7 @@ ppi_header_print(netdissect_options *ndo, const u_char *bp, u_int length)
        ND_PRINT((ndo, ", length %u: ", length));
 }
 
-static void
+static u_int
 ppi_print(netdissect_options *ndo,
                const struct pcap_pkthdr *h, const u_char *p)
 {
@@ -55,21 +55,26 @@ ppi_print(netdissect_options *ndo,
        u_int length = h->len;
        uint16_t len;
        uint32_t dlt;
+       uint32_t hdrlen;
 
        if (caplen < sizeof(ppi_header_t)) {
                ND_PRINT((ndo, "[|ppi]"));
-               return;
+               return (caplen);
        }
 
        hdr = (ppi_header_t *)p;
        len = EXTRACT_LE_16BITS(&hdr->ppi_len);
-       if (len < sizeof(ppi_header_t)) {
+       if (caplen < len) {
+               /*
+                * If we don't have the entire PPI header, don't
+                * bother.
+                */
                ND_PRINT((ndo, "[|ppi]"));
-               return;
+               return (caplen);
        }
-       if (caplen < len) {
+       if (len < sizeof(ppi_header_t)) {
                ND_PRINT((ndo, "[|ppi]"));
-               return;
+               return (len);
        }
        dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt);
 
@@ -81,14 +86,16 @@ ppi_print(netdissect_options *ndo,
        p += len;
 
        if ((printer = lookup_printer(dlt)) != NULL) {
-               printer(ndo, h, p);
+               hdrlen = printer(ndo, h, p);
        } else {
                if (!ndo->ndo_eflag)
                        ppi_header_print(ndo, (u_char *)hdr, length + len);
 
                if (!ndo->ndo_suppress_default_print)
                        ND_DEFAULTPRINT(p, caplen);
+               hdrlen = 0;
        }
+       return (len + hdrlen);
 }
 
 /*
@@ -101,9 +108,7 @@ u_int
 ppi_if_print(netdissect_options *ndo,
                const struct pcap_pkthdr *h, const u_char *p)
 {
-       ppi_print(ndo, h, p);
-
-       return (sizeof(ppi_header_t));
+       return (ppi_print(ndo, h, p));
 }
 
 /*