The data contained in this repository can be downloaded to your computer using one of several clients.
Please see the documentation of your version control software client for more information.

Please select the desired protocol below to get the URL.

This URL has Read-Only access.

Statistics
| Branch: | Revision:

main_repo / reordercap.c @ master

History | View | Annotate | Download (11.6 KB)

# Date Author Comment
97546165 08/24/2014 04:04 AM Graham Bloice

Modify includes of config.h so that out-of-tree builds, i.e. CMake
don't pick up the in-tree copy.

Change-Id: I7ec473876cdba1a025c52362d7f6adc62d24ce71
Reviewed-on: https://code.wireshark.org/review/3798
Petri-Dish: Graham Bloice <>...
f3dd7fe1 08/05/2014 04:42 PM Bill Meier

Fix whitespace/indentation to match editor modelines.

Change-Id: I3445ae22f10584582d465bf632942e016f5f70ca
Reviewed-on: https://code.wireshark.org/review/3452
Reviewed-by: Bill Meier <>
0734ac38 08/02/2014 07:01 AM Guy Harris

Rename buffer_ routines to ws_buffer_ to avoid name collisions.

In particular, epan/wslua/lrexlib.c has its own buffer_ routines,
causing some linker warnings on some platforms, as reported in bug
10332.

(Not to be backported to 1.12, as that would change the API and ABI of...
b4ce3525 07/03/2014 04:46 AM Guy Harris

Make --help and --version information a bit more uniform.

Have --version print the version number, the copyright information, the
"compiled with" information, the "running on/with" information, and the
compiler information.

Have --help print the version number, a one-line summary of what the...
8afe3313 07/03/2014 12:51 AM Guy Harris

More getopt_long, to add --help and --version support.

Change-Id: I946067b972a70154f02ab561bc0fd029a7a5abc4
Reviewed-on: https://code.wireshark.org/review/2791
Reviewed-by: Guy Harris <>
3773a756 06/20/2014 09:05 PM Jeff Morriss

Add command-line argument to request the version to a number of the utilities.

In some cases "-v" was already used so "-V" is the option.
Note that the version information in these utilities is much shorter than what
is presented by the big programs.

As requested by https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5804...
c6d175ef 06/03/2014 08:48 PM Michal Labedzki

Guarantee that open routines are initialized

Open routines need to be initialized before try to open
capture or add/remove routine.

Change-Id: Ic3b88eef947ebd4a3dd2edf8120bb6bd8aec0765
Reviewed-on: https://code.wireshark.org/review/1874
Reviewed-by: Evan Huus <>
d470a468 05/23/2014 07:41 PM Guy Harris

More handling of missing time stamps.

Make nstime_cmp() handle "unset" time stamps (they're equal to other
"unset" time stamps, and less than all other time stamps), use it in
reordercap, and "unset" the time stamp if it's absent.

Also, nstime_cmp() does not modify its argument, so make it const....
a344c973 05/23/2014 06:50 AM Guy Harris

Revert "Allow wtap_read() and wtap_seek_read() to return non-packet records."

This reverts commit c0c480d08c175eed4524ea9e73ec86298f468cf4.

A better way to do this is to have the record type be part of struct wtap_pkthdr; that keeps the metadata for the record together and requires fewer API changes. That is in-progress....
c0c480d0 05/22/2014 11:02 PM Guy Harris

Allow wtap_read() and wtap_seek_read() to return non-packet records.

This is the first step towards implementing the mechanisms requestd in
bug 8590; currently, we don't return any records other than packet
records from libwiretap, and just ignore non-packet records in the rest...
a1b1c8be 05/09/2014 01:21 AM Guy Harris

Revert "Refactor Wiretap"

This reverts commit 1abeb277f5e6bd27fbaebfecc8184e37ba9d008a.

This isn't building, and looks as if it requires significant work to fix.

Change-Id: I622b1bb243e353e874883a302ab419532b7601f2
Reviewed-on: https://code.wireshark.org/review/1568...
1abeb277 05/08/2014 11:04 PM Michael Mann

Refactor Wiretap

Start of refactoring Wiretap and breaking structures down into "generally useful fields for dissection" and "capture specific". Since this in intended as a "base" for Wiretap and Filetap, the "wft" prefix is used for "common" functionality....
ca9c1609 03/27/2014 05:39 PM Hadriel Kaplan

Fix bug9931 'Encapsulated ethernet packets sometimes show invalid FCS'

This fixes part-1 of bug9931: the uninitialized use of a wtap_pkthdr
struct. The second part of the bug deals with dissectors calling
the Ethernet dissector for ecnapsulated Ethernet packets but using...
d1873dbc 03/21/2014 01:51 PM Hadriel Kaplan

Fix Bug 9903: 'Clicking reload-file ignores selected file format reader'

There's a relatively new feature in 1.11.3 to select a specific file format
reader, instead of relying on magics or heuristics. If you select a file
reader and open a file, open it, and then click the reload-file button or go...
29659139 03/04/2014 09:27 AM Alexis La Goutte

Remove all $Id$ from top of file

(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <>
579e7e19 02/25/2014 12:43 PM Michal Labedzki

Wireshark: Add option to choose format type of capture file

The best heuristic can fail, so add possibility to manually choose
capture file format type, so not correctly recognize file format can be
loaded in Wireshark.

On the other side now it is possible to open capture file...
f9669809 02/07/2014 06:03 PM Gerald Combs

Replace "svn" with "git" all over the place.

Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In make-version.pl, make sure we don't set an improper upstream
branch name. Use the number of commits + short hash from `git describe`...
2f0ddb96 01/15/2014 03:36 AM Guy Harris

Fun and games with const.

svn path=/trunk/; revision=54817
9d41c658 01/02/2014 03:47 PM Guy Harris

No seek-read routines use the length argument, so eliminate it from
wtap_seek_read().

svn path=/trunk/; revision=54570
1d11745a 12/31/2013 11:23 AM Bill Meier

Add -h option (with output to stdout and exit status 0).
Add editor modelines.

svn path=/trunk/; revision=54514
38edae1c 11/09/2013 05:38 AM Jakub Zawadzki

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
853da2eb 11/08/2013 04:53 AM Guy Harris

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....
6580abbb 07/26/2013 05:49 PM Guy Harris

Give more detailed diagnostics for errors.

Actually check for errors when reading.

svn path=/trunk/; revision=50934
9df4d499 07/26/2013 05:25 PM Guy Harris

Send error messages to the standard error, and include the program name
in the error message.

svn path=/trunk/; revision=50928
6bc8d874 06/19/2013 03:31 PM Pascal Quantin

Preserve summary information when reordering a file

svn path=/trunk/; revision=50054
8c9edf12 06/15/2013 08:20 PM Guy Harris

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...
0df5a939 03/19/2013 09:18 PM Bill Meier

From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10397

svn path=/trunk/; revision=48438
6b5045dd 10/17/2012 04:28 PM Jakub Zawadzki

Fill some phdr values also when doing random read

svn path=/trunk/; revision=45619
78631020 10/16/2012 05:50 PM Jakub Zawadzki

Add wtap_pseudo_header union to wtap_pkthdr structure.
Use pkthdr instead of pseudo_header as argument for dissecting.

svn path=/trunk/; revision=45601
3f374383 10/04/2012 02:24 PM Martin Mathieson

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...
afbf3cd5 10/03/2012 02:03 PM Martin Mathieson

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
c0c2466d 09/25/2012 09:56 PM Evan Huus

Fix some signed/unsigned mismatches caught by cppcheck.

svn path=/trunk/; revision=45145
d06c9779 09/24/2012 05:42 AM Martin Mathieson

Fix count of out-of-order frames reported at end of run.

svn path=/trunk/; revision=45089
21a21a69 09/24/2012 05:21 AM Martin Mathieson

Fix for bug 7746 (from Jim Young)

Use G_GINT64_MODIFIER when REORDER_DEBUG is defined.

svn path=/trunk/; revision=45088
0aa59a3d 09/20/2012 06:36 AM Martin Mathieson

Turn off debug.

svn path=/trunk/; revision=45024
f4edf2fa 09/20/2012 06:28 AM Martin Mathieson

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