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

[tcpdump] / print.c

diff --git a/print.c b/print.c
index 08578132f4a9121ccd8e2eaae12bac80d6c5cff5..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>
@@ -443,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.