Check in changes originally checked in as SVN revision 24308 (new column

type: Custom) that were backed out in SVN revision 24309.

Changes since that revision include a reworking of the handling of the
cfile/cinfo variables in epan/column-utils.c, addition of three new
functions to libwireshark.def and a bug fix to prevent a crash when no
custom columns were not in use.

Compilation verified locally on MacOS X, Linux and Windows.


svn path=/trunk/; revision=24317

1 files changed, 7 insertions, 3 deletions

diff --git a/file.c b/file.c
index 4e5a12e8a7..f286a2f30b 100644
--- a/file.c
+++ b/file.c
@@ -77,8 +77,7 @@
 #include <epan/timestamp.h>
 #include <epan/dfilter/dfilter-macro.h>
 #include "file_util.h"
-
-
+#include <epan/column-utils.h>
 
 #ifdef HAVE_LIBPCAP
 gboolean auto_scroll_live;
@@ -939,11 +938,13 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
 
 	we have tap listeners;
 
+	we have custom columns;
+
      allocate a protocol tree root node, so that we'll construct
      a protocol tree against which a filter expression can be
      evaluated. */
   if ((dfcode != NULL && refilter) || color_filters_used()
-        || num_tap_filters != 0)
+      || num_tap_filters != 0 || have_custom_cols(&cf->cinfo))
 	  create_proto_tree = TRUE;
 
   /* Dissect the frame. */
@@ -956,6 +957,9 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
   if (color_filters_used()) {
       color_filters_prime_edt(edt);
   }
+
+  col_custom_prime_edt(edt, &cf->cinfo);
+
   tap_queue_init(edt);
   epan_dissect_run(edt, pseudo_header, buf, fdata, &cf->cinfo);
   tap_push_tapped_queue(edt);