index
:
tools/wireshark
Novell_NCP_branch
cherry-pick-112af30d
cherry-pick-78067deb-2
cherry-pick-c6e60da6-2
ethereal
lts-1.12.1
lts-1.2.11
lts-1.8.2
master
master-1.0
master-1.10
master-1.12
master-1.2
master-1.4
master-1.6
master-1.8
master-2.0
master-2.2
master-2.4
master-2.6
master-3.0
master-3.2
old-trunk-1.0
release-3.4
release-3.6
win32-native
WIP Patches to add a samsung-ipc dissector to Wireshark
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
wiretap
/
merge.c
Commit message (
Expand
)
Author
Age
Files
Lines
*
Specify directory for temporary captures
David Perry
2022-02-09
1
-5
/
+5
*
[#17478] free blocks in more places
David Perry
2021-08-10
1
-0
/
+1
*
wiretap: clean up option definitions a bit.
Guy Harris
2021-07-14
1
-2
/
+2
*
Refactor our logging and extend the wslog API
João Valverde
2021-06-11
1
-1
/
+1
*
Replace g_assert() with ws_assert() in places
João Valverde
2021-06-06
1
-28
/
+29
*
wiretap: Remove some redundant debug information
João Valverde
2021-06-06
1
-24
/
+24
*
wiretap: change wtapng_mandatory_section_t to wtapng_section_mandatory_t.
Guy Harris
2021-05-24
1
-2
/
+2
*
Add ws_debug() and use it
João Valverde
2021-05-24
1
-44
/
+41
*
Remove unnecessary inclues of wiretap/pcapng.h.
Guy Harris
2021-03-15
1
-1
/
+0
*
wiretap: have file handlers advertise blocks and options supported.
Guy Harris
2021-02-21
1
-3
/
+19
*
wiretap: clean up WTAP_BLOCK_ names.
Guy Harris
2021-02-09
1
-1
/
+1
*
Use wtap_uses_interface_ids() to check if IDBs are necessary.
Guy Harris
2020-10-22
1
-1
/
+1
*
Add an API to determine whether a file type uses interface IDs.
Guy Harris
2020-10-20
1
-1
/
+1
*
Have WTAP_ERR_INTERNAL include an err_info string giving details.
Guy Harris
2020-10-14
1
-5
/
+10
*
Fix many spelling errors
Роман Донченко
2020-10-11
1
-1
/
+1
*
wiretap: fix an internal routine's name.
Guy Harris
2020-08-04
1
-5
/
+5
*
HTTPS (almost) everywhere.
Guy Harris
2019-07-26
1
-1
/
+1
*
1514 is a better initial Buffer size than 1500.
Guy Harris
2019-04-06
1
-1
/
+1
*
Have wtap_read() fill in a wtap_rec and Buffer.
Guy Harris
2019-04-05
1
-5
/
+15
*
wiretap: add read/write support for Decryption Secrets Block (DSB)
Peter Wu
2018-11-20
1
-3
/
+30
*
wiretap/merge.c: consolidate three similar merge_files routines
Peter Wu
2018-11-17
1
-179
/
+46
*
Use an enum for compression types in various interfaces.
Guy Harris
2018-11-16
1
-4
/
+4
*
Use the dump parameters structure for non-pcapng-specific stuff.
Guy Harris
2018-11-16
1
-36
/
+20
*
Don't have _ng versions of the dumper open routines.
Guy Harris
2018-11-13
1
-11
/
+12
*
wiretap: refactor common parameters for pcapng dump routines
Peter Wu
2018-11-12
1
-5
/
+18
*
Add support for reading and writing the new if_hardware IDB option.
Guy Harris
2018-08-11
1
-2
/
+17
*
Add macros to initialize nstime_t values and use them.
Guy Harris
2018-06-28
1
-1
/
+1
*
Fix some source headers, reformat SPDX license lines in comment block.
Jaap Keuter
2018-02-18
1
-1
/
+2
*
Generalize wtap_pkthdr into a structure for packet and non-packet records.
Guy Harris
2018-02-09
1
-30
/
+36
*
replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.
Dario Lombardo
2018-02-08
1
-1
/
+1
*
Fix white space.
Guy Harris
2018-02-08
1
-1
/
+1
*
Get rid of unused structure member.
Guy Harris
2018-02-08
1
-3
/
+5
*
Don't assume records all have time stamps and captured lengths.
Guy Harris
2018-02-05
1
-14
/
+30
*
Speak of records, not packets.
Guy Harris
2018-02-05
1
-6
/
+6
*
wiretap/merge.c: Fix memory leak, fix description.
Jakub Zawadzki
2018-01-30
1
-4
/
+7
*
wiretap: more SPDX license convertions.
Dario Lombardo
2018-01-20
1
-14
/
+1
*
Fix some comments.
Guy Harris
2017-12-26
1
-3
/
+5
*
wiretap: remove unneeded check (CID: 1396988).
Dario Lombardo
2017-12-26
1
-1
/
+1
*
Allow bigger snapshot lengths for D-Bus captures.
Guy Harris
2017-06-05
1
-3
/
+3
*
Don't keep the pcap/pcapng link-layer header type as interface data.
Guy Harris
2017-06-03
1
-8
/
+0
*
Take the error message generation out of the merge_files routines.
Guy Harris
2017-04-20
1
-206
/
+36
*
Have separate merge APIs for regular file/temporary file/standard output.
Guy Harris
2016-12-04
1
-88
/
+304
*
Remove unnecessary cast (gchar = char) that removes const.
Guy Harris
2016-12-04
1
-1
/
+1
*
merge.c: do not give a NULL pointer when saving SHB comment option
Pascal Quantin
2016-10-27
1
-1
/
+3
*
If we don't get any OS information, remove the old OS information.
Guy Harris
2016-07-27
1
-0
/
+5
*
Ensure to have a valid string pointer when writing OS SHB option
Pascal Quantin
2016-07-26
1
-2
/
+7
*
Don't pass NULL to wtap_block_set_string_option_value().
Guy Harris
2016-07-21
1
-4
/
+2
*
No need to check for string option values being null.
Guy Harris
2016-07-21
1
-1
/
+1
*
Fix the snapshot length part of the "same interface?" check.
Guy Harris
2016-07-15
1
-12
/
+24
*
Redo the block options APIs.
Guy Harris
2016-07-14
1
-85
/
+156
[next]