X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/7b2c5a11a7bc236d72b440c4db5263edb23b4880..4ef2f8ba3a27d5b0e30c7e60cc4aed7721adaac0:/print-ppi.c

diff --git a/print-ppi.c b/print-ppi.c
index dde1cdb0..9cd5fc1e 100644
--- 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);
+	len = EXTRACT_LE_U_2(&hdr->ppi_len);
+	dlt = EXTRACT_LE_U_4(&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,20 +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;
-	len = EXTRACT_LE_16BITS(&hdr->ppi_len);
+	hdr = (const ppi_header_t *)p;
+	len = EXTRACT_LE_U_2(&hdr->ppi_len);
 	if (caplen < len) {
 		/*
 		 * If we don't have the entire PPI header, don't
@@ -76,7 +81,7 @@ ppi_print(netdissect_options *ndo,
 		ND_PRINT((ndo, "[|ppi]"));
 		return (len);
 	}
-	dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt);
+	dlt = EXTRACT_LE_U_4(&hdr->ppi_dlt);
 
 	if (ndo->ndo_eflag)
 		ppi_header_print(ndo, p, length);
@@ -86,10 +91,13 @@ 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);