CHANGES: Add/move change(s) backported to 4.99

[tcpdump] / print.c

diff --git a/print.c b/print.c
index 84aae66c95dfad4e91622038327db974b8e6539f..07cb3429b98963d1837da9de066805645fc1eb08 100644 (file)
--- a/print.c
+++ b/print.c
@@ -25,9 +25,7 @@
  *     Seth Webster <[email protected]>
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdlib.h>
 #include <string.h>
@@ -264,9 +262,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 +319,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 +331,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 +410,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 +424,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 +441,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.