X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/4405f138044178bf9756cbb8712d086aaaafcaed..0ce779d1756e2bc1f5a845df5acf86f0dc698a14:/print-ppi.c

diff --git a/print-ppi.c b/print-ppi.c
index 06678b0f..ad5eb27f 100644
--- 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,50 +30,58 @@ 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,
-                          len));
+		ND_PRINT("V.%d DLT %s (%d) len %d", hdr->ppi_ver,
+			  (dltname != NULL ? dltname : "UNKNOWN"), dlt,
+                          len);
         } else {
-		ND_PRINT((ndo, "%s", pcap_datalink_val_to_name(dlt)));
+		ND_PRINT("%s", (dltname != NULL ? dltname : "UNKNOWN"));
         }
 
-	ND_PRINT((ndo, ", length %u: ", length));
+	ND_PRINT(", length %u: ", length);
 }
 
-static void
+static u_int
 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;
+		ND_PRINT("[|ppi]");
+		return (caplen);
 	}
 
-	hdr = (ppi_header_t *)p;
-	len = EXTRACT_LE_16BITS(&hdr->ppi_len);
-	if (len < sizeof(ppi_header_t)) {
-		ND_PRINT((ndo, "[|ppi]"));
-		return;
-	}
+	hdr = (const ppi_header_t *)p;
+	len = EXTRACT_LE_U_2(&hdr->ppi_len);
 	if (caplen < len) {
-		ND_PRINT((ndo, "[|ppi]"));
-		return;
+		/*
+		 * If we don't have the entire PPI header, don't
+		 * bother.
+		 */
+		ND_PRINT("[|ppi]");
+		return (caplen);
+	}
+	if (len < sizeof(ppi_header_t)) {
+		ND_PRINT("[|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);
@@ -81,14 +91,19 @@ ppi_print(netdissect_options *ndo,
 	p += len;
 
 	if ((printer = lookup_printer(dlt)) != NULL) {
-		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);
 }
 
 /*
@@ -101,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));
 }
 
 /*