Commit Graph

46182 Commits

Author SHA1 Message Date
Guy Harris 72c5985ec6 Don't use ENC_NA for integer fields longer than 1 byte; use
ENC_BIG_ENDIAN or ENC_LITTLE_ENDIAN.

Treat the AP PS Buffer State subfield of the QoS field the same way we
treat other subfields in the second byte of the QoS field - show it as
the upper 8 bits of the (shown as big-endian) QoS field.  Fix a bitmap
while we're at it.

Show the channel map as an FT_NONE - it's a structure with two bytes.

svn path=/trunk/; revision=48924
2013-04-19 08:59:45 +00:00
Jörg Mayer 171fe6de6c Small cosmetic fixes to CCX decoding
svn path=/trunk/; revision=48923
2013-04-19 05:44:41 +00:00
Guy Harris ec3d987eb9 Note that Query Server was reserved.
svn path=/trunk/; revision=48922
2013-04-19 01:37:48 +00:00
Guy Harris eb0bd03939 Add some names for reserved-but-never-implemented operations, with
references for them.

svn path=/trunk/; revision=48921
2013-04-19 01:37:24 +00:00
Michael Mann faa146f5f0 convert proto_tree_add_text "items" to proto_tree_add_item.
svn path=/trunk/; revision=48920
2013-04-19 00:09:18 +00:00
Evan Huus ca781caf07 Add overflow check to fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8464

Also add modelines.

svn path=/trunk/; revision=48919
2013-04-18 19:45:22 +00:00
Evan Huus e1f903a2b2 Fix apparent copy-paste-o that was leading to an 'unused variable' warning on
bleeding-edge GCC.

svn path=/trunk/; revision=48918
2013-04-18 19:31:24 +00:00
Guy Harris c0c15029ed Add to tvbuffs a "fragment length" field; if the tvbuff represents the
first fragment of a non-reassembled packet, and we know the length the
packet would have if it were reassembled, this field holds the length of
the fragment, and the "reported length" field shows the length the
packet would have if it were reassembled, so going past the end of the
fragment but staying within the length of the reassembled packet can be
reported as "dissection would have worked if the packet had been
reassembled" rather than "the packet is too short, so it was probably
malformed".

Add a FragmentBoundsError exception, thrown in the "dissection would
have worked if the packet had been reassembled" case.

Add a new tvb_new_subset_length_fragment() routine to create a new
subset tvb with specified fragment and reported lengths.  Use it in the
CLNP dissector.

Add some more sanity checks in the CLNP dissector.

svn path=/trunk/; revision=48917
2013-04-18 19:22:24 +00:00
Guy Harris d89d6c8314 Report bogus handshake length values with expert info. This includes
trying to handle reassembly of packets with *differing* handshake length
values a bit better.

Make coding style a little more consistent.

svn path=/trunk/; revision=48916
2013-04-18 19:19:38 +00:00
Guy Harris c35b6c5f6d Catch retransmission of FINs, so if we're doing "reassemble until end of
data stream", only the first FIN segment is reported with the
reassembled packet.

Show the TCP fragment tree *before* processing the payload, so it's
shown even if processing the payload throws an exception.

svn path=/trunk/; revision=48915
2013-04-18 19:11:05 +00:00
Guy Harris e300ddb0df Catch retransmission of FINs, so if we're doing "reassemble until end of
data stream", only the first FIN segment is reported with the
reassembled packet.

Show the TCP fragment tree *before* processing the payload, so it's
shown even if processing the payload throws an exception.

svn path=/trunk/; revision=48914
2013-04-18 19:10:23 +00:00
Guy Harris bb61c171a9 Let proto_tree_add_item() do the length checking for string lengths, so
we thrown an exception if the lengths are too long.

For UCS-2/UTF-16 strings, do an extra length check to avoid overflows,
but throw ReportedBoundsError if the check fails, so we report them the
same way we report other too-large length errors.

Just use proto_tree_add_item() to put UCS-2/UTF-16 strings (assumed to
be UTF-16, not UCS-2; is that correct?) into the protocol tree.

svn path=/trunk/; revision=48913
2013-04-18 19:07:44 +00:00
Gerald Combs cdab66760a <tt> → <code>
svn path=/trunk/; revision=48912
2013-04-18 17:10:47 +00:00
Martin Mathieson edfccaa019 Add R10 versions of LTE protocols.
svn path=/trunk/; revision=48911
2013-04-18 14:59:41 +00:00
Michael Mann 05c5740166 improve AUTH handling of SMTP dissector. Bug 8591 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8591)
From Uli Heilmeier

The current version of the SMTP dissector expects a 'AUTH LOGIN' mechanism without checking the mechanism.

When some other mechanism (like NTLM or PLAIN) is in use the decoding is wrong. Furthermore it is expected that the username is in a seperate packet. When the username is in the AUTH line the password is shown as smtp.auth.username and the username is not decoded.

svn path=/trunk/; revision=48910
2013-04-18 13:38:26 +00:00
Guy Harris c2087da0ab When we throw a reassembly error, remember the error, so that, if we
revisit this reassembly (in a multi-pass program such as Wireshark, or
TShark with -2), we'll throw the same error.

In fragment_set_tot_len(), allow the length to be set to a value that's
before the offset of existing fragments; we'll catch that later when the
reassembly completes.  This lets us handle some problems with DTLS less
confusingly.

When adding frames to an already-completed reassembly, check for
fragments that overlap existing fragments or go past the end of the
reassembly, and report errors.

When completing a reassembly, make the buffer for the reassembled data
big enough to contain the specified data length for the reassembly, even
if that's less than the offset + length of the last fragment.  Flag all
fragments that go past that length as "too long", and only copy out what
part of them fits, if any.  That lets us flag the correct fragment or
fragments as being "too long".

When adding fragments, do some additional checks, even if we're not
doing the first pass through the packets, so errors that show up in the
first pass also show up on subsequent passes.

svn path=/trunk/; revision=48909
2013-04-18 02:31:45 +00:00
Guy Harris 6bfd0bb9d5 See whether we can whitelist 'GPL (v3 or later)' for the output of Bison
run on wiretap/ascend.y.

svn path=/trunk/; revision=48908
2013-04-18 02:06:53 +00:00
Guy Harris 4b34417a5e Fix FSF address.
svn path=/trunk/; revision=48907
2013-04-18 02:04:18 +00:00
Gerald Combs 05cb9ac17c Convert a couple of Docbook-style "href"s to "a href"s.
svn path=/trunk/; revision=48906
2013-04-18 00:05:54 +00:00
Gerald Combs 594aa110aa Remove some no-longer-relevant content.
svn path=/trunk/; revision=48905
2013-04-17 23:34:31 +00:00
Evan Huus 59b8822170 Follow-up to r48899 - don't include svnversion.h now that we don't
need it, since that's actually what's causing the rebuilds.

svn path=/trunk/; revision=48904
2013-04-17 19:56:56 +00:00
Evan Huus cba2efe285 Remove an unused variable, structure and #define caught by cppcheck.
Also fixes a small memory leak.

svn path=/trunk/; revision=48903
2013-04-17 19:52:20 +00:00
Alexis La Goutte 101489f386 Use also const char to uat_save (identical to uat_load)
svn path=/trunk/; revision=48902
2013-04-17 19:39:11 +00:00
Alexis La Goutte f9dce307d8 Fix the following GTK-CRITICAL error Gtk-CRITICAL **: gtk_list_store_get_path: assertion `iter->stamp == GTK_LIST_STORE (tree_model)->stamp' failed
Problem come from no item in list (and impossible to select the first item...)

svn path=/trunk/; revision=48901
2013-04-17 19:38:50 +00:00
Alexis La Goutte 1093faf643 From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8446 Wifi details are not stored in the Decryption Key Management dialog (post 1.8.x)
If there is not 80211_keys file, using Decryption Management Key don't create the file and keys is not saved.

From me:
Use a err2 variable to avoid to break API/ABI when backport to 1.8

svn path=/trunk/; revision=48900
2013-04-17 19:38:34 +00:00
Alexis La Goutte 0ef40a6145 Don't display the SVN Version in SSL Logs (only Wireshark VERSION) (and avoid to rebuild and relinkg libwireshark when the svn revision changes...)
svn path=/trunk/; revision=48899
2013-04-17 19:38:07 +00:00
Alexis La Goutte c1b61506d9 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48898
2013-04-17 19:37:44 +00:00
Alexis La Goutte a376f3b5d1 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48897
2013-04-17 19:36:49 +00:00
Evan Huus d385db2133 Remove chromium-specific license exceptions which it makes no sense for
us to carry.

Add an exception of our own for tools/pidl since that is GPL but the headers
are not in a format that licensecheck will pick up, and fixing them all would
just introduce a delta with upstream for no reason.

svn path=/trunk/; revision=48896
2013-04-17 19:35:43 +00:00
Gerald Combs b25fa89125 Reverse the arguments we feed to valgrind-wireshark.sh. Add debugging
output.

svn path=/trunk/; revision=48895
2013-04-17 17:23:41 +00:00
Evan Huus b2f0991616 Catch overflow condition in mysql dissector.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8458

Also add modelines.

svn path=/trunk/; revision=48894
2013-04-17 15:38:35 +00:00
Evan Huus b13e702709 Cast scrolling values to gdoubles, not gfloats - GtkAdjustment have
always taken doubles that I've been able to find, and casting to floats
causes loss of precision and weird bugs when the values get enormous.

Should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8460

svn path=/trunk/; revision=48893
2013-04-17 15:07:48 +00:00
Guy Harris 51b56bfebc Update FSF address.
svn path=/trunk/; revision=48892
2013-04-17 01:44:00 +00:00
Guy Harris fb0701f40e Fix more typos that broke the license checker (these might have been
created by taking packet-dvb-eit.c, doing a global search and replace of
"ei" with the new name, and then doing further editing).

svn path=/trunk/; revision=48891
2013-04-17 01:40:25 +00:00
Guy Harris f1cd6b131d Fix typo that caused this to fail the license check.
svn path=/trunk/; revision=48890
2013-04-17 01:36:07 +00:00
Evan Huus 82ad8cdf19 Change offset to be 8, based on an educated guess from looking at the
code around line 777.

Fixes the last open issue in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7260

svn path=/trunk/; revision=48889
2013-04-16 21:57:36 +00:00
Evan Huus 0c8abacbec Fix a minor memory leak caught by cppcheck. Also replace a whole bunch of
"This shouldn't happen" fallback strings with a single assertion.

svn path=/trunk/; revision=48888
2013-04-16 21:20:57 +00:00
Michael Mann 8e2c1312d8 dissect CIP-Safety application reply data
svn path=/trunk/; revision=48887
2013-04-16 21:16:41 +00:00
Martin Kaiser d7bb57a5ef remove unused structs and defines
(the unnamed union caused a compiler warning on fedora 14)

svn path=/trunk/; revision=48886
2013-04-16 20:53:24 +00:00
Anders Broman af2cda1cc3 Introduce a dissector table for vendor extensions.
svn path=/trunk/; revision=48885
2013-04-16 18:13:40 +00:00
Anders Broman e1f2565570 Change name on a define.
svn path=/trunk/; revision=48884
2013-04-16 18:12:56 +00:00
Anders Broman 91f44b2940 Update USR Robotics and 3GPP2 dictionarys.
svn path=/trunk/; revision=48883
2013-04-16 18:12:23 +00:00
Evan Huus f8f078744b Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8583
IO graph was misbehaving if the packets covered too much real time.
It's still ungodly slow, but at least it seems to work.

svn path=/trunk/; revision=48882
2013-04-16 16:16:15 +00:00
Evan Huus 10b150f49c Re-add format argument that appears to have been accidentally
dropped in r48880.

svn path=/trunk/; revision=48881
2013-04-16 15:30:59 +00:00
Irene Rüngeler 65043453b9 Update interface list when interface get lost and come back.
svn path=/trunk/; revision=48880
2013-04-16 15:12:38 +00:00
Evan Huus 80350136f0 Dead assignment caught by cppcheck.
svn path=/trunk/; revision=48879
2013-04-16 14:15:33 +00:00
Jeff Morriss 5c85df8a93 Add packet-PROTOABBREV.c to source distribution. Reorder some entries.
svn path=/trunk/; revision=48878
2013-04-16 13:57:06 +00:00
Evan Huus 4008d3e544 From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8587
Fix openSafety reassembly and dissection when the first package has
a payload length of 0.

svn path=/trunk/; revision=48877
2013-04-16 13:44:15 +00:00
Michael Mann c3780c2e8d Fix compiler errors on Linux.
svn path=/trunk/; revision=48876
2013-04-16 13:17:45 +00:00
Evan Huus 494fe3e943 From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8588
Add casts to that idl2wrs compiles with -Wc++-compat

svn path=/trunk/; revision=48875
2013-04-16 12:48:27 +00:00