X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/21b9fa33030593a8d5aa50da5e3c900ded2e3a94..e9bff173f9833b5532f3b6dce8c049e955140169:/print.c?ds=sidebyside

diff --git a/print.c b/print.c
index bfc35d9c..dcaa37f4 100644
--- a/print.c
+++ b/print.c
@@ -185,7 +185,7 @@ static const struct printer printers[] = {
 #ifdef DLT_LOOP
 	{ null_if_print,	DLT_LOOP },
 #endif
-#if defined(DLT_PFLOG) && defined(HAVE_NET_IF_PFLOG_H)
+#ifdef DLT_PFLOG
 	{ pflog_if_print,	DLT_PFLOG },
 #endif
 #ifdef DLT_PKTAP
@@ -264,9 +264,7 @@ static int	ndo_printf(netdissect_options *ndo,
 void
 init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask)
 {
-
 	init_addrtoname(ndo, localnet, mask);
-	init_checksum();
 }
 
 if_printer
@@ -323,6 +321,11 @@ get_if_printer(int type)
 	return printer;
 }
 
+#ifdef ENABLE_INSTRUMENT_FUNCTIONS
+extern int profile_func_level;
+static int pretty_print_packet_level = -1;
+#endif
+
 void
 pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 		    const u_char *sp, u_int packets_captured)
@@ -330,6 +333,11 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	u_int hdrlen = 0;
 	int invalid_header = 0;
 
+#ifdef ENABLE_INSTRUMENT_FUNCTIONS
+	if (pretty_print_packet_level == -1)
+		pretty_print_packet_level = profile_func_level;
+#endif
+
 	if (ndo->ndo_packet_number)
 		ND_PRINT("%5u  ", packets_captured);
 
@@ -404,6 +412,7 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	 * of the netdissect_options structure.
 	 */
 	ndo->ndo_snapend = sp + h->caplen;
+	ndo->ndo_packetp = sp;
 
 	ndo->ndo_protocol = "";
 	ndo->ndo_ll_hdr_len = 0;
@@ -417,6 +426,10 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 		nd_print_trunc(ndo);
 		/* Print the full packet */
 		ndo->ndo_ll_hdr_len = 0;
+#ifdef ENABLE_INSTRUMENT_FUNCTIONS
+		/* truncation => reassignment */
+		profile_func_level = pretty_print_packet_level;
+#endif
 		break;
 	}
 	hdrlen = ndo->ndo_ll_hdr_len;
@@ -430,10 +443,14 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	nd_pop_all_packet_info(ndo);
 
 	/*
-	 * Restore the original snapend, as a printer might have
-	 * changed it.
+	 * Restore the originals snapend and packetp, as a printer
+	 * might have changed them.
+	 *
+	 * XXX - nd_pop_all_packet_info() should have restored the
+	 * original values, but, just in case....
 	 */
 	ndo->ndo_snapend = sp + h->caplen;
+	ndo->ndo_packetp = sp;
 	if (ndo->ndo_Xflag) {
 		/*
 		 * Print the raw packet data in hex and ASCII.