diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2018-12-07 00:24:29 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-12-07 06:00:14 +0000 |
| commit | a58904f387492b2f53816d4f10feb41b49fcc319 (patch) | |
| tree | 33ea522beb67e8010cbffa180e4c18bc6c24066e /tshark.c | |
| parent | 0dfa4e825326a2573f4606b93da3a45d8a8a5e06 (diff) | |
PCAP/PCAPNG: Be consistent in documentation, etc
1) The default build configuration is to select PCAPNG as
output format, but it can be selected as PCAP. Some of the
command line tools have the option to select the output
format and default towards the build configuration.
This has to be reflected in their help output also.
2) Various documentation files are still stating that PCAP is
the default format of various tools. With the default build
configuration being PCAPNG these have to be adjusted as well.
(with lack of dynamic content the documentation can only refer
to the default build configuration format).
Change-Id: I51d19642a7ed8c99817971c1f25d20972095021e
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/30951
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'tshark.c')
| -rw-r--r-- | tshark.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -386,10 +386,18 @@ print_usage(FILE *output) /*fprintf(output, "\n");*/ fprintf(output, "Output:\n"); +#ifdef PCAP_NG_DEFAULT + fprintf(output, " -w <outfile|-> write packets to a pcapng-format file named \"outfile\"\n"); +#else fprintf(output, " -w <outfile|-> write packets to a pcap-format file named \"outfile\"\n"); +#endif fprintf(output, " (or to the standard output for \"-\")\n"); fprintf(output, " -C <config profile> start with specified configuration profile\n"); +#ifdef PCAP_NG_DEFAULT fprintf(output, " -F <output file type> set the output file type, default is pcapng\n"); +#else + fprintf(output, " -F <output file type> set the output file type, default is pcap\n"); +#endif fprintf(output, " an empty \"-F\" option will list the file types\n"); fprintf(output, " -V add output of packet tree (Packet Details)\n"); fprintf(output, " -O <protocols> Only show packet details of these protocols, comma\n"); |