Commit graph

73 commits

Author SHA1 Message Date
Hadriel Kaplan
d1873dbcc8 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
to View->Reload or press the ctrl-R keymap, the file is reloaded but using the
magic/heuristics again instead of the file format reader you previously chose.
Likewise, the Lua relaod() function has the same issue (which is how I found
this problem).

I have tested this change by hand, using a Lua script, but I didn't add it
to the testsuite because I need another change for my test script to work
correctly. (an enhancement rather than a bug fix, which I'll submit separately)

Change-Id: I48c2d9ea443e37fd9d41be43d6b6cd5a866d5b01
Reviewed-on: https://code.wireshark.org/review/764
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-21 17:51:45 +00:00
Alexis La Goutte
296591399f 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 <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Michal Labedzki
579e7e19ce 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
as file format to be dissected.

Change-Id: I5a9f662b32ff7e042f753a92eaaa86c6e41f400a
Reviewed-on: https://code.wireshark.org/review/16
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-02-25 17:43:13 +00:00
Gerald Combs
f966980937 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`
for package names by default.

Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96
Reviewed-on: https://code.wireshark.org/review/139
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-07 23:03:03 +00:00
Guy Harris
2f0ddb96d0 Fun and games with const.
svn path=/trunk/; revision=54817
2014-01-15 08:36:09 +00:00
Guy Harris
9d41c658fe No seek-read routines use the length argument, so eliminate it from
wtap_seek_read().

svn path=/trunk/; revision=54570
2014-01-02 20:47:21 +00:00
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