From 8b316ff49d3cfd9f1903420ac27c042832907c50 Mon Sep 17 00:00:00 2001 From: Hadriel Kaplan Date: Sun, 26 Jul 2015 17:31:26 -0400 Subject: Tshark doesn't display column text as field in 2-pass mode Bug: 11401 Change-Id: I6aa43d5cdd996aaf0980ab59b690212e41046acc Reviewed-on: https://code.wireshark.org/review/9800 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan --- tshark.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tshark.c') diff --git a/tshark.c b/tshark.c index 6d1489a3be..4b363c3b8e 100644 --- a/tshark.c +++ b/tshark.c @@ -3055,7 +3055,7 @@ process_packet_second_pass(capture_file *cf, epan_dissect_t *edt, frame_data *fd 2) we're printing packet info but we're *not* verbose; in verbose mode, we print the protocol tree, not the protocol summary. */ - if ((tap_flags & TL_REQUIRES_COLUMNS) || (print_packet_info && print_summary)) + if ((tap_flags & TL_REQUIRES_COLUMNS) || (print_packet_info && print_summary) || output_fields_has_cols(output_fields)) cinfo = &cf->cinfo; else cinfo = NULL; @@ -3395,6 +3395,7 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type, ws_buffer_free(&buf); } else { + /* !perform_two_pass_analysis */ framenum = 0; if (do_dissection) { -- cgit v1.2.3