X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/387c58edb5f053eb719d8e9cdf05d626d367bddd..a63600a1fc28dbc7ae7ce9f996829c49a25fb33c:/print.c

diff --git a/print.c b/print.c
index 823cea6a..123c842c 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
@@ -246,27 +246,10 @@ static const struct printer printers[] = {
 	{ NULL,                 0 },
 };
 
-static void	ndo_default_print(netdissect_options *ndo, const u_char *bp,
-		    u_int length);
-
-static void NORETURN ndo_error(netdissect_options *ndo,
-		     status_exit_codes_t status,
-		     FORMAT_STRING(const char *fmt), ...)
-		     PRINTFLIKE(3, 4);
-static void	ndo_warning(netdissect_options *ndo,
-		    FORMAT_STRING(const char *fmt), ...)
-		    PRINTFLIKE(2, 3);
-
-static int	ndo_printf(netdissect_options *ndo,
-		     FORMAT_STRING(const char *fmt), ...)
-		     PRINTFLIKE(2, 3);
-
 void
 init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask)
 {
-
 	init_addrtoname(ndo, localnet, mask);
-	init_checksum();
 }
 
 if_printer
@@ -323,6 +306,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 +318,14 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	u_int hdrlen = 0;
 	int invalid_header = 0;
 
+	if (ndo->ndo_print_sampling && packets_captured % ndo->ndo_print_sampling != 0)
+		return;
+
+#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);
 
@@ -386,7 +382,16 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	 * bigger lengths.
 	 */
 
-	ts_print(ndo, &h->ts);
+	/*
+	 * The header /usr/include/pcap/pcap.h in OpenBSD declares h->ts as
+	 * struct bpf_timeval, not struct timeval. The former comes from
+	 * /usr/include/net/bpf.h and uses 32-bit unsigned types instead of
+	 * the types used in struct timeval.
+	 */
+	struct timeval tvbuf;
+	tvbuf.tv_sec = h->ts.tv_sec;
+	tvbuf.tv_usec = h->ts.tv_usec;
+	ts_print(ndo, &tvbuf);
 
 	/*
 	 * Printers must check that they're not walking off the end of
@@ -395,6 +400,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;
@@ -408,6 +414,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;
@@ -497,9 +507,9 @@ ndo_default_print(netdissect_options *ndo, const u_char *bp, u_int length)
 }
 
 /* VARARGS */
-static void
+static void NORETURN PRINTFLIKE(3, 4)
 ndo_error(netdissect_options *ndo, status_exit_codes_t status,
-	  const char *fmt, ...)
+          FORMAT_STRING(const char *fmt), ...)
 {
 	va_list ap;
 
@@ -519,8 +529,8 @@ ndo_error(netdissect_options *ndo, status_exit_codes_t status,
 }
 
 /* VARARGS */
-static void
-ndo_warning(netdissect_options *ndo, const char *fmt, ...)
+static void PRINTFLIKE(2, 3)
+ndo_warning(netdissect_options *ndo, FORMAT_STRING(const char *fmt), ...)
 {
 	va_list ap;
 
@@ -537,8 +547,9 @@ ndo_warning(netdissect_options *ndo, const char *fmt, ...)
 	}
 }
 
-static int
-ndo_printf(netdissect_options *ndo, const char *fmt, ...)
+/* VARARGS */
+static int PRINTFLIKE(2, 3)
+ndo_printf(netdissect_options *ndo, FORMAT_STRING(const char *fmt), ...)
 {
 	va_list args;
 	int ret;