Commit Graph

10982 Commits

Author SHA1 Message Date
Guy Harris 8d35834342 Fix (legitimate) warning.
svn path=/trunk/; revision=35382
2011-01-05 17:38:03 +00:00
Jeff Morriss b14b09ac79 Use proto_tree_add_item() to add some FT_BYTES to the tree instead of calling proto_tree_add_bytes() with the result of tvb_get_ptr() passed as the 'value'.
svn path=/trunk/; revision=35381
2011-01-05 17:28:17 +00:00
Guy Harris 216fed8397 From Steve Huston: add support for AMQP 0-10.
From me: add 0_9 to names for #defines and routines for 0-9, add expert
info for the "you ran past the end of the field table" error.

svn path=/trunk/; revision=35380
2011-01-05 17:19:48 +00:00
Jeff Morriss 88da4576cc Don't pass the result of tvb_get_ptr() into a %s format string: the string may
not be NULL terminated.  Use tvb_get_ephemeral_string() instead.

svn path=/trunk/; revision=35379
2011-01-05 17:16:29 +00:00
Anders Broman 660d827706 Enhance IE dissection.
svn path=/trunk/; revision=35378
2011-01-05 16:46:40 +00:00
Jeff Morriss ae4ef9853c Don't pass the result of tvb_get_ptr() into a %s format string: the string may
not be NULL terminated.  Use tvb_get_ephemeral_string() instead.

svn path=/trunk/; revision=35377
2011-01-05 15:23:53 +00:00
Jeff Morriss 5efa40982a Don't pass the result of tvb_get_ptr() into a %s format string: the string may
not be NULL terminated.  Use tvb_get_ephemeral_string() instead.

svn path=/trunk/; revision=35376
2011-01-05 15:18:54 +00:00
Jeff Morriss d74bd3ce42 Don't pass the result of tvb_get_ptr() into a %s format string: the string may
not be NULL terminated.  Use tvb_get_ephemeral_string() instead.

svn path=/trunk/; revision=35375
2011-01-05 15:11:32 +00:00
Martin Mathieson d8506bbfed Remove a stray debug printf().
svn path=/trunk/; revision=35374
2011-01-05 14:45:31 +00:00
Anders Broman 53cc4d7ea9 From Francesco Fondelli:
RSVP: support for Vendor Private objects, RFC 3936
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5468

svn path=/trunk/; revision=35370
2011-01-05 07:16:09 +00:00
Guy Harris eaad8c00f2 Put end-of-field-table checks back into dissect_amqp_field_table().
svn path=/trunk/; revision=35369
2011-01-05 06:11:10 +00:00
Jeff Morriss d298b79628 Use reported length (instead of the captured length) when dissecting error
causes (should have been in rev 35366).

When generating TVB subsets, limit the subset's backing and reported lengths to
the (captured) TVB length and the reported TVB length, respectively.

This allows us to dissect most of the packet in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5546
before asserting out.

It also yields similar better behavior when the capture is limited by a
snapshot length.

svn path=/trunk/; revision=35368
2011-01-05 03:40:02 +00:00
Stephen Fisher bc2bd6dcc5 Reverse r34810 other than the comment because the re-ordering of dns_types[]
caused the numbering to no longer be lined up so the "SRV" record (#33) type
T_SRV was being given the description "EID" instead of "Service Location"


svn path=/trunk/; revision=35367
2011-01-05 00:48:40 +00:00
Jeff Morriss 25485e9b3e When generating a tvb subset for chunks, parameters, and error causes, set the:
- "reported length" to be minimum of the entity's length (taken from the
   packet) or the reported length of the TVB.
 - "backing length" to be the minimum of the reported length (above) or the
   (captured) length of the TVB.

This prevents tvb_new_subset() from generating an exception if the entity's
length (in the packet) is bogus (bigger than what's in the TVB) which allows
dissection to continue to a point where we can show the user what the problem
is.

When dissecting chunks, add an expert info if the item's length is bigger than
what was on the wire (the reported length).  (The same could also be done for
parameters and error causes.)

This makes captures like that in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5546
easier to understand.

It also starts getting this dissector using the reported length instead of the
(captured) TVB length (there's more to be done with other tvb subsets).

svn path=/trunk/; revision=35366
2011-01-04 23:07:32 +00:00
Jeff Morriss f94b75c658 Give a couple of fields abbreviations.
svn path=/trunk/; revision=35362
2011-01-04 18:41:25 +00:00
Anders Broman 95397594c9 Maeke use of dissect_e212_mcc_mnc_ep_str().
svn path=/trunk/; revision=35361
2011-01-04 16:58:55 +00:00
Anders Broman 022b418e40 Introduce dissect_e212_mcc_mnc_ep_str()
Which can be useful to make nice lables like:
+ Serving Network : MCC 311 United States of America, MNC 28

svn path=/trunk/; revision=35360
2011-01-04 16:58:07 +00:00
Jeff Morriss 5d7f70bf41 From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5544 :
Include the packet-ipv6.h changes too.

svn path=/trunk/; revision=35359
2011-01-04 15:39:12 +00:00
Anders Broman 52264efdfe Fix build.
svn path=/trunk/; revision=35358
2011-01-04 08:45:03 +00:00
Guy Harris 57f521fa1a Don't use DISSECTOR_ASSERT() to catch malformed packets. Fixes bug
4048.

svn path=/trunk/; revision=35357
2011-01-04 08:04:27 +00:00
Guy Harris 6b38961a95 Instead of going over the Report segment twice, once to get the fields
in the segment and once to put them into the protocol tree, just do it
once.  That also means we don't need to allocate an array for all the
reception claims, so we don't have to worry about the claim count (other
than making sure it's non-negative), and that we won't abort the
dissection until we run past the end of the packet.

(The rest of the dissector should be changed to work that way as well.)

svn path=/trunk/; revision=35356
2011-01-04 07:48:28 +00:00
Jaap Keuter b9f7ef1bb2 From Alexis La Goutte:
A Patch to enchance the ICMPv6 Router Renumbering for IPv6 (RFC 2894) Dissector
- Make RR field filterable 
- Add RR Result Message
- ...

svn path=/trunk/; revision=35355
2011-01-04 07:44:39 +00:00
Anders Broman 9eb2d42bac Add more info to the tree.
svn path=/trunk/; revision=35354
2011-01-04 07:14:11 +00:00
Anders Broman da59924551 Prettify dissection of User Location Info (ULI). (Complete)
svn path=/trunk/; revision=35352
2011-01-03 23:21:49 +00:00
Anders Broman 5045d66232 Prettify dissection of User Location Info (ULI).
svn path=/trunk/; revision=35351
2011-01-03 22:13:11 +00:00
Jaap Keuter b9b7d51226 From Hadar Shoham:
Add support to EuroCableLabs at bootp opt 60 sub 23.
according to PKT-SP-PROV1.5-I04-090624, paragraph 10.23 Device MIB Support:
type 2 is indicating EuroCableLabs.

svn path=/trunk/; revision=35350
2011-01-03 21:40:03 +00:00
Stephen Fisher 18948c2843 Remove the other use of tvb_fake_unicode() from the DCE/RPC dissector and
replace it with tvb_get_unicode_string().


svn path=/trunk/; revision=35348
2011-01-03 19:28:52 +00:00
Jeff Morriss d1df0f9130 Fix (or at least quiet Valgrind about) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5542 :
Always initialize *all* the outputs of get_sdp_type().

svn path=/trunk/; revision=35347
2011-01-03 18:48:29 +00:00
Stephen Fisher 1acf19f7eb Switch one of the places in the DCERPC dissector from using
tvb_fake_unicode() to tvb_get_unicode_string().


svn path=/trunk/; revision=35346
2011-01-03 18:33:58 +00:00
Jeff Morriss 2250767f8a Partially fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5542 :
Fix one of the "Conditional jump or move depends on uninitialised value(s)"
errors from Valgrind: always initialize *val in get_sdp_type().

svn path=/trunk/; revision=35343
2011-01-03 17:55:23 +00:00
Jeff Morriss e80012653f Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5537 :
Don't go modifying the bitstring if its length is 0 (meaning that there is only
the NULL terminator).

svn path=/trunk/; revision=35342
2011-01-03 17:37:41 +00:00
Anders Broman 24550de720 Mark unused parameters as such.
svn path=/trunk/; revision=35341
2011-01-03 17:32:15 +00:00
Anders Broman 288d47d1f2 Mark unused parameters as such.
svn path=/trunk/; revision=35340
2011-01-03 17:30:35 +00:00
Anders Broman 56c1d1569c Comment out a faulty line.
svn path=/trunk/; revision=35339
2011-01-03 17:26:12 +00:00
Anders Broman 9794ffb051 Enhance IE dissection and a number of bug fixes.
svn path=/trunk/; revision=35338
2011-01-03 17:22:02 +00:00
Guy Harris f780211ade Put the query list items under the top-level query list item (which
should've been done in the previous checkin).

Display the "request type" field in a Read Partition request correctly
(only the upper 2 bits matter, and they're an enumerated value).

svn path=/trunk/; revision=35336
2011-01-03 08:31:45 +00:00
Guy Harris 9c94a0e7f1 If we have no value to dissect, because the AVP has the wrong length for
the value's type, return NULL as the label, rather than returning an
uninitialized value as the label.

svn path=/trunk/; revision=35335
2011-01-03 08:21:35 +00:00
Guy Harris cff9f14959 Do length checking for Integer32, Integer64, Unsigned64, Float32, and
Float64, as well as for Unsigned32.

svn path=/trunk/; revision=35332
2011-01-03 03:30:20 +00:00
Guy Harris d049046268 Note that this is ultimately not necessarily the right fix.
svn path=/trunk/; revision=35331
2011-01-02 21:49:00 +00:00
Guy Harris 8d7d050e9e For those cases where we interpret the contents of an OCTET STRING,
which could be of arbitrary length - even if it's not supposed to be! -
as a value of some other type, by adding them as a registered field,
first check to make sure the length of the field is appropriate for the
type and, if not, show a dissection error, rather than showing a
dissector-bug assertion when we call proto_tree_add_item().

This fixes a bunch of dissector-bug assertions that show up with
malformed BER-encoded packets.

Also, fix a typo, and expand a comment.

svn path=/trunk/; revision=35330
2011-01-02 21:27:57 +00:00
Kovarththanan Rajaratnam b7e68a0817 Add missing packet-btsdp.h
svn path=/trunk/; revision=35324
2011-01-02 08:29:33 +00:00
Kovarththanan Rajaratnam 46dd093b94 From Allan M. Madsen via. bug 5445:
Bluetooth profiles and protocols above RFCOMM and L2CAP can not be dissected correctly because the required information (server channel and dynamic PSM value mappings to services/profiles) about the type of data carried in the payload is not available. RFCOMM is currently hardcoded to handoff all payload data to the obex dissector though it may carry e.g. handsfree, dial-up networking or serial port profile related data.

The patch consists of modifcations to the following dissectors:

btsdp: Extraction of RFCOMM server channel and L2CAP dynamic PSM with service mapping is provided to RFCOMM and L2CAP through a tap interface. In addition, the packet list info is beautyfied and extended with more details for better
overview.

btl2cap: Adds a new dissector table with services and dynamic PSM mapping which is filled by a tap listner catching the info from btsdp. More info added to packet list.

btrfcomm: Adds a new dissector table with services and server channel mapping which is filled by a tap listner catching the info from btsdp. Dissectors for handsfree, dial-up netorking and serial port profiles (all based on RFCOMM) are also added.

btobex: Registers several obex based profiles (e.g. obex push, file transfer, basic printing etc.) in both RFCOMM and L2CAP. Some cleanup.


svn path=/trunk/; revision=35323
2011-01-02 08:13:40 +00:00
Guy Harris b3ea7f6771 Update some URLs, add another spec.
At least for one of the DOCSIS suboptions, do length checking.

svn path=/trunk/; revision=35320
2010-12-31 23:30:38 +00:00
Guy Harris 0841456fd7 A Query List has more than one has multiple QCODEs; you cannot handle
that by doing the entire list as a single FT_UINT8 field, you must
handle each QCODE, in a loop, as that field.

svn path=/trunk/; revision=35319
2010-12-31 22:28:57 +00:00
Gerald Combs b3a56f1691 From FRAsse via bug 5539:
There's a buffer overflow in ENTTEC DMX Data RLE, leading to crashes and
potential code execution.

From me: ep_allocate our buffers.

svn path=/trunk/; revision=35318
2010-12-31 22:24:06 +00:00
Chris Maynard 2cd8459ddb From Jakub Zawadzki via bug 4753: New dissector: JSON, w/minor changes by me:
1) Add links to RFC 4627 and the json.org web site.
2) Comment out hf_json_member_key to keep tools/checkhf.pl happy.
3) Avoid duplicate (application/json) from being displayed in Info column.

svn path=/trunk/; revision=35317
2010-12-31 18:03:23 +00:00
Martin Mathieson fa74c2694c Add current list of ROHC profile names, taken from:
http://www.iana.org/assignments/rohc-pro-ids/rohc-pro-ids.txt

As raised by bug 5536, we now at least show which profile is present.
Supporting all of the specific message types is another matter...

svn path=/trunk/; revision=35314
2010-12-31 00:24:50 +00:00
Guy Harris 4b057e1071 It's not a good idea to use tcph->th_seglen if you haven't set it.
Fixes bug 4211.

svn path=/trunk/; revision=35313
2010-12-31 00:02:54 +00:00
Stig Bjørlykke 011e451449 Only chop the last character (new line) from the error message.
svn path=/trunk/; revision=35310
2010-12-30 20:15:55 +00:00
Gerald Combs cc02a10ef8 Fix checkAPI.
svn path=/trunk/; revision=35309
2010-12-30 19:52:24 +00:00