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
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
2016-03-06
To see whether a string equals another string, just use strcmp().
Guy Harris
1
-1
/
+1
2016-03-03
We need to include <wsutil/privileges.h> for those functions.
Guy Harris
1
-0
/
+1
2016-03-03
Add missing initialization calls.
Guy Harris
1
-1
/
+8
2016-03-03
Refactor wiretap option block types into a registration system.
Michael Mann
1
-0
/
+43
2016-01-06
Clean up more includes of wtap.h.
Guy Harris
1
-1
/
+2
2015-12-12
Remove -Wwrite-strings compiler flag
João Valverde
1
-4
/
+2
2015-11-11
Update user guide for development release
Pascal Quantin
1
-1
/
+1
2015-11-07
Clean up includes of unistd.h, fcntl.h, and sys/stat.h.
Guy Harris
1
-8
/
+0
2015-08-18
Improve file merging for mergecap and wireshark
Hadriel Kaplan
1
-336
/
+127
2015-08-06
Pcapng: support Name Resolution Block options
Hadriel Kaplan
1
-1
/
+1
2015-06-25
mergecap: check input files time precision before exporting to pcapng format
Pascal Quantin
1
-2
/
+39
2015-05-10
mergecap: fix merge of files with different encapsulation types
Pascal Quantin
1
-1
/
+52
2015-02-28
Remove some unneeded includes of <sys/time.h>.
Guy Harris
1
-4
/
+0
2015-02-20
Suppress a bunch of cast-qual warnings.
Gerald Combs
1
-2
/
+5
2015-02-09
(Trivial) Fix printf-related 'Mismatch on sign' warnings
Bill Meier
1
-1
/
+1
2014-12-31
Do the full string in get_{compiled,runtime}_version_info().
Guy Harris
1
-6
/
+4
2014-12-31
Move the version_info.c stuff to wsutil/ws_version_info.c.
Guy Harris
1
-2
/
+0
2014-12-25
Only include <wsutil/os_version_info.h> if we need it.
Guy Harris
1
-1
/
+0
2014-12-25
Check for getopt_long(), not getopt().
Guy Harris
1
-1
/
+1
2014-12-24
Move twelve show_version() functions from the varoius programs and
Stephen Fisher
1
-16
/
+1
2014-12-22
Fix The left operand of '!=' is a garbage value issue found by Clang Analyzer
Alexis La Goutte
1
-1
/
+1
2014-12-18
Make sure err_info is always set, and print it iff it's non-null.
Guy Harris
1
-11
/
+3
2014-12-18
WTAP_ERR_UNWRITABLE_ errors aren't returned by reads or open-for-reading.
Guy Harris
1
-4
/
+0
2014-12-18
Rename WTAP_ERR_REC_TYPE_UNSUPPORTED to WTAP_ERR_UNWRITABLE_REC_TYPE.
Guy Harris
1
-1
/
+1
2014-12-18
Handle "I can't map this for that file format" better.
Guy Harris
1
-3
/
+29
2014-12-17
Rename WTAP_ERR_UNSUPPORTED_ENCAP to WTAP_ERR_UNWRITABLE_ENCAP.
Guy Harris
1
-3
/
+3
2014-10-29
Rename the strnatcmp.c routines and make them use the g_ascii_XXX() routines.
Guy Harris
1
-2
/
+2
2014-09-22
Ensure pcapng application name is always dynamically allocated
Evan Huus
1
-1
/
+1
2014-08-24
Modify includes of config.h so that out-of-tree builds, i.e. CMake
Graham Bloice
1
-1
/
+1
2014-08-05
Fix whitespace/indentation to match editor modelines.
Bill Meier
1
-1
/
+1
2014-07-03
Use get_*_int() from wsutil, rather than defining our own.
Guy Harris
1
-39
/
+25
2014-07-03
Make --help and --version information a bit more uniform.
Guy Harris
1
-23
/
+73
2014-07-03
More getopt_long, to add --help and --version support.
Guy Harris
1
-1
/
+10
2014-06-21
Add command-line argument to request the version to a number of the utilities.
Jeff Morriss
1
-6
/
+17
2014-05-09
Revert "Refactor Wiretap"
Guy Harris
1
-8
/
+8
2014-05-09
Refactor Wiretap
Michael Mann
1
-8
/
+8
[next]