do not warn about extra lines in stderr if there is a stderr file that was compared

[tcpdump] / print-ppi.c

diff --git a/print-ppi.c b/print-ppi.c
index dde1cdb0be51de95ade781f047080e64c99aa86c..66b7582150155bba77989057232d34dbb794868d 100644 (file)
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -2,13 +2,15 @@
  * Oracle
  */
 
+/* \summary: Oracle DLT_PPI printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 typedef struct ppi_header {
@@ -28,18 +30,20 @@ ppi_header_print(netdissect_options *ndo, const u_char *bp, u_int length)
        const ppi_header_t *hdr;
        uint16_t len;
        uint32_t dlt;
+       const char *dltname;
 
        hdr = (const ppi_header_t *)bp;
 
        len = EXTRACT_LE_16BITS(&hdr->ppi_len);
        dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt);
+       dltname = pcap_datalink_val_to_name(dlt);
 
        if (!ndo->ndo_qflag) {
                ND_PRINT((ndo, "V.%d DLT %s (%d) len %d", hdr->ppi_ver,
-                         pcap_datalink_val_to_name(dlt), dlt,
+                         (dltname != NULL ? dltname : "UNKNOWN"), dlt,
                           len));
         } else {
-               ND_PRINT((ndo, "%s", pcap_datalink_val_to_name(dlt)));
+               ND_PRINT((ndo, "%s", (dltname != NULL ? dltname : "UNKNOWN")));
         }
 
        ND_PRINT((ndo, ", length %u: ", length));
@@ -50,19 +54,21 @@ ppi_print(netdissect_options *ndo,
                const struct pcap_pkthdr *h, const u_char *p)
 {
        if_printer printer;
-       ppi_header_t *hdr;
+       const ppi_header_t *hdr;
        u_int caplen = h->caplen;
        u_int length = h->len;
        uint16_t len;
        uint32_t dlt;
        uint32_t hdrlen;
+       struct pcap_pkthdr nhdr;
 
        if (caplen < sizeof(ppi_header_t)) {
                ND_PRINT((ndo, "[|ppi]"));
                return (caplen);
        }
 
-       hdr = (ppi_header_t *)p;
+       hdr = (const ppi_header_t *)p;
+       ND_TCHECK_16BITS(&hdr->ppi_len);
        len = EXTRACT_LE_16BITS(&hdr->ppi_len);
        if (caplen < len) {
                /*
@@ -76,6 +82,7 @@ ppi_print(netdissect_options *ndo,
                ND_PRINT((ndo, "[|ppi]"));
                return (len);
        }
+       ND_TCHECK_32BITS(&hdr->ppi_dlt);
        dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt);
 
        if (ndo->ndo_eflag)
@@ -86,16 +93,21 @@ ppi_print(netdissect_options *ndo,
        p += len;
 
        if ((printer = lookup_printer(dlt)) != NULL) {
-               hdrlen = printer(ndo, h, p);
+               nhdr = *h;
+               nhdr.caplen = caplen;
+               nhdr.len = length;
+               hdrlen = printer(ndo, &nhdr, p);
        } else {
                if (!ndo->ndo_eflag)
-                       ppi_header_print(ndo, (u_char *)hdr, length + len);
+                       ppi_header_print(ndo, (const u_char *)hdr, length + len);
 
                if (!ndo->ndo_suppress_default_print)
                        ND_DEFAULTPRINT(p, caplen);
                hdrlen = 0;
        }
        return (len + hdrlen);
+trunc:
+       return (caplen);
 }
 
 /*