path: root/mergecap.c
AgeCommit message (Expand)AuthorFilesLines
2015-08-18Improve file merging for mergecap and wiresharkHadriel Kaplan1-336/+127
2015-08-06Pcapng: support Name Resolution Block optionsHadriel Kaplan1-1/+1
2015-06-25mergecap: check input files time precision before exporting to pcapng formatPascal Quantin1-2/+39
2015-05-10mergecap: fix merge of files with different encapsulation typesPascal Quantin1-1/+52
2015-02-28Remove some unneeded includes of <sys/time.h>.Guy Harris1-4/+0
2015-02-20Suppress a bunch of cast-qual warnings.Gerald Combs1-2/+5
2015-02-09(Trivial) Fix printf-related 'Mismatch on sign' warningsBill Meier1-1/+1
2014-12-31Do the full string in get_{compiled,runtime}_version_info().Guy Harris1-6/+4
2014-12-31Move the version_info.c stuff to wsutil/ws_version_info.c.Guy Harris1-2/+0
2014-12-25Only include <wsutil/os_version_info.h> if we need it.Guy Harris1-1/+0
2014-12-25Check for getopt_long(), not getopt().Guy Harris1-1/+1
2014-12-24Move twelve show_version() functions from the varoius programs andStephen Fisher1-16/+1
2014-12-22Fix The left operand of '!=' is a garbage value issue found by Clang AnalyzerAlexis La Goutte1-1/+1
2014-12-18Make sure err_info is always set, and print it iff it's non-null.Guy Harris1-11/+3
2014-12-18WTAP_ERR_UNWRITABLE_ errors aren't returned by reads or open-for-reading.Guy Harris1-4/+0
2014-12-18Handle "I can't map this for that file format" better.Guy Harris1-3/+29
2014-10-29Rename the strnatcmp.c routines and make them use the g_ascii_XXX() routines.Guy Harris1-2/+2
2014-09-22Ensure pcapng application name is always dynamically allocatedEvan Huus1-1/+1
2014-08-24Modify includes of config.h so that out-of-tree builds, i.e. CMakeGraham Bloice1-1/+1
2014-08-05Fix whitespace/indentation to match editor modelines.Bill Meier1-1/+1
2014-07-03Use get_*_int() from wsutil, rather than defining our own.Guy Harris1-39/+25
2014-07-03Make --help and --version information a bit more uniform.Guy Harris1-23/+73
2014-07-03More getopt_long, to add --help and --version support.Guy Harris1-1/+10
2014-06-21Add command-line argument to request the version to a number of the utilities.Jeff Morriss1-6/+17
2014-05-09Revert "Refactor Wiretap"Guy Harris1-8/+8
2014-05-09Refactor WiretapMichael Mann1-8/+8
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
2014-02-25Fix mergecap.c: Dereference of null pointer (clang analyzer)Hadriel Kaplan1-2/+2
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs1-3/+3
2014-01-22Don't write out packets that have a "captured length" bigger than we'reGuy Harris1-4/+17
2014-01-21Check the return of wtap_dump_close() even if we've gotten a read error;Guy Harris1-3/+10
2014-01-03For -h option: output to stdout and exit(0) as per convention;Bill Meier1-45/+54
2013-11-08The "file types" we have are actually combinations of types andGuy Harris1-9/+9
2013-09-06Whitespace cleanup, sort options, add modelines.Chris Maynard1-75/+82
2013-07-16Move merge.{h,c} into wiretap: these modules use wiretap to merge files.Jeff Morriss1-8/+4
2013-07-16Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specificJeff Morriss1-1/+2
2013-07-10Add strnatcmp by Martin Pool for 'natural order' string comparisons, and make...Chris Maynard1-1/+14
2013-03-10Only cast the variable after checking it.Michael Tüxen1-3/+3
2013-03-05Use explicit casts.Anders Broman1-2/+2
2013-02-20When any of our executables start on Windows create or open a "WiresharkGerald Combs1-0/+1
2012-10-16Add wtap_pseudo_header union to wtap_pkthdr structure.Jakub Zawadzki1-2/+1
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-2/+0
2012-05-10Avoid needlessly shadowing another variable.Martin Mathieson1-1/+0
2012-04-25Fix typo.Michael Tüxen1-1/+1
2012-04-25Fix copy and paste error.Michael Tüxen1-1/+1
2012-04-25Fix compilation. While there, remove some trailing whitespaces.Michael Tüxen1-2/+2
2012-04-25use in_files->filenameAnders Broman1-1/+1
2012-04-25Add some info in SHB if writing a pcap-ng file.Anders Broman1-1/+24