X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b38f324af9dd953a661b9f35910f8c6d8eb2cc06..refs/heads/tcpdump-4.9:/print-pktap.c

diff --git a/print-pktap.c b/print-pktap.c
index 0680f9e0..4a295fdf 100644
--- a/print-pktap.c
+++ b/print-pktap.c
@@ -72,16 +72,18 @@ pktap_header_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
 	const pktap_header_t *hdr;
 	uint32_t dlt, hdrlen;
+	const char *dltname;
 
 	hdr = (const pktap_header_t *)bp;
 
 	dlt = EXTRACT_LE_32BITS(&hdr->pkt_dlt);
 	hdrlen = EXTRACT_LE_32BITS(&hdr->pkt_len);
+	dltname = pcap_datalink_val_to_name(dlt);
 	if (!ndo->ndo_qflag) {
-		ND_PRINT((ndo,", DLT %s (%d) len %d",
-			  pcap_datalink_val_to_name(dlt), dlt, hdrlen));
+		ND_PRINT((ndo,"DLT %s (%d) len %d",
+			  (dltname != NULL ? dltname : "UNKNOWN"), dlt, hdrlen));
         } 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));
@@ -102,6 +104,7 @@ pktap_if_print(netdissect_options *ndo,
 	u_int length = h->len;
 	if_printer printer;
 	const pktap_header_t *hdr;
+	struct pcap_pkthdr nhdr;
 
 	if (caplen < sizeof(pktap_header_t) || length < sizeof(pktap_header_t)) {
 		ND_PRINT((ndo, "[|pktap]"));
@@ -142,7 +145,10 @@ pktap_if_print(netdissect_options *ndo,
 
 	case PKT_REC_PACKET:
 		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)
 				pktap_header_print(ndo, (const u_char *)hdr,