aboutsummaryrefslogtreecommitdiffstats
path: root/tshark.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-02-20 17:50:52 -0800
committerGuy Harris <guy@alum.mit.edu>2014-02-21 01:51:58 +0000
commitc65fbffc95b5e6b0caff6952faea8e8c9350cf7d (patch)
treec194cd8a718f22e86a80c9f2780f6a887c3905d8 /tshark.c
parentdd4daf5024439a1e91f3deb7ec279196c46173a2 (diff)
Force "printing" if -T is specified, even if -w is also specified.
Just as "tshark ... -P -w xxx" writes raw packets to xxx *and* writes text packet summaries to the standard output, and just as "tshark ... -V -w xxx" writes raw packets to xxx *and* writes text packet details to the standard output, so should "tshark ... -T fff -w xxx" write raw packets to xxx *and* write whatever "-T fff" (and any "-e" options) specifies to the standard output. Change-Id: I28ab3a4d48531f297533ec4dfb3742031eb69885 Reviewed-on: https://code.wireshark.org/review/278 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tshark.c b/tshark.c
index 33f9759b6e..85e4104dd3 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1493,6 +1493,7 @@ main(int argc, char *argv[])
}
break;
case 'T': /* printing Type */
+ print_packet_info = TRUE;
if (strcmp(optarg, "text") == 0) {
output_action = WRITE_TEXT;
print_format = PR_FMT_TEXT;