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.h
Age
Commit message (
Expand
)
Author
Files
Lines
2018-11-20
wiretap: add read/write support for Decryption Secrets Block (DSB)
Peter Wu
1
-0
/
+1
2018-02-08
replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.
Dario Lombardo
1
-1
/
+1
2018-02-08
Get rid of unused structure member.
Guy Harris
1
-1
/
+0
2018-02-05
Speak of records, not packets.
Guy Harris
1
-3
/
+3
2018-01-20
wiretap: use SPDX identifiers (partial work).
Dario Lombardo
1
-13
/
+1
2017-04-20
Take the error message generation out of the merge_files routines.
Guy Harris
1
-9
/
+27
2017-02-14
wiretap: add cleanup routine.
Dario Lombardo
1
-1
/
+2
2016-12-04
Have separate merge APIs for regular file/temporary file/standard output.
Guy Harris
1
-4
/
+51
2016-02-11
Make file indices consistently unsigned in the merge code.
Guy Harris
1
-1
/
+1
2015-11-11
Make routines used only within wiretap/merge.c static.
Guy Harris
1
-71
/
+0
2015-08-18
Improve file merging for mergecap and wireshark
Hadriel Kaplan
1
-3
/
+100
2015-08-14
Ident the merge.c/h files by 4 spaces
Hadriel Kaplan
1
-12
/
+12
2014-05-09
Revert "Refactor Wiretap"
Guy Harris
1
-1
/
+1
2014-05-09
Refactor Wiretap
Michael Mann
1
-1
/
+1
2014-03-04
Remove all $Id$ from top of file
Alexis La Goutte
1
-2
/
+0
2013-07-16
Move merge.{h,c} into wiretap: these modules use wiretap to merge files.
Jeff Morriss
1
-0
/
+130