Commit Graph

117 Commits

Author SHA1 Message Date
Bill Meier 1d11745a16 Add -h option (with output to stdout and exit status 0).
Add editor modelines.

svn path=/trunk/; revision=54514
2013-12-31 16:23:00 +00:00
Jakub Zawadzki 38edae1c71 Replace wtap_nstime with nstime_t, remove wtap_nstime_to_sec.
After r50154 nstime_t is inside wsutil/ so wiretap don't need it's own copy. 

svn path=/trunk/; revision=53184
2013-11-09 10:38:02 +00:00
Guy Harris 853da2eb9b The "file types" we have are actually combinations of types and
subtypes, e.g. Network Monitor version 1 and Network Monitor version 2
are separate "file types", even though they both come from Network
Monitor.

Rename various functions, #defines, and variables appropriately.

svn path=/trunk/; revision=53166
2013-11-08 09:53:01 +00:00
Guy Harris 6580abbbc3 Give more detailed diagnostics for errors.
Actually *check* for errors when reading.

svn path=/trunk/; revision=50934
2013-07-26 21:49:42 +00:00
Guy Harris 9df4d49905 Send error messages to the standard error, and include the program name
in the error message.

svn path=/trunk/; revision=50928
2013-07-26 21:25:33 +00:00
Pascal Quantin 6bc8d874fe Preserve summary information when reordering a file
svn path=/trunk/; revision=50054
2013-06-19 19:31:06 +00:00
Guy Harris 8c9edf1280 Have the seek-read routines take a Buffer rather than a guint8 pointer
as the "where to put the packet data" argument.

This lets more of the libwiretap code be common between the read and
seek-read code paths, and also allows for more flexibility in the "fill
in the data" path - we can expand the buffer as needed in both cases.

svn path=/trunk/; revision=49949
2013-06-16 00:20:00 +00:00
Bill Meier 0df5a9390d From beroset:
remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10397

svn path=/trunk/; revision=48438
2013-03-20 01:18:10 +00:00
Jakub Zawadzki 6b5045dd7b Fill some phdr values also when doing random read
svn path=/trunk/; revision=45619
2012-10-17 20:28:22 +00:00
Jakub Zawadzki 78631020b8 Add wtap_pseudo_header union to wtap_pkthdr structure.
Use pkthdr instead of pseudo_header as argument for dissecting.

svn path=/trunk/; revision=45601
2012-10-16 21:50:57 +00:00
Martin Mathieson 3f3743834b This is basically a rewrite from Jakub Zawadzki.
Rather than store the FrameRecord entries in a sorted linked list,
instead use an unsorted GPtrArray, then sort it all at once.

Also, there is no longer the option to limit the amount of sorting (and memory
used), but a new option means we can avoid writing the output file
altogether if the input file is found already to be in order.

svn path=/trunk/; revision=45313
2012-10-04 18:24:21 +00:00
Martin Mathieson afbf3cd596 Add a command-line option to control how large the reordering list can
become.  The default is now 0 (infinite).

svn path=/trunk/; revision=45293
2012-10-03 18:03:01 +00:00
Evan Huus c0c2466d00 Fix some signed/unsigned mismatches caught by cppcheck.
svn path=/trunk/; revision=45145
2012-09-26 01:56:13 +00:00
Martin Mathieson d06c9779a2 Fix count of out-of-order frames reported at end of run.
svn path=/trunk/; revision=45089
2012-09-24 09:42:22 +00:00
Martin Mathieson 21a21a6994 Fix for bug 7746 (from Jim Young)
Use G_GINT64_MODIFIER when REORDER_DEBUG is defined.

svn path=/trunk/; revision=45088
2012-09-24 09:21:16 +00:00
Martin Mathieson 0aa59a3df0 Turn off debug.
svn path=/trunk/; revision=45024
2012-09-20 10:36:28 +00:00
Martin Mathieson f4edf2fa41 Add a new console wiretap program to reorder the frames within a capture
file.  This version has been tested with pcap and IxCatapult files.

Haven't got config/makefile changes quite right yet, will commit later.

svn path=/trunk/; revision=45023
2012-09-20 10:28:05 +00:00