aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/merge.c
AgeCommit message (Expand)AuthorFilesLines
2023-02-04cli: Process IDBs after the final packet recordJohn Thacker1-1/+9
2023-02-04merge: Check if each encapsulation type is supportedJohn Thacker1-8/+12
2023-01-30wiretap: Preserve NRBs with editcap, mergecap, and tsharkJohn Thacker1-3/+53
2022-06-02wiretap: merge support for IDBs in the middle of a fileJohn Thacker1-40/+128
2022-05-13merge: Don't write to stdout if tempdir is not setJohn Thacker1-5/+6
2022-03-14wiretap: have wtap_dump_close() provide a "needs to be reloaded" indication.Guy Harris1-2/+2
2022-02-09Specify directory for temporary capturesDavid Perry1-5/+5
2021-08-10[#17478] free blocks in more placesDavid Perry1-0/+1
2021-07-14wiretap: clean up option definitions a bit.Guy Harris1-2/+2
2021-06-11Refactor our logging and extend the wslog APIJoão Valverde1-1/+1
2021-06-06Replace g_assert() with ws_assert() in placesJoão Valverde1-28/+29
2021-06-06wiretap: Remove some redundant debug informationJoão Valverde1-24/+24
2021-05-24wiretap: change wtapng_mandatory_section_t to wtapng_section_mandatory_t.Guy Harris1-2/+2
2021-05-24Add ws_debug() and use itJoão Valverde1-44/+41
2021-03-15Remove unnecessary inclues of wiretap/pcapng.h.Guy Harris1-1/+0
2021-02-21wiretap: have file handlers advertise blocks and options supported.Guy Harris1-3/+19
2021-02-09wiretap: clean up WTAP_BLOCK_ names.Guy Harris1-1/+1
2020-10-22Use wtap_uses_interface_ids() to check if IDBs are necessary.Guy Harris1-1/+1
2020-10-20Add an API to determine whether a file type uses interface IDs.Guy Harris1-1/+1
2020-10-14Have WTAP_ERR_INTERNAL include an err_info string giving details.Guy Harris1-5/+10
2020-10-11Fix many spelling errorsРоман Донченко1-1/+1
2020-08-04wiretap: fix an internal routine's name.Guy Harris1-5/+5
2019-07-26HTTPS (almost) everywhere.Guy Harris1-1/+1
2019-04-061514 is a better initial Buffer size than 1500.Guy Harris1-1/+1
2019-04-05Have wtap_read() fill in a wtap_rec and Buffer.Guy Harris1-5/+15
2018-11-20wiretap: add read/write support for Decryption Secrets Block (DSB)Peter Wu1-3/+30
2018-11-17wiretap/merge.c: consolidate three similar merge_files routinesPeter Wu1-179/+46
2018-11-16Use an enum for compression types in various interfaces.Guy Harris1-4/+4
2018-11-16Use the dump parameters structure for non-pcapng-specific stuff.Guy Harris1-36/+20
2018-11-13Don't have _ng versions of the dumper open routines.Guy Harris1-11/+12
2018-11-12wiretap: refactor common parameters for pcapng dump routinesPeter Wu1-5/+18
2018-08-11Add support for reading and writing the new if_hardware IDB option.Guy Harris1-2/+17
2018-06-28Add macros to initialize nstime_t values and use them.Guy Harris1-1/+1
2018-02-18Fix some source headers, reformat SPDX license lines in comment block.Jaap Keuter1-1/+2
2018-02-09Generalize wtap_pkthdr into a structure for packet and non-packet records.Guy Harris1-30/+36
2018-02-08replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.Dario Lombardo1-1/+1
2018-02-08Fix white space.Guy Harris1-1/+1
2018-02-08Get rid of unused structure member.Guy Harris1-3/+5
2018-02-05Don't assume records all have time stamps and captured lengths.Guy Harris1-14/+30
2018-02-05Speak of records, not packets.Guy Harris1-6/+6
2018-01-30wiretap/merge.c: Fix memory leak, fix description.Jakub Zawadzki1-4/+7
2018-01-20wiretap: more SPDX license convertions.Dario Lombardo1-14/+1
2017-12-26Fix some comments.Guy Harris1-3/+5
2017-12-26wiretap: remove unneeded check (CID: 1396988).Dario Lombardo1-1/+1
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 10:45:25 +0000