CREDITS: add author of a change backported to 4.99.2. [skip ci]

[tcpdump] / print.c

diff --git a/print.c b/print.c
index 5dcedeaf87f3d2adc352221bb1b568f0b3511032..fbb1b3b1085116f10436a405f238e519b886d422 100644 (file)
--- 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
@@ -308,6 +308,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)
@@ -315,6 +320,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);
 
@@ -389,6 +402,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;
@@ -402,6 +416,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;
@@ -490,6 +508,7 @@ ndo_default_print(netdissect_options *ndo, const u_char *bp, u_int length)
        hex_and_ascii_print(ndo, "\n\t", bp, length); /* pass on lf and indentation string */
 }
 
+/* VARARGS */
 static void NORETURN PRINTFLIKE(3, 4)
 ndo_error(netdissect_options *ndo, status_exit_codes_t status,
           FORMAT_STRING(const char *fmt), ...)
@@ -511,6 +530,7 @@ ndo_error(netdissect_options *ndo, status_exit_codes_t status,
        /* NOTREACHED */
 }
 
+/* VARARGS */
 static void PRINTFLIKE(2, 3)
 ndo_warning(netdissect_options *ndo, FORMAT_STRING(const char *fmt), ...)
 {
@@ -529,6 +549,7 @@ ndo_warning(netdissect_options *ndo, FORMAT_STRING(const char *fmt), ...)
        }
 }
 
+/* VARARGS */
 static int PRINTFLIKE(2, 3)
 ndo_printf(netdissect_options *ndo, FORMAT_STRING(const char *fmt), ...)
 {