Commit Graph

43 Commits

Author SHA1 Message Date
Chris Maynard 93f15d640c Specify SI units for the max filesize autostop condition. For now, keep the capture buffer size in IEC units, but document it as such.
#BACKPORT(1.10, 1.8(?))

svn path=/trunk/; revision=53728
2013-12-02 19:17:12 +00:00
Chris Maynard bc654875f0 Handle the 2GiB boundary case of the max filesize autostop condition properly so that we avoid overflow conditions and so that we ensure we don't capture more than 2GiB. Also, document the max filesize autostop value of 2GIB as well as indicating that it's truly GiB and not GB.
This fixes the problem reported on ask: http://ask.wireshark.org/questions/23891/wireshark-wont-run-with-multiple-capture-files

#BACKPORT(1.10) ... not sure about 1.8?

svn path=/trunk/; revision=51576
2013-08-29 18:15:13 +00:00
Martin Kaiser 11643ecc83 add --capture-comment to tshark's manpage
fix a typo in the dumpcap manpage

svn path=/trunk/; revision=51096
2013-08-01 21:21:35 +00:00
Guy Harris a4ad9e9f74 If a core Wireshark developer repeatedly can't remember that the
argument to the -F flag for pcap format is "libpcap", not "pcap", we
have a problem.  Make it "pcap", and add a backwards-compatibility hack
to support using "libpcap" as well.

Update the man pages to refer to it as pcap as well, and fix the
capitalization of "WinPcap" (see http://www.winpcap.org) while we're at
it.

Also, refer to http://www.tcpdump.org/linktypes.html for the list of
link-layer header types for pcap and pcap-ng.

svn path=/trunk/; revision=50989
2013-07-28 21:12:07 +00:00
Martin Kaiser 834b464844 add --capture-comment to dumpcap's manpage
svn path=/trunk/; revision=50947
2013-07-27 16:39:10 +00:00
Balint Reczey b276978309 Dumpcap can write raw packets to stdout
svn path=/trunk/; revision=50126
2013-06-24 14:49:19 +00:00
Chris Maynard 08b0f7296a If tcpdump doesn't exist, why refer to it? Omit this confusing phrase.
svn path=/trunk/; revision=49427
2013-05-20 02:21:07 +00:00
Michael Tüxen da07699dd3 Make the memory limit (in bytes or packets) used for storing packets
configurable via command line options and print specific drop numbers
at the end. This allows to tune the buffering when using multiple
threads.
This also fixes a logic arrow in enforcing the limits.
The patch for the enhanced counters is from Anders Broman.


svn path=/trunk/; revision=48223
2013-03-10 11:57:40 +00:00
Michael Tüxen 0bbf82a38a Add -t to synopsis.
svn path=/trunk/; revision=48221
2013-03-10 11:40:46 +00:00
Jeff Morriss 018ba4ea65 Default capture buffer size is now 2MB.
svn path=/trunk/; revision=47937
2013-02-28 13:59:47 +00:00
Martin Kaiser 34f58259fa describe the -t option in the dumpcap manpage
(use the same text that dumpcap -V prints)

svn path=/trunk/; revision=47455
2013-02-03 20:01:49 +00:00
Jeff Morriss 05ee001d73 Document the "-g" option to dumpcap.
Add that option to tshark, too, and document it.

The option can't be given to Wireshark because the GUI already has a "-g"
(goto packet).

svn path=/trunk/; revision=46513
2012-12-12 02:07:08 +00:00
Chris Maynard 11204066a8 Some minimal documentation of remote capture interface formats for both rpcap and the new TCP feature from bug 2788.
svn path=/trunk/; revision=43156
2012-06-08 13:55:14 +00:00
Jakub Zawadzki 57e6b25735 From r37696 default file format for dumpcap is pcap-ng. Fix manuals.
svn path=/trunk/; revision=42600
2012-05-12 19:49:49 +00:00
Chris Maynard 3fc4c9cafb Correct the sorting of the options in the synopsis.
svn path=/trunk/; revision=41564
2012-03-15 14:52:49 +00:00
Jörg Mayer 801392d5d3 The libpcap puts pcap-filter into the misc section (which seems to be 7).
Refer to pcap-filter and mention tcpdump only as a fallback.

svn path=/trunk/; revision=40820
2012-02-03 09:07:24 +00:00
Chris Maynard e5c0fb44f8 The -D, -L and -S options are mutually exclusive, so change "and" to "or".
svn path=/trunk/; revision=39113
2011-09-23 21:24:22 +00:00
Michael Tüxen bd6db2a824 Document the handling of command line parameters with respect to
the capturing on multiple interfaces.

svn path=/trunk/; revision=37824
2011-06-28 22:02:43 +00:00
Gerald Combs 8d88f3a790 Make pcap-ng the default. Add a compile-time option to prefer pcap-ng or
pcap.  Add a "-P" capture option which tries to use pcap instead of
pcap-ng ("-P" seemed to be the best option but we may want to use a
different letter).

Update the documentation and release notes.

svn path=/trunk/; revision=37696
2011-06-17 17:52:31 +00:00
Stephen Fisher d381b5dea4 From OKANO Takayoshi via bug #5442: Fix typos in documentation
svn path=/trunk/; revision=35038
2010-11-27 16:51:24 +00:00
Guy Harris 4d6cb744df Add a "-d" flag to dumpcap, to print out the generated code for the
capture filter in human-readable form.  (Well, readable by humans who
know BPF machine language, at least. :-))

svn path=/trunk/; revision=33509
2010-07-13 23:26:07 +00:00
Jeff Morriss 8bfcba07ad Document the maximum number of files in a ring buffer, including a warning about using large numbers of files.
svn path=/trunk/; revision=32999
2010-05-27 19:11:53 +00:00
Guy Harris 7a630c61a1 Add a -q flag to dumpcap, to squelch its reporting of the packet count,
and add support for SIGINFO, so, if your OS supports SIGINFO, you can
get the packet count by typing ^T.

svn path=/trunk/; revision=32958
2010-05-26 00:19:27 +00:00
Guy Harris 72ed0558f2 Don't have -M affect -v yet; if we end up, for example, having dumpcap
being the only program that needs to be linked with *pcap, that's when
we'd want to fetch that information, but there might be other libraries
(e.g., the POSIX capabilities library) that it might be linked with but
that programs that use it aren't linked with.

Don't commit to the output formats of -M, as they are, as noted, subject
to change from release to release.

svn path=/trunk/; revision=32904
2010-05-19 23:27:35 +00:00
Guy Harris e3038273ca Don't write the SP_SUCCESS messages unless -Z was specified.
Add support for a machine-readable "-v" output, which prints only the
pcap version string.

Give a little more information about the machine-readable format, but
note that it's primarily intended for consumption by Wireshark and
TShark and is subject to change.

Properly hyphenate "pcap-ng".

svn path=/trunk/; revision=32851
2010-05-18 00:20:30 +00:00
Guy Harris 547b9e48a2 The default capture buffer size is, in fact, *nominally* 1MB; however,
libpcap/WinPcap and the capture mechanism atop which they run might
either silently limit the buffer size to a smaller value or raise it to
a higher value - that's the part that's platform-dependent.

svn path=/trunk/; revision=32718
2010-05-08 00:39:07 +00:00
Guy Harris 9dde366f2f -B is no longer Windows-only.
svn path=/trunk/; revision=32707
2010-05-07 02:00:46 +00:00
Guy Harris 20cbf81d39 Beginnings of monitor mode support with libpcap 1.x.
svn path=/trunk/; revision=32702
2010-05-07 01:22:33 +00:00
Jeff Morriss 273a6c9cfc As requested in:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2132

Point to the Wiki's page on capture filter syntax in case neither libpcap's
nor tcpdump's man pages are available (e.g., on Windows).

svn path=/trunk/; revision=32435
2010-04-09 02:09:10 +00:00
Jeff Morriss 176ccd6068 Clarify that "-b" with the "files" criterion needs either duration or filesize
to be set.

Clarify that each "-b" criterion needs the "-b" option (see bug 4573).

Fix a couple of typos.

svn path=/trunk/; revision=32245
2010-03-19 19:34:16 +00:00
Bill Meier 910c5bd1a0 SYNOPSYS --> SYNOPSIS
svn path=/trunk/; revision=28338
2009-05-12 21:10:38 +00:00
Bill Meier 927fabd0e5 Update man pages; Add several missing options; Fix typos, Do minor rewording;
editcap: Add description of -i option;
 dumpcap: Add description of -S option;

svn path=/trunk/; revision=28336
2009-05-12 16:24:57 +00:00
Michael Tüxen 6de58c28f0 Add -n option to dumpcap. It will save the capture files in
pcapng format instead of pcap. The default is to use pcap.

svn path=/trunk/; revision=28170
2009-04-27 08:11:10 +00:00
Guy Harris 1514fcff5f Have the minimum snapshot length be 1 byte, and have a snapshot length
of 0 mean 65535, similar to what tcpdump does.

Fixes bug 2731.

svn path=/trunk/; revision=27526
2009-02-23 19:00:30 +00:00
Jörg Mayer 8b1b8b548c The syntax for capture filters has been moved from
tcpdump (in the tcpdump package) into its own manpage
(pcap-filter) in the libpcap package in the CVS HEAD
branch. Reference the new and the old location for that
information.

svn path=/trunk/; revision=24020
2008-01-07 00:12:36 +00:00
Gerald Combs c02e0c7b4a Remove the "-I" flag from dumpcap, and add a "-M" flag used to specify
that "-D" and "-L" should produce machine-readable output.  Use this to
move an indirect get_pcap_linktype() call from the GUI to dumpcap.

svn path=/trunk/; revision=22367
2007-07-20 21:43:07 +00:00
Gerald Combs e9f1a0b692 One more step in privilege separation.
Add a capture_interface_list(), which works similar to
get_interface_list() except that it forks dumpcap instead of calling
the pcap routines directly.  Use it in the GUI.

Add a "-I" flag to dumpcap, which prints out verbose interface
information.

Tested under Windows and Linux.

svn path=/trunk/; revision=22071
2007-06-11 03:58:58 +00:00
Jörg Mayer 13fae81007 Add some programs to 'see also'
svn path=/trunk/; revision=18867
2006-08-10 09:19:03 +00:00
Guy Harris d26ea2b24d Use L<> on all links.
Don't use anything on man page references - pod2man handles that.

Don't refer to "the capture file format section" of the Wireshark man
page, as there's no section explicitly labelled as such; just refer to
the beginning of the DESCRIPTION section.

svn path=/trunk/; revision=18694
2006-07-09 22:45:48 +00:00
Gerald Combs eb71f7fb96 Rename the main executable to "wireshark", along with more conversions:
ethereal.com -> wireshark.org
  mailing lists and addresses
  ETHEREAL -> WIRESHARK
  Man pages
  Automake/Autoconf names


svn path=/trunk/; revision=18271
2006-05-31 19:12:15 +00:00
Gerald Combs 8958bab6de Tethereal/tethereal -> TShark/tshark.
svn path=/trunk/; revision=18268
2006-05-31 17:38:42 +00:00
Ronnie Sahlberg 6075ec39fb ethereal->wireshark
svn path=/trunk/; revision=18207
2006-05-22 08:21:22 +00:00
Ulf Lamping 07173c5578 add dumpcap manual page
svn path=/trunk/; revision=17237
2006-02-09 21:49:02 +00:00