diff options
| author | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-07-26 17:31:26 -0400 |
|---|---|---|
| committer | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-07-26 22:46:41 +0000 |
| commit | 8b316ff49d3cfd9f1903420ac27c042832907c50 (patch) | |
| tree | 93f9347cc20cc0145c118af027d81c7c0a6fcb84 /tshark.c | |
| parent | 179da0f63095ec84e953a7b208096f3891dba34c (diff) | |
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 <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Diffstat (limited to 'tshark.c')
| -rw-r--r-- | tshark.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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) { |