Commit Graph

34 Commits

Author SHA1 Message Date
Guy Harris 4f8b3f3d2a By default, don't stop after a read error.
For close to 10 years, we have defaulted not to stop processing on an
open error; default not to stop processing on a read error, either.  -C
causes us to stop for both.

Bug: 15433
Change-Id: I5cd239c160d0ff85eb0425ca4b172532a4659fd3
Reviewed-on: https://code.wireshark.org/review/31710
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-24 06:42:58 +00:00
Gerald Combs dfc7fcc815 Docs: Make our Pod documentation encoding uniform.
We've set "=encoding utf8" in wireshark.pod for a long time. Do so in
the rest of our .pod files.

Change-Id: I3ef0fb3a88ed63275b4ff4362b6afbf13d79a0bc
Reviewed-on: https://code.wireshark.org/review/29182
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-08-18 14:29:41 +00:00
Gerald Combs c634f2b184 Capinfos: Add SHA256. Remove MD5.
Print the SHA256, RIPEMD160, and SHA1 hashes for each file instead of
SHA1, RIPEMD160, and MD5. SHA256 seems to be the preferred file hashing
algorithm these days and MD5 is actively discouraged. Note that we might
remove SHA1 (which is also discouraged) as well.

Change-Id: I74d972ae5f3484c83175cd3f3c7a55f99c171e20
Reviewed-on: https://code.wireshark.org/review/23761
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-27 08:08:44 +00:00
Jim Young 81ad4cd3bd capinfos: Add -K option and report capture comments last
This patch adds a capinfos -K option to suppess printing of capture
comments.  This patch also changes when capture comments are printed
relative to the other enabled infos. Because capture comments are
freeform we will now defer their printing until all but the interface
detail infos are printed.

Change-Id: Ibb3df040c09e4c67d714c561869c00e08b83d6ed
Reviewed-on: https://code.wireshark.org/review/20643
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-23 11:53:28 +00:00
Hadriel Kaplan d64ad1de91 capinfos: add more info about file and interfaces
Add more information about the capture file, and about the interface
descriptions in it. Also remove long-unused g_options code.

Change-Id: I93cbd70fc7b09ec1b8b2fd6c85bb885c7f749543
Reviewed-on: https://code.wireshark.org/review/10073
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-19 04:26:24 +00:00
Gerald Combs 175039128a Update the doc directory to use https://www.wireshark.org.
Change-Id: I9bfc57cb6b6ab6962b80ff58d98eb351d6f69829
Reviewed-on: https://code.wireshark.org/review/4140
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-17 00:12:26 +00:00
Jeff Morriss 3773a7561c Add command-line argument to request the version to a number of the utilities.
In some cases "-v" was already used so "-V" is the option.
Note that the version information in these utilities is much shorter than what
is presented by the big programs.

As requested by https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5804

Bug: 5804
Change-Id: I35db35a4eace2797afd895f9be7322ef39928480
Reviewed-on: https://code.wireshark.org/review/2489
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21 01:05:02 +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
Martin Kaiser ff72006da8 list the new option -k in the capinfos manpage
svn path=/trunk/; revision=48838
2013-04-13 17:52:52 +00:00
Gerald Combs 0645396514 Print human-readable statistics by default. Raw values can be printed
using "-M". Based on a suggestion by Hansang Bae.

svn path=/trunk/; revision=47900
2013-02-26 06:40:25 +00:00
Chris Maynard 9dd8ba6ce5 Sort the options.
svn path=/trunk/; revision=41565
2012-03-15 14:56:06 +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
Bill Meier 9121c18590 IMHO capinfos, when finished processing, should exit with an error status
if an error occurred while processing.
E.G.,: For the default (no -C option):
  'capinfos invalid.xxx' or 'capinfos a.pcap invalid.xxx c.pcap'
 should exit with an error status
  (after processing all the input args) if there is an error for invalid.xxx.

With this fix, I expect fuzz-test.sh (and list_protos_in_cap.sh
and presumably other scripts) will work a bit more as as expected.


svn path=/trunk/; revision=36487
2011-04-06 01:41:03 +00:00
Chris Maynard 86db02c22e Fixed typos.
svn path=/trunk/; revision=34816
2010-11-09 03:20:15 +00:00
Gerald Combs f194916d62 From Jim Young via bug 4049:
This patch adds a new '-o' option to capinfos (enabled by default) to report if
the packets within a particular capture file are in strict chronological time
order or not.

svn path=/trunk/; revision=33041
2010-06-02 00:24:03 +00:00
Bill Meier 93a82410e3 Update capinfos man page.
svn path=/trunk/; revision=32653
2010-05-03 20:38:06 +00:00
Gerald Combs 23a90258fb Add an option to capinfos to print start and end times as seconds, which
makes time-shifting using editcap easier. Sort the flags in the capinfos
man page alphabetically to match the other man pages. Add a
time-shifting example to the mergecap man page.

svn path=/trunk/; revision=31905
2010-02-17 20:15:50 +00:00
Bill Meier 5d9f1e8693 Remove repeated blank lines which caused the pod processor to not recognize the following pod directive.
svn path=/trunk/; revision=31371
2009-12-28 14:59:16 +00:00
Gerald Combs 7c276becfd Add SHA1, RMD160, and MD5 hashes to capinfos.
svn path=/trunk/; revision=31191
2009-12-07 23:18:12 +00:00
Jaap Keuter 25470e5663 From Jim Young:
The ability to continue processing additional files if and when 
wtap_open_offline() should fail.  A new -C option reverts to capinfos' 
original behavior which is to cancel any further file processing at 
first file open failure.

Change the behavior of how the default display of all infos is initiated.
This gets rid of a special post getopt() argument count test.

Add new table output format (with related options). This feature allows 
outputting the various infos into a tab delimited text file, or to a comma 
separated variables file (*.csv) instead of the original "long" format.

svn path=/trunk/; revision=30956
2009-11-13 21:43:57 +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
Stig Bjørlykke 16717f3be2 From Andrew Feren (bug 2462):
Patch to print packet rate.

From me:
Document -x option in man page.

svn path=/trunk/; revision=25024
2008-04-14 20:02:45 +00:00
Gerald Combs 23af5dbf9a Add the -E (encapsulation) flag.
svn path=/trunk/; revision=22987
2007-09-26 15:48:45 +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
Gerald Combs 82fd788f99 Remove the numeric component in man page links.
svn path=/trunk/; revision=18698
2006-07-10 18:55:15 +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 34f4ff7bae instead of repeating the capture file format description over and over again (this list also tends to become outdated), just give a small description and refer to the Ethereal man page
svn path=/trunk/; revision=16997
2006-01-11 01:53:46 +00:00
Ulf Lamping a5c90d377c same command line related changes as recently done with editcap
svn path=/trunk/; revision=16996
2006-01-11 01:38:16 +00:00
Gerald Combs 65e839d380 Let capinfos print statistics for more than one file. Normalize
capitalization.

svn path=/trunk/; revision=12945
2005-01-03 21:11:53 +00:00
Ulf Lamping 0f80fa5c7d renamed capinfo to capinfos, as the former name capinfo was already used in a program called tcprelay, so that might confuse packaging managers and users. Hopefully I got all the places need to be changed.
svn path=/trunk/; revision=12358
2004-10-20 18:50:58 +00:00