Commit graph

35416 commits

Author SHA1 Message Date
Guy Harris
306711b634 Note what NetMon 3 actually uses various types for.
For the ones that are used for raw IP, use WTAP_ENCAP_RAW_IP.  (Yes,
NetMon checks for v4 vs. v6 for all of them.)

svn path=/trunk/; revision=36975
2011-05-03 09:14:56 +00:00
Guy Harris
99c6704109 Set the pseudo-header regardless of whether we have a trailer or not.
svn path=/trunk/; revision=36974
2011-05-03 08:49:41 +00:00
Guy Harris
59dc3f3141 It appears that, in NetMon 802.11 captures, management frames have an
FCS and data frames don't have an FCS; I don't know about control
frames.

svn path=/trunk/; revision=36973
2011-05-03 08:22:25 +00:00
Guy Harris
3c06dfc751 Squelch a compiler warning - but note, in a comment, a real problem the
warning points out.

svn path=/trunk/; revision=36972
2011-05-03 05:50:30 +00:00
Guy Harris
491fe27a20 Fix indentation (tab stops are not guaranteed to be every 4 spaces).
svn path=/trunk/; revision=36971
2011-05-03 05:28:39 +00:00
Guy Harris
c0dc916adc From Tom Brezinski - fix for bug 5869:
This patch incorporates the following fixes from the patch attached to
bug 5671 with changes as noted below:

1.) Files where the packet header and packet data are noncontiguous are
handled improperly, resulting in read misalignment and ultimately the
error message, "Observer: bad record: Invalid magic number 0xXXXXXXXX."
This bug is caused by not obeying the packet_entry_header.offset_to_frame
field.

2.) Daylight savings time is not properly accounted for in files using
local time encoding.

3.) As of Observer/GigaStor v13.10 (bug 5671 incorrectly stated v14),
timestamps in the file format changed from local time encoding to GMT
encoding.  Wiretap has been changed to support reading both formats. 
Patch submitted with bug 5671 added a separate file type to allow
writing local format.  This patch does not add the separate file type
and always writes GMT.

4.) The wtap_dumper.bytes_dumped field is not being properly incremented
as data is written to files.

This patch also incorporates the following additional enhancements /
fixes not in bug 5671:

1.) Support for reading BFR files which contain Fibre Channel captures. 
Test file Fibre_Channel_Capture.bfr attached.

2.) Support for modified file header used in upcoming v15.  New header
file format takes an unused byte from the version string to allow for a
larger offset to the first packet to be specified.  Test file
V15_Lrg_Hdr_Test.bfr is attached, it is also a fuzz test as the number
of TLV items given in the header is less then the actual.

3.) It was found that if the number of TLV items given in the header was
larger then present it would fail to open the file.  Test file
V9_Num_TLVs_Too_Big.bfr is attached.

svn path=/trunk/; revision=36970
2011-05-03 05:26:10 +00:00
Guy Harris
7eb4723184 Don't bother checking for gzgets(), as we don't use it, and don't even
need to use its presence in zlib as a proxy for "not the crufty old zlib
that comes with some versions of X11".

Do, however, check for inflatePrime() there, instead, just in case the
crufty old zlib that comes with some versions of X11 lack it; this is to
prevent the configure script from assuming a shiny new zlib by testing
with a non-X11 program, causing the build to fail when you build
Wireshark.

svn path=/trunk/; revision=36969
2011-05-03 04:48:02 +00:00
Guy Harris
89b6793472 One bit suffices for the "columnized" and "colorized" flags in the
packet list store, and there's one PacketListRecord for every packet, so
that can save some space...

...especially if we move them after all the pointers, rather than before
the pointers, so they don't collectively take up 8 bytes on an LP64 or
LLP64 platform due to pointers having to be 8-byte aligned.

svn path=/trunk/; revision=36968
2011-05-03 02:03:25 +00:00
Guy Harris
b42fab3a61 TShark doesn't need column text attached to each frame; move col_text
and col_text_len from the frame_data structure to the PacketRecord
structure.

svn path=/trunk/; revision=36967
2011-05-03 01:19:55 +00:00
Guy Harris
11565cd070 Fix a comment.
svn path=/trunk/; revision=36966
2011-05-03 00:22:35 +00:00
Stephen Fisher
5c5e9a377a From Peter Paluch via bug #5877: EIGRP dissector enhancement for RS/EOT
flags

Me: Add Peter to AUTHORS file.


svn path=/trunk/; revision=36965
2011-05-02 16:40:19 +00:00
Jeff Morriss
60cefeae89 Fix the (fuzzed) memory allocation failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5880 :
Don't attempt to reassemble a message if the length of the fragment is negative.

svn path=/trunk/; revision=36964
2011-05-02 14:27:48 +00:00
Stig Bjørlykke
c92938bbc0 Support content-type x-gzip and x-deflate, as described in RFC2616 as
equivalent to gzip and deflate.

This fixes bug 5882.

svn path=/trunk/; revision=36963
2011-05-02 14:06:33 +00:00
Bill Meier
61bc175a82 For "per packet" file encapsulation, display a list of the encapsulations seen ("long form" report).
Example:
 File type:           Microsoft NetMon 2.x
 File encapsulation:  Per packet
                        IEEE 802.11 plus Network Monitor radio header


ToDo: For the tabular form report display the list of per-packet encapsulations seen.


svn path=/trunk/; revision=36962
2011-05-02 02:06:52 +00:00
Gerald Combs
2903639c52 [Automatic manuf, services and enterprise-numbers update for 2011-05-01]
svn path=/trunk/; revision=36959
2011-05-01 15:03:48 +00:00
Gerald Combs
b97275395f Check our PDU length. Fixes the infinite loop found in bug 5876.
svn path=/trunk/; revision=36958
2011-04-30 17:43:05 +00:00
Anders Broman
48abbd7f6c Use correct signature on callbacks.
svn path=/trunk/; revision=36957
2011-04-30 08:36:00 +00:00
Jeff Morriss
be240d1de6 Oops, the Windows HAVE_GZCLEARERR stuff did work; take out the rest.
svn path=/trunk/; revision=36956
2011-04-29 18:30:16 +00:00
Jeff Morriss
b9b68170f0 Don't check for the existence of gzclearerr() any more.
Check for inflatePrime().

svn path=/trunk/; revision=36955
2011-04-29 18:29:26 +00:00
Jeff Morriss
6ff4737f44 On Windows: don't (try but fail--the code did not work) to define
HAVE_GZLCEARERR.  Define HAVE_INFLATEPRIME if we HAVE_LIBZ.

svn path=/trunk/; revision=36954
2011-04-29 17:30:23 +00:00
Bill Meier
5505ef78ee Add "Wireshark ... Copyright ...".
svn path=/trunk/; revision=36953
2011-04-29 14:56:40 +00:00
Bill Meier
23dbbb64e0 #include <epan/prefs.h> not req'd since there are no prefs.
svn path=/trunk/; revision=36952
2011-04-29 14:50:13 +00:00
Bill Meier
b8455a821b Remove two unneeded forward declarations.
svn path=/trunk/; revision=36951
2011-04-29 14:05:55 +00:00
Bill Meier
5776679ddd Reformat long lines in hf[] definition for readability;
Replace hf[] "blurbs" by NULLs since the text of the blurb more or less matches the label text.

svn path=/trunk/; revision=36950
2011-04-29 14:02:55 +00:00
Jakub Zawadzki
229adbc1e5 configure: remove test for gzclearerr (not used anymore), add test for inflatePrime.
svn path=/trunk/; revision=36949
2011-04-29 07:49:55 +00:00
Stig Bjørlykke
6be87f6f90 Untabify
svn path=/trunk/; revision=36948
2011-04-29 06:55:49 +00:00
Stig Bjørlykke
65910b2479 From Edwin Groothuis via bug 5870:
The supplied patch adds a new option -O, which specifies a list of protocols
(names can be found with the "-G protocols" option) to be fully decoded while
the others only show the layer header.

svn path=/trunk/; revision=36947
2011-04-29 06:53:29 +00:00
Jeff Morriss
664c69dbaa Use proto_tree_add_item() when it saves us from having to retrieve the value
and without causing us to potentially run into bug 3834.

Add a couple hf entries for things that had been added with add_text().

svn path=/trunk/; revision=36946
2011-04-29 02:16:13 +00:00
Jeff Morriss
6b13963a63 If we're in a message return (UDTS or XUDTS), set pinfo->in_error_pkt to help
make it obvious to the user that this is an error message.

Fix up some indentation.

svn path=/trunk/; revision=36945
2011-04-29 01:45:34 +00:00
Jeff Morriss
53e5c3422c Add default color filters for SCTP abort messages and checksum errors.
svn path=/trunk/; revision=36944
2011-04-29 01:28:28 +00:00
Anders Broman
e0c80c4138 From Pascal Quantin:
the dissection of the UE capabilities when the RAT
type is set to geran-cs (the value part of Classmark 2 starts at the third byte). 
Moreover it adds a subtree to enhance the display of Mobile Station Classmark 2 and 3 and MS Radio Access Capability IEs.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5867

svn path=/trunk/; revision=36943
2011-04-28 19:59:14 +00:00
Guy Harris
94afa45fbf Array indices are integers, not Booleans. (The code is the same, given
that TRUE is #defined as 1 and FALSE is #defined as 0, but let's not
depend on that.)

svn path=/trunk/; revision=36942
2011-04-28 19:00:28 +00:00
Bill Meier
597f4b28bb Remove an XXX comment;
svn path=/trunk/; revision=36941
2011-04-28 18:18:30 +00:00
Bill Meier
c22cde8de5 External subdissectors should be called regardless of 'if(tree)'.
svn path=/trunk/; revision=36940
2011-04-28 18:01:38 +00:00
Bill Meier
60c04b1d84 Add missing $Id$ and "Wireshark ... Copyright ..."
svn path=/trunk/; revision=36939
2011-04-28 15:52:32 +00:00
Bill Meier
3fe0a82016 Remove an unneeded forward declaration (fixes compiler error);
Move a global variable to be local to proto_reg-handoff...

svn path=/trunk/; revision=36938
2011-04-28 15:18:54 +00:00
Bill Meier
18e5081475 Add missing "Wireshark .... Copyright ..".
svn path=/trunk/; revision=36937
2011-04-28 14:59:31 +00:00
Bill Meier
a1b99c7218 Convert what appears to be the use of "4 space tabs" to spaces.
svn path=/trunk/; revision=36936
2011-04-28 14:48:39 +00:00
Bill Meier
8f0f8a5435 #include <stdio.h> not req'd;
Define all internal fcns as static;
fragment_table_init() & reassembled_table_init() need to be
  called form a registered_init fcn;
proto_register... and proto_reg_handoff should be at the end of the file as
  per Wireshark convention;
proto_reg_handoff .... doesn't need 'if (initialized)...';
proto_register... doesn't need 'if (proto_mux27010 == -1)...'

svn path=/trunk/; revision=36935
2011-04-28 14:38:29 +00:00
Anders Broman
1648ab23e9 Minor updates.
svn path=/trunk/; revision=36934
2011-04-28 14:22:18 +00:00
Anders Broman
20b894a9d2 Add grouped AVP:s
svn path=/trunk/; revision=36933
2011-04-28 13:43:23 +00:00
Jeff Morriss
e84589d205 Add SVN Id tag. Don't use deprecated dissector_add().
svn path=/trunk/; revision=36932
2011-04-28 13:14:36 +00:00
Jakub Zawadzki
6aa7c2d371 Try to fix:
value_string.c(175) : warning C4244: '=' : conversion from '__int64' to 'gint', possible loss of data

svn path=/trunk/; revision=36931
2011-04-28 11:53:29 +00:00
Jakub Zawadzki
1ea1e9fef2 Change value_string_ext->_vs_match to return value_string struct (instead of strptr),
Now index can be easily calculated so remove idx pointer from all match functions.

Just in case change names if someone is using wireshark internals.

svn path=/trunk/; revision=36930
2011-04-28 11:15:46 +00:00
Stig Bjørlykke
de18d83f61 Initialize if_device to NULL at start and when g_free.
This fixes a bug introduced in revision 36741.

svn path=/trunk/; revision=36929
2011-04-28 08:48:35 +00:00
Stig Bjørlykke
42f8e1fa5a Removed unused variables and functions.
Terminate strings by setting the first char to 0.

svn path=/trunk/; revision=36928
2011-04-28 06:39:56 +00:00
Anders Broman
a663d91ca6 From Hans-Christoph Schemmel:
A variant of 3GPP TS 27.010 multiplexing protocol dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5829

svn path=/trunk/; revision=36927
2011-04-28 05:36:26 +00:00
Anders Broman
c752fb8b87 Fix warnings:
packet-radiotap.c(240) : error C2220: warning treated as error - no 'object' file generated
packet-radiotap.c(240) : warning C4305: 'initializing' : truncation from 'double' to 'const float'
packet-radiotap.c(310) : warning C4305: 'initializing' : truncation from 'double' to 'const float'
packet-radiotap.c(315) : warning C4305: 'initializing' : truncation from 'double' to 'const float'
packet-radiotap.c(370) : warning C4305: 'initializing' : truncation from 'double' to 'const float'
packet-radiotap.c(380) : warning C4305: 'initializing' : truncation from 'double' to 'const float'

svn path=/trunk/; revision=36926
2011-04-28 05:11:53 +00:00
Jeff Morriss
1722bec6e7 From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5786 :
This patch registers a dissector table to allow other dissectors to register as
subdissectors for modbus/tcp data.

Additionally it registers the dissector, so it can be invoked by another
dissector by name.

Additionally this version of the patch adds the Data field not as a text field,
but rather as a field which can be selected and tested for by name.

svn path=/trunk/; revision=36925
2011-04-28 03:01:54 +00:00
Jeff Morriss
ed8ea7bb34 After testing for the presence of python-config, fix typo so that we actually
test whether we found it or not.

If the user asked for Python support, error out if we find we can't use it.

svn path=/trunk/; revision=36924
2011-04-28 02:24:46 +00:00