aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
Commit message (Expand)AuthorAgeFilesLines
* PCAP/PCAPNG: Be consistent in documentation, etcJaap Keuter2018-12-071-2/+6
* Don't use dladdr() to get a pathname for the current executable().Guy Harris2018-10-081-1/+1
* Bring back arg_list_utf_16to8(), but have it just do UTF-16-to-UTF-8 mapping.Guy Harris2018-10-081-7/+4
* Use wsetargv.obj, and wmain() rather than main(), on Windows.Guy Harris2018-10-071-5/+22
* replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.Dario Lombardo2018-02-081-1/+1
* Speak of records, not packets.Guy Harris2018-02-051-1/+1
* wiretap: add a parameter to wtap_init() indicating whether plugins must be lo...Pascal Quantin2018-01-091-1/+1
* Refactor plugin registration and loadingJoão Valverde2017-12-141-19/+1
* Start using SPDX license identifiers.Gerald Combs2017-11-091-13/+1
* Rename "ws_version_info.h", also .cJoão Valverde2017-09-261-1/+1
* Eliminate some double-frees.Guy Harris2017-04-291-2/+0
* mergecap: remove a now useless variablePascal Quantin2017-04-201-2/+0
* Take the error message generation out of the merge_files routines.Guy Harris2017-04-201-13/+26
* Clean up handling of enabled/disabled protocols/heuristic dissectors.Guy Harris2017-04-081-4/+6
* mergecap: free memory on shutdown.Dario Lombardo2017-02-221-0/+4
* wiretap: add cleanup routine.Dario Lombardo2017-02-141-8/+15
* Clean up initialization code for programs.Guy Harris2016-12-051-19/+22
* Have a routine to do all the work of initializing libwiretap.Guy Harris2016-12-041-4/+2
* Have separate merge APIs for regular file/temporary file/standard output.Guy Harris2016-12-041-20/+18
* More signed vs. unsigned argument cleanups.Guy Harris2016-09-111-2/+2
* Fix version-string releated memleak for some CLI toolsPeter Wu2016-09-101-0/+4
* Have scan_plugins() take an argument specify what to do on load failures.Guy Harris2016-09-051-7/+11
* Remove unneeded include.Guy Harris2016-08-101-1/+0
* Link version code statically againJoão Valverde2016-04-211-1/+1
* Include ws_diag_control.h in config.hJoão Valverde2016-04-041-1/+0
* Move zlib version check to wsutilJoão Valverde2016-04-031-38/+2
* Fix warnings/errors of type -Wused-but-marked-unusedJoerg Mayer2016-03-281-1/+6
* Fix compile errors when compiling w/o zlibDaniël van Eeden2016-03-261-1/+1
* To see whether a string equals another string, just use strcmp().Guy Harris2016-03-061-1/+1
* We need to include <wsutil/privileges.h> for those functions.Guy Harris2016-03-031-0/+1
* Add missing initialization calls.Guy Harris2016-03-031-1/+8
* Refactor wiretap option block types into a registration system.Michael Mann2016-03-031-0/+43
* Clean up more includes of wtap.h.Guy Harris2016-01-061-1/+2
* Remove -Wwrite-strings compiler flagJoão Valverde2015-12-121-4/+2
* Update user guide for development releasePascal Quantin2015-11-111-1/+1
* Clean up includes of unistd.h, fcntl.h, and sys/stat.h.Guy Harris2015-11-071-8/+0
* Improve file merging for mergecap and wiresharkHadriel Kaplan2015-08-181-336/+127
* Pcapng: support Name Resolution Block optionsHadriel Kaplan2015-08-061-1/+1
* mergecap: check input files time precision before exporting to pcapng formatPascal Quantin2015-06-251-2/+39
* mergecap: fix merge of files with different encapsulation typesPascal Quantin2015-05-101-1/+52
* Remove some unneeded includes of <sys/time.h>.Guy Harris2015-02-281-4/+0
* Suppress a bunch of cast-qual warnings.Gerald Combs2015-02-201-2/+5
* (Trivial) Fix printf-related 'Mismatch on sign' warningsBill Meier2015-02-091-1/+1
* Do the full string in get_{compiled,runtime}_version_info().Guy Harris2014-12-311-6/+4
* Move the version_info.c stuff to wsutil/ws_version_info.c.Guy Harris2014-12-311-2/+0
* Only include <wsutil/os_version_info.h> if we need it.Guy Harris2014-12-251-1/+0
* Check for getopt_long(), not getopt().Guy Harris2014-12-251-1/+1
* Move twelve show_version() functions from the varoius programs andStephen Fisher2014-12-241-16/+1
* Fix The left operand of '!=' is a garbage value issue found by Clang AnalyzerAlexis La Goutte2014-12-221-1/+1
* Make sure err_info is always set, and print it iff it's non-null.Guy Harris2014-12-181-11/+3