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
2023-02-04
cli: Process IDBs after the final packet record
John Thacker
1
-1
/
+9
2023-02-04
merge: Check if each encapsulation type is supported
John Thacker
1
-8
/
+12
2023-01-30
wiretap: Preserve NRBs with editcap, mergecap, and tshark
John Thacker
1
-3
/
+53
2022-06-02
wiretap: merge support for IDBs in the middle of a file
John Thacker
1
-40
/
+128
2022-05-13
merge: Don't write to stdout if tempdir is not set
John Thacker
1
-5
/
+6
2022-03-14
wiretap: have wtap_dump_close() provide a "needs to be reloaded" indication.
Guy Harris
1
-2
/
+2
2022-02-09
Specify directory for temporary captures
David Perry
1
-5
/
+5
2021-08-10
[#17478] free blocks in more places
David Perry
1
-0
/
+1
2021-07-14
wiretap: clean up option definitions a bit.
Guy Harris
1
-2
/
+2
2021-06-11
Refactor our logging and extend the wslog API
João Valverde
1
-1
/
+1
2021-06-06
Replace g_assert() with ws_assert() in places
João Valverde
1
-28
/
+29
2021-06-06
wiretap: Remove some redundant debug information
João Valverde
1
-24
/
+24
2021-05-24
wiretap: change wtapng_mandatory_section_t to wtapng_section_mandatory_t.
Guy Harris
1
-2
/
+2
2021-05-24
Add ws_debug() and use it
João Valverde
1
-44
/
+41
2021-03-15
Remove unnecessary inclues of wiretap/pcapng.h.
Guy Harris
1
-1
/
+0
2021-02-21
wiretap: have file handlers advertise blocks and options supported.
Guy Harris
1
-3
/
+19
2021-02-09
wiretap: clean up WTAP_BLOCK_ names.
Guy Harris
1
-1
/
+1
2020-10-22
Use wtap_uses_interface_ids() to check if IDBs are necessary.
Guy Harris
1
-1
/
+1
2020-10-20
Add an API to determine whether a file type uses interface IDs.
Guy Harris
1
-1
/
+1
2020-10-14
Have WTAP_ERR_INTERNAL include an err_info string giving details.
Guy Harris
1
-5
/
+10
2020-10-11
Fix many spelling errors
Роман Донченко
1
-1
/
+1
2020-08-04
wiretap: fix an internal routine's name.
Guy Harris
1
-5
/
+5
2019-07-26
HTTPS (almost) everywhere.
Guy Harris
1
-1
/
+1
2019-04-06
1514 is a better initial Buffer size than 1500.
Guy Harris
1
-1
/
+1
2019-04-05
Have wtap_read() fill in a wtap_rec and Buffer.
Guy Harris
1
-5
/
+15
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
[next]