summaryrefslogtreecommitdiff
path: root/wiretap/merge.c
AgeCommit message (Expand)AuthorFilesLines
2017-06-05Allow bigger snapshot lengths for D-Bus captures.Guy Harris1-3/+3
2017-06-03Don't keep the pcap/pcapng link-layer header type as interface data.Guy Harris1-8/+0
2017-04-20Take the error message generation out of the merge_files routines.Guy Harris1-206/+36
2016-12-04Have separate merge APIs for regular file/temporary file/standard output.Guy Harris1-88/+304
2016-12-04Remove unnecessary cast (gchar = char) that removes const.Guy Harris1-1/+1
2016-10-27merge.c: do not give a NULL pointer when saving SHB comment optionPascal Quantin1-1/+3
2016-07-27If we don't get any OS information, remove the old OS information.Guy Harris1-0/+5
2016-07-26Ensure to have a valid string pointer when writing OS SHB optionPascal Quantin1-2/+7
2016-07-21Don't pass NULL to wtap_block_set_string_option_value().Guy Harris1-4/+2
2016-07-21No need to check for string option values being null.Guy Harris1-1/+1
2016-07-15Fix the snapshot length part of the "same interface?" check.Guy Harris1-12/+24
2016-07-14Redo the block options APIs.Guy Harris1-85/+156
2016-06-15Don't map the interface ID for records that don't pertain to an interface.Guy Harris1-5/+11
2016-06-15More Sysdig / system event support.Gerald Combs1-1/+4
2016-06-01Add data structures necessary to support multiple Section Header blocks.Michael Mann1-8/+10
2016-05-22Add wtap_optionblock_set_option_string_formatMichael Mann1-4/+7
2016-02-25Clean up modelines and indentation.Guy Harris1-3/+3
2016-02-23Making wiretap option blocks more generic.Michael Mann1-85/+116
2016-02-11Make file indices consistently unsigned in the merge code.Guy Harris1-6/+6
2016-02-11Avoid undefined behavior in overflow checkMichael McConville1-1/+1
2015-11-23merge: fix parameter 'in_files/in_count_files' not found in the function decl...Alexis La Goutte1-6/+6
2015-11-11Make routines used only within wiretap/merge.c static.Guy Harris1-43/+46
2015-11-10Fix typo.Guy Harris1-1/+1
2015-10-05Allow use of variadic macrosPeter Wu1-34/+28
2015-08-21Fix memory leaks of dumper SHB and IDB infosHadriel Kaplan1-5/+15
2015-08-19Pcap: wtap does not set interface timestamp precision when reading pcapHadriel Kaplan1-1/+1
2015-08-19Add more debug infor for windows buildbot test suite failureHadriel Kaplan1-0/+27
2015-08-19Try to debug merge test suite failure on windows buildbotHadriel Kaplan1-0/+30
2015-08-18Improve file merging for mergecap and wiresharkHadriel Kaplan1-6/+704
2015-08-14Ident the merge.c/h files by 4 spacesHadriel Kaplan1-141/+141
2015-02-28Remove some unneeded includes of <sys/time.h>.Guy Harris1-4/+0
2015-01-03Remove unnecessary includes from wiretap folderMartin Mathieson1-2/+0
2015-01-02Add "Editor modelines"; Adjust whitespace as needed.Bill Meier1-0/+13
2014-09-22Try to fix some buildbot warningsMichal Labedzki1-2/+3
2014-05-09Revert "Refactor Wiretap"Guy Harris1-14/+13
2014-05-09Refactor WiretapMichael Mann1-13/+14
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
2014-02-25Wireshark: Add option to choose format type of capture fileMichal Labedzki1-1/+1
2013-11-09Replace wtap_nstime with nstime_t, remove wtap_nstime_to_sec.Jakub Zawadzki1-2/+3
2013-07-16Move merge.{h,c} into wiretap: these modules use wiretap to merge files.Jeff Morriss1-0/+286
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-02 19:58:26 +0000