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
2004-03-04
Undo an unnecessary change
Jörg Mayer
1
-2
/
+2
2004-03-03
Bill Guyton: mergecap can write to stdout by using the special filename -
Jörg Mayer
1
-1
/
+6
2004-02-20
Add support for a "version.conf" file in the main directory which can
Gerald Combs
1
-2
/
+2
2004-01-25
Free the error info string after using it.
Guy Harris
1
-1
/
+2
2004-01-25
Have the Wiretap open, read, and seek-and-read routines return, in
Guy Harris
1
-6
/
+27
2004-01-18
Fix warnings found by -Wstrict-prototypes
Jörg Mayer
1
-2
/
+2
2004-01-18
Output the result of -h to stdout, not stderr
Jörg Mayer
1
-18
/
+18
2004-01-18
Nice rendering of the CVS version as "(cvs 200401181200003000)".
Olivier Biot
1
-2
/
+6
2004-01-16
In case of CVS sources, add the date of the last change to the version
Jörg Mayer
1
-2
/
+3
2002-08-28
Removed trailing whitespaces from .h and .c files using the
Jörg Mayer
1
-19
/
+19
2002-08-02
Replace the types from sys/types.h and netinet/in.h by their glib.h
Jörg Mayer
1
-9
/
+5
2002-06-23
WinPcap 2.3's <pcap.h> includes <packet32.h>, and WinPcap 2.3's
Guy Harris
1
-3
/
+3
2002-03-31
From Joerg Mayer: mark function arguments as unused.
Guy Harris
1
-2
/
+2
2002-02-24
From Peter Valchev: fix editcap to assign the result of "getopt()" to an
Guy Harris
1
-2
/
+2
2002-02-08
Have Wiretap set the snapshot length to 0 if it can't be derived from
Guy Harris
1
-3
/
+9
2001-10-04
Use longs as file offsets, so that on platforms with 64-bit "long" we
Guy Harris
1
-3
/
+3
2001-07-20
Get rid of some unused variables.
Guy Harris
1
-4
/
+1
2001-07-14
From Scott Renfro: correctly handle merging multiple files with
Guy Harris
1
-7
/
+53
2001-07-13
Update from Scott Renfro to allow mergecap to merge multiple capture
Guy Harris
1
-140
/
+265
2001-07-12
Mergecap utility for merging capture files, from Scott Renfro.
Guy Harris
1
-0
/
+330