index
:
wireshark
daniel/osmux
fixeria/ipa
laforge/amr-2023
laforge/doc-fixes
laforge/pending
laforge/qcdiag
laforge/rspro
master
mobis
mobis_new
more-patches
osmith/deb-packaging
osmith/wip
osmocom/master
osmocom/qcdiag
pespin/amr
pespin/csn1
pespin/gsup
pespin/iuup-extended
pespin/osmux-stats
pespin/osmux-wip
pespin/racap
pespin/racap-tmp
pespin/rlcmac
sylvain/gmr
sylvain/gmr1
thomas/dect
wireshark.org protocol dissector with Osmocom additions (obsolete)
Harald Welte
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
wiretap
/
merge.c
Age
Commit message (
Expand
)
Author
Files
Lines
2018-11-20
wiretap: add read/write support for Decryption Secrets Block (DSB)
Peter Wu
1
-3
/
+30
2018-11-17
wiretap/merge.c: consolidate three similar merge_files routines
Peter Wu
1
-179
/
+46
2018-11-16
Use an enum for compression types in various interfaces.
Guy Harris
1
-4
/
+4
2018-11-16
Use the dump parameters structure for non-pcapng-specific stuff.
Guy Harris
1
-36
/
+20
2018-11-13
Don't have _ng versions of the dumper open routines.
Guy Harris
1
-11
/
+12
2018-11-12
wiretap: refactor common parameters for pcapng dump routines
Peter Wu
1
-5
/
+18
2018-08-11
Add support for reading and writing the new if_hardware IDB option.
Guy Harris
1
-2
/
+17
2018-06-28
Add macros to initialize nstime_t values and use them.
Guy Harris
1
-1
/
+1
2018-02-18
Fix some source headers, reformat SPDX license lines in comment block.
Jaap Keuter
1
-1
/
+2
2018-02-09
Generalize wtap_pkthdr into a structure for packet and non-packet records.
Guy Harris
1
-30
/
+36
2018-02-08
replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.
Dario Lombardo
1
-1
/
+1
2018-02-08
Fix white space.
Guy Harris
1
-1
/
+1
2018-02-08
Get rid of unused structure member.
Guy Harris
1
-3
/
+5
2018-02-05
Don't assume records all have time stamps and captured lengths.
Guy Harris
1
-14
/
+30
2018-02-05
Speak of records, not packets.
Guy Harris
1
-6
/
+6
2018-01-30
wiretap/merge.c: Fix memory leak, fix description.
Jakub Zawadzki
1
-4
/
+7
2018-01-20
wiretap: more SPDX license convertions.
Dario Lombardo
1
-14
/
+1
2017-12-26
Fix some comments.
Guy Harris
1
-3
/
+5
2017-12-26
wiretap: remove unneeded check (CID: 1396988).
Dario Lombardo
1
-1
/
+1
2017-06-05
Allow bigger snapshot lengths for D-Bus captures.
Guy Harris
1
-3
/
+3
2017-06-03
Don't keep the pcap/pcapng link-layer header type as interface data.
Guy Harris
1
-8
/
+0
2017-04-20
Take the error message generation out of the merge_files routines.
Guy Harris
1
-206
/
+36
2016-12-04
Have separate merge APIs for regular file/temporary file/standard output.
Guy Harris
1
-88
/
+304
2016-12-04
Remove unnecessary cast (gchar = char) that removes const.
Guy Harris
1
-1
/
+1
2016-10-27
merge.c: do not give a NULL pointer when saving SHB comment option
Pascal Quantin
1
-1
/
+3
2016-07-27
If we don't get any OS information, remove the old OS information.
Guy Harris
1
-0
/
+5
2016-07-26
Ensure to have a valid string pointer when writing OS SHB option
Pascal Quantin
1
-2
/
+7
2016-07-21
Don't pass NULL to wtap_block_set_string_option_value().
Guy Harris
1
-4
/
+2
2016-07-21
No need to check for string option values being null.
Guy Harris
1
-1
/
+1
2016-07-15
Fix the snapshot length part of the "same interface?" check.
Guy Harris
1
-12
/
+24
2016-07-14
Redo the block options APIs.
Guy Harris
1
-85
/
+156
2016-06-15
Don't map the interface ID for records that don't pertain to an interface.
Guy Harris
1
-5
/
+11
2016-06-15
More Sysdig / system event support.
Gerald Combs
1
-1
/
+4
2016-06-01
Add data structures necessary to support multiple Section Header blocks.
Michael Mann
1
-8
/
+10
2016-05-22
Add wtap_optionblock_set_option_string_format
Michael Mann
1
-4
/
+7
2016-02-25
Clean up modelines and indentation.
Guy Harris
1
-3
/
+3
2016-02-23
Making wiretap option blocks more generic.
Michael Mann
1
-85
/
+116
2016-02-11
Make file indices consistently unsigned in the merge code.
Guy Harris
1
-6
/
+6
2016-02-11
Avoid undefined behavior in overflow check
Michael McConville
1
-1
/
+1
2015-11-23
merge: fix parameter 'in_files/in_count_files' not found in the function decl...
Alexis La Goutte
1
-6
/
+6
2015-11-11
Make routines used only within wiretap/merge.c static.
Guy Harris
1
-43
/
+46
2015-11-10
Fix typo.
Guy Harris
1
-1
/
+1
2015-10-05
Allow use of variadic macros
Peter Wu
1
-34
/
+28
2015-08-21
Fix memory leaks of dumper SHB and IDB infos
Hadriel Kaplan
1
-5
/
+15
2015-08-19
Pcap: wtap does not set interface timestamp precision when reading pcap
Hadriel Kaplan
1
-1
/
+1
2015-08-19
Add more debug infor for windows buildbot test suite failure
Hadriel Kaplan
1
-0
/
+27
2015-08-19
Try to debug merge test suite failure on windows buildbot
Hadriel Kaplan
1
-0
/
+30
2015-08-18
Improve file merging for mergecap and wireshark
Hadriel Kaplan
1
-6
/
+704
2015-08-14
Ident the merge.c/h files by 4 spaces
Hadriel Kaplan
1
-141
/
+141
2015-02-28
Remove some unneeded includes of <sys/time.h>.
Guy Harris
1
-4
/
+0
[next]