Force -t on in TESTonce.

[tcpdump] / print-ppi.c

diff --git a/print-ppi.c b/print-ppi.c
index b403536362464ba049724d911b6e7f168f3ef977..72cd1b867fd502b9b5699f1ee669a0f10011aed6 100644 (file)
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -1,14 +1,16 @@
 /*
  * Oracle
  */
-#define NETDISSECT_REWORKED
+
+/* \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,49 +30,56 @@ 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));
 }
 
-static void
+static u_int
 ppi_print(netdissect_options *ndo,
                const struct pcap_pkthdr *h, const u_char *p)
 {
-       if_ndo_printer ndo_printer;
-        if_printer printer;
-       ppi_header_t *hdr;
+       if_printer printer;
+       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;
+               return (caplen);
        }
 
-       hdr = (ppi_header_t *)p;
+       hdr = (const 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);
 
@@ -82,16 +91,19 @@ ppi_print(netdissect_options *ndo,
        p += len;
 
        if ((printer = lookup_printer(dlt)) != NULL) {
-               printer(h, p);
-       } else if ((ndo_printer = lookup_ndo_printer(dlt)) != NULL) {
-               ndo_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);
 }
 
 /*
@@ -104,9 +116,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));
 }
 
 /*