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
/
mergecap.c
Age
Commit message (
Expand
)
Author
Files
Lines
2021-09-30
ws_getopt: Rename struct and macros
João Valverde
1
-3
/
+3
2021-09-17
Use the musl in-tree getopt_long() everywhere
João Valverde
1
-27
/
+16
2021-07-04
Move version_info.[ch] to ui/
João Valverde
1
-1
/
+1
2021-06-26
wslog: Check environment initialization for errors
João Valverde
1
-3
/
+3
2021-06-21
wslog: Check if we are initialized and add missing inits
João Valverde
1
-0
/
+7
2021-06-19
Replace g_assert() with ws_assert()
João Valverde
1
-1
/
+2
2021-03-24
Replace g_assert(FALSE) with g_assert_not_reached()
João Valverde
1
-1
/
+1
2021-03-15
Add more error-reporting routines that call through a function pointer.
Guy Harris
1
-23
/
+18
2021-02-23
wiretap: eliminate the pcap/nspcap/pcapng WTAP_FILE_TYPE_SUBTYPE_ values.
Guy Harris
1
-4
/
+12
2021-02-17
wiretap: more work on file type/subtypes.
Guy Harris
1
-33
/
+7
2021-02-14
Enable -Wredundant-decls.
Guy Harris
1
-5
/
+10
2021-02-13
wiretap: file types have a name and a description.
Guy Harris
1
-4
/
+4
2020-12-22
Let the CLI programs tell about how to show their version
Jaap Keuter
1
-0
/
+1
2020-10-14
Have WTAP_ERR_INTERNAL include an err_info string giving details.
Guy Harris
1
-2
/
+3
2020-04-06
CMake: remove ENABLE_PCAP_NG_DEFAULT option
Peter Wu
1
-8
/
+0
2019-07-26
HTTPS (almost) everywhere.
Guy Harris
1
-1
/
+1
2019-01-09
Clarify the name and description for a link-layer encapsulation type.
Guy Harris
1
-6
/
+6
2019-01-02
cli_main: remove real_main from stack traces for non-Windows
Peter Wu
1
-1
/
+1
2019-01-01
Move some command-line-oriented routines from wsutil to ui.
Guy Harris
1
-2
/
+2
2018-12-13
Move more version-info-related stuff to version_info.c.
Guy Harris
1
-33
/
+8
2018-12-13
Put the main() and wmain() routines for CLI programs into a separate file.
Guy Harris
1
-22
/
+3
2018-12-12
mergecap: set full name as capture application
Jaap Keuter
1
-4
/
+8
2018-12-07
PCAP/PCAPNG: Be consistent in documentation, etc
Jaap Keuter
1
-2
/
+6
2018-10-08
Bring back arg_list_utf_16to8(), but have it just do UTF-16-to-UTF-8 mapping.
Guy Harris
1
-7
/
+4
2018-10-07
Use wsetargv.obj, and wmain() rather than main(), on Windows.
Guy Harris
1
-5
/
+22
2018-05-05
Don't use dladdr() to get a pathname for the current executable().
Guy Harris
1
-1
/
+1
2018-02-08
replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.
Dario Lombardo
1
-1
/
+1
2018-02-05
Speak of records, not packets.
Guy Harris
1
-1
/
+1
2018-01-09
wiretap: add a parameter to wtap_init() indicating whether plugins must be lo...
Pascal Quantin
1
-1
/
+1
2017-12-14
Refactor plugin registration and loading
João Valverde
1
-19
/
+1
2017-11-09
Start using SPDX license identifiers.
Gerald Combs
1
-13
/
+1
2017-09-26
Rename "ws_version_info.h", also .c
João Valverde
1
-1
/
+1
2017-04-29
Eliminate some double-frees.
Guy Harris
1
-2
/
+0
2017-04-20
mergecap: remove a now useless variable
Pascal Quantin
1
-2
/
+0
2017-04-20
Take the error message generation out of the merge_files routines.
Guy Harris
1
-13
/
+26
2017-04-08
Clean up handling of enabled/disabled protocols/heuristic dissectors.
Guy Harris
1
-4
/
+6
2017-02-22
mergecap: free memory on shutdown.
Dario Lombardo
1
-0
/
+4
2017-02-14
wiretap: add cleanup routine.
Dario Lombardo
1
-8
/
+15
2016-12-05
Clean up initialization code for programs.
Guy Harris
1
-19
/
+22
2016-12-04
Have a routine to do all the work of initializing libwiretap.
Guy Harris
1
-4
/
+2
2016-12-04
Have separate merge APIs for regular file/temporary file/standard output.
Guy Harris
1
-20
/
+18
2016-09-11
More signed vs. unsigned argument cleanups.
Guy Harris
1
-2
/
+2
2016-09-10
Fix version-string releated memleak for some CLI tools
Peter Wu
1
-0
/
+4
2016-09-05
Have scan_plugins() take an argument specify what to do on load failures.
Guy Harris
1
-7
/
+11
2016-08-10
Remove unneeded include.
Guy Harris
1
-1
/
+0
2016-04-21
Link version code statically again
João Valverde
1
-1
/
+1
2016-04-04
Include ws_diag_control.h in config.h
João Valverde
1
-1
/
+0
2016-04-03
Move zlib version check to wsutil
João Valverde
1
-38
/
+2
2016-03-28
Fix warnings/errors of type -Wused-but-marked-unused
Joerg Mayer
1
-1
/
+6
2016-03-26
Fix compile errors when compiling w/o zlib
Daniël van Eeden
1
-1
/
+1
[next]