aboutsummaryrefslogtreecommitdiffstats
path: root/doc/mergecap.pod
AgeCommit message (Collapse)AuthorFilesLines
2021-10-01Docs: Prep for POD to Asciidoctor conversion.Gerald Combs1-206/+0
[skip ci] Rename each of our .pod files to .adoc. Add pod2adoc.py, which converts POD markup to Asciidoctor, along with customizations specific to us.
2021-09-01Add support for ZSTD and LZ4 decompressionErik Rigtorp1-1/+1
- Describe zstd and lz4 support in man pages - Update AUTHORS - Update mime types to recognize zstd and lz4
2021-06-20mergecap: improve the example.Guy Harris1-4/+21
Explain, in detail, exactly what it's trying to do and, for each of the three commands in the example, what each step does, as well as explaining what the calculation using the end time of one capture and start time of another capture is doing. (Where did this example come from? What is the real-world goal of this exercise? And why is it an example in which all the fancy stuff is done in commands *other* than mergecap?)
2020-06-29DOC: fix layout mergecap manual pageJaap Keuter1-7/+21
Bug: 16652 Change-Id: I2c0e0363b3ea77a616191476d6e27cca1204b7cc Reviewed-on: https://code.wireshark.org/review/37564 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-07PCAP/PCAPNG: Be consistent in documentation, etcJaap Keuter1-6/+6
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>
2018-08-18Docs: Make our Pod documentation encoding uniform.Gerald Combs1-0/+5
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>
2015-08-18Improve file merging for mergecap and wiresharkHadriel Kaplan1-17/+23
Refactor the file merging code by removing the duplicate logic from mergecap.c and file.c's cf_merge_files(), into a new merge_files() function in merge.c. Also the following user-visible changes: * Removed the '-T' encap type option from mergecap, as it's illogical for mergecap and would complicate common merge code. * Input files with IDBs of different name, speed, tsprecision, etc., will produce an output PCAPNG file with separate IDBs, even if their encap types are the same. * Added a '-I' IDB merge mode option for mergecap, to control how IDBs are merged. * Changed Wireshark's drag-and-drop merging to use PCAPNG instead of PCAP. Bug: 8795 Bug: 7381 Change-Id: Icc30d217e093d6f40114422204afd2e332834f71 Reviewed-on: https://code.wireshark.org/review/10058 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>
2014-09-17Update the doc directory to use https://www.wireshark.org.Gerald Combs1-3/+3
Change-Id: I9bfc57cb6b6ab6962b80ff58d98eb351d6f69829 Reviewed-on: https://code.wireshark.org/review/4140 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-21Add command-line argument to request the version to a number of the utilities.Jeff Morriss1-0/+5
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>
2013-07-28If a core Wireshark developer repeatedly can't remember that theGuy Harris1-3/+3
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-05-20If tcpdump doesn't exist, why refer to it? Omit this confusing phrase.Chris Maynard1-1/+1
svn path=/trunk/; revision=49427
2012-03-15Sort the options.Chris Maynard1-9/+9
svn path=/trunk/; revision=41562
2012-02-03The libpcap puts pcap-filter into the misc section (which seems to be 7).Jörg Mayer1-2/+2
Refer to pcap-filter and mention tcpdump only as a fallback. svn path=/trunk/; revision=40820
2011-11-30Hopefully clarify usage a bit to indicate multiple infile's can be specified ↵Chris Maynard1-12/+11
to be merged. Also, add GPL and copyright info. svn path=/trunk/; revision=40051
2010-02-18Fix a warning from pod2man.Guy Harris1-2/+0
svn path=/trunk/; revision=31911
2010-02-17Add an option to capinfos to print start and end times as seconds, whichGerald Combs1-0/+15
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
2009-05-12SYNOPSYS --> SYNOPSISBill Meier1-1/+1
svn path=/trunk/; revision=28338
2009-05-12Update man pages; Add several missing options; Fix typos, Do minor rewording; Bill Meier1-4/+4
editcap: Add description of -i option; dumpcap: Add description of -S option; svn path=/trunk/; revision=28336
2006-08-10Add some programs to 'see also'Jörg Mayer1-1/+2
svn path=/trunk/; revision=18867
2006-07-10Remove the numeric component in man page links.Gerald Combs1-1/+1
svn path=/trunk/; revision=18698
2006-07-09Use L<> on all links.Guy Harris1-7/+8
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-05-31Rename the main executable to "wireshark", along with more conversions:Gerald Combs1-8/+8
ethereal.com -> wireshark.org mailing lists and addresses ETHEREAL -> WIRESHARK Man pages Automake/Autoconf names svn path=/trunk/; revision=18271
2006-05-22ethereal->wiresharkRonnie Sahlberg1-1/+1
svn path=/trunk/; revision=18207
2006-01-11instead of repeating the capture file format description over and over again ↵Ulf Lamping1-98/+16
(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-10same command line related changes as recently done with editcapUlf Lamping1-97/+104
svn path=/trunk/; revision=16994
2005-01-18we can merge more than two files with mergecapUlf Lamping1-1/+1
svn path=/trunk/; revision=13112
2004-04-25build a list of the input file formats instead of a floating text,Ulf Lamping1-20/+89
added program names to HTML titles, various minor fixes svn path=/trunk/; revision=10686
2004-03-03Bill Guyton: mergecap can write to stdout by using the special filename -Jörg Mayer1-2/+3
svn path=/trunk/; revision=10289
2004-02-11Include EyeSDN USB S0 trace files in the list of file formats we read.Guy Harris1-6/+6
svn path=/trunk/; revision=10040
2003-12-18WildPackets' EtherHelp appears to write EtherPeek-compatible files,Guy Harris1-4/+4
except that the 0x80 bit is turned on in the file version number field. Turn that bit off before processing that field. svn path=/trunk/; revision=9342
2003-10-31Fix some warnings from pod2man.Guy Harris1-2/+2
svn path=/trunk/; revision=8843
2003-10-31From Scott Emberley: support for reading Network Instruments version 9Guy Harris1-17/+20
capture files. svn path=/trunk/; revision=8840
2003-07-29From Thierry Martin: support for reading files from Accellent 5Views LANGuy Harris1-6/+7
agents. svn path=/trunk/; revision=8093
2003-05-20Lump TCPIPtrace and UCX$TRACE together and add TCPtrace to the mix.Guy Harris1-9/+9
svn path=/trunk/; revision=7700
2003-05-19From Martin Warnes: support for VMS UCX$TRACE output in wiretap.Guy Harris1-8/+9
svn path=/trunk/; revision=7692
2003-03-10Obscure more email addresses.Gerald Combs1-2/+2
svn path=/trunk/; revision=7334
2002-07-31From Motonori Shindo: support for reading CoSine L2 debug output.Guy Harris1-7/+7
svn path=/trunk/; revision=5922
2002-03-26From Andrew Feren:Guy Harris1-1/+1
Man pages don't have any notion of external links and there isn't enough information for pod2html to resolve the links for manpages in the "See Also" section of the man pages. As a result running pod2html generates a bunch of warning messages and just emphasizes/italicizes the text. Therefore, we change the link (L<name>) command to an emphasizes (I<name>) command. The net result is the same, but you don't get the warnings when generating HTML docs. At some point in the future someone might want to do the work to get the links to generate correctly, but until then this will shut up pod2html. svn path=/trunk/; revision=5021
2002-01-29Untested support for AiroPeek captures.Guy Harris1-12/+13
svn path=/trunk/; revision=4619
2002-01-22Fix up various product names and descriptions in the lists of fileGuy Harris1-16/+17
formats we can read; include vendor names. We should be able to read TokenPeek captures, as well as captures from the Windows versions of EtherPeek. Don't list the version numbers for EtherPeek and TokenPeek - those are file format version numbers, not program version numbers. svn path=/trunk/; revision=4599
2002-01-18It's EtherPeek, not Etherpeek, as WildPackets' Web site indicates.Guy Harris1-1/+1
svn path=/trunk/; revision=4562
2001-12-05The Visual Networks tool that generates capture files that we now canGuy Harris1-1/+1
read is Visual UpTime. svn path=/trunk/; revision=4339
2001-12-05Note that Ethereal's and Tethereal's native capture file format isGuy Harris1-13/+15
libpcap format, and say that it's also used by "other tools" (tcpdump and Ethereal/Tethereal aren't the only tools that write captures in that format). Weaken the claim that we read Etherpeek files to say only that we read Etherpeek versions 5, 6, and 7 for Macintosh, so people don't conclude that we read Etherpeek-for-Windows captures (we don't). svn path=/trunk/; revision=4337
2001-12-04Update the manual pages to reflect the addition of support for readingGuy Harris1-8/+10
and writing Visual Networks traffic capture files. svn path=/trunk/; revision=4329
2001-10-19DBS Etherwatch wiretap module, from Marc Milgram.Guy Harris1-7/+7
svn path=/trunk/; revision=4042
2001-10-18VMS TCPIPtrace wiretap module, from Marc Milgram.Guy Harris1-4/+7
Update the lists of known capture file formats in the Tethereal, editcap, and mergecap man pages to match the current list (as found in the Ethereal man page). svn path=/trunk/; revision=4039
2001-07-14From Scott Renfro: correctly handle merging multiple files withGuy Harris1-6/+11
different encapsulation types (as best we can). svn path=/trunk/; revision=3720
2001-07-13Update from Scott Renfro to allow mergecap to merge multiple captureGuy Harris1-22/+26
files into one capture file. svn path=/trunk/; revision=3714
2001-07-12Mergecap utility for merging capture files, from Scott Renfro.Guy Harris1-0/+127
svn path=/trunk/; revision=3701
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 22:59:57 +0000