Add an option to col_fill_in() to allow us to disable column expression processing. This is rarely needed. It's only needed when the user right clicks on the packet list view to generate a display filter.

svn path=/trunk/; revision=29806

1 files changed, 4 insertions, 4 deletions

diff --git a/file.c b/file.c
index f10920e52a..9712da84f3 100644
--- a/file.c
+++ b/file.c
@@ -1190,7 +1190,7 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
     }
 
 #ifndef NEW_PACKET_LIST
-    epan_dissect_fill_in_columns(&edt, TRUE);
+    epan_dissect_fill_in_columns(&edt, FALSE, TRUE);
 #endif
 
     /* If we haven't yet seen the first frame, this is it.
@@ -2298,7 +2298,7 @@ print_packet(capture_file *cf, frame_data *fdata,
      information. */
   if (args->print_args->print_summary) {
     epan_dissect_run(&edt, pseudo_header, pd, fdata, &cf->cinfo);
-    epan_dissect_fill_in_columns(&edt, TRUE);
+    epan_dissect_fill_in_columns(&edt, FALSE, TRUE);
   } else
     epan_dissect_run(&edt, pseudo_header, pd, fdata, NULL);
 
@@ -2630,7 +2630,7 @@ write_psml_packet(capture_file *cf, frame_data *fdata,
   proto_tree_needed = have_custom_cols(&cf->cinfo);
   epan_dissect_init(&edt, proto_tree_needed, proto_tree_needed);
   epan_dissect_run(&edt, pseudo_header, pd, fdata, &cf->cinfo);
-  epan_dissect_fill_in_columns(&edt, TRUE);
+  epan_dissect_fill_in_columns(&edt, FALSE, TRUE);
 
   /* Write out the information in that tree. */
   proto_tree_write_psml(&edt, fh);
@@ -2704,7 +2704,7 @@ write_csv_packet(capture_file *cf, frame_data *fdata,
   proto_tree_needed = have_custom_cols(&cf->cinfo);
   epan_dissect_init(&edt, proto_tree_needed, proto_tree_needed);
   epan_dissect_run(&edt, pseudo_header, pd, fdata, &cf->cinfo);
-  epan_dissect_fill_in_columns(&edt, TRUE);
+  epan_dissect_fill_in_columns(&edt, FALSE, TRUE);
 
   /* Write out the information in that tree. */
   proto_tree_write_csv(&edt, fh);