aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2014-06-25 11:03:12 -0400
committerEvan Huus <eapache@gmail.com>2014-06-25 18:01:28 +0000
commite0461ecd4384377042fe3787acddfcc4d1ed7587 (patch)
tree8c663ffd3e066f183b57a1e38155169c8347dacb
parenta8652ea529fe477cc19ff98c6402010908e481b8 (diff)
Indicate tshark can read (-r) from stdin and named pipes now.
(Though it works only with certain formats.) As requested in: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2874#c4 Change-Id: I2ce0509d8750b21ae0167d12459074ba0f9506f8 Reviewed-on: https://code.wireshark.org/review/2646 Reviewed-by: Evan Huus <eapache@gmail.com>
-rw-r--r--doc/tshark.pod5
-rw-r--r--tshark.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/tshark.pod b/doc/tshark.pod
index 29533f71a3..62e3b5e790 100644
--- a/doc/tshark.pod
+++ b/doc/tshark.pod
@@ -633,8 +633,9 @@ count and the end of a capture are not sent to stderr.
=item -r E<lt>infileE<gt>
Read packet data from I<infile>, can be any supported capture file format
-(including gzipped files). It's B<not> possible to use named pipes
-or stdin here!
+(including gzipped files). It is possible to use named pipes or stdin (-)
+here but only with certain (not compressed) capture file formats (in
+particular: those that can be read without seeking backwards).
=item -R E<lt>Read filterE<gt>
diff --git a/tshark.c b/tshark.c
index aa33b99e0c..bdb8046ee1 100644
--- a/tshark.c
+++ b/tshark.c
@@ -332,7 +332,7 @@ print_usage(gboolean print_ver)
#endif
/*fprintf(output, "\n");*/
fprintf(output, "Input file:\n");
- fprintf(output, " -r <infile> set the filename to read from (no stdin!)\n");
+ fprintf(output, " -r <infile> set the filename to read from (- to read from stdin)\n");
fprintf(output, "\n");
fprintf(output, "Processing:\n");