Commit Graph

11237 Commits

Author SHA1 Message Date
Jaap Keuter 1ea96b1e30 From Slava K:
FCoIB – Fibre Channel over InfiniBand. The protocol enables transmission of
Fibre Channel frames over InfiniBand networks. It is based on encapsulation of
Fibre Channel frames over InfiniBand UD transport. The discovery protocol is
based on the FIP protocol (not supported by this patch).

This patch adds an FCoIB dissector to Wireshark. It is based in large part on
the existing FCoE dissection code.

This code is submitted on behalf of Mellanox Technologies Ltd.

svn path=/trunk/; revision=35475
2011-01-11 08:22:16 +00:00
Ronnie Sahlberg 3079c9c931 From Matthieu Patou <mat@samba.org>
Dissect LDAP DirSyncFlags to show the bits of this bitmap.



svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
Ronnie Sahlberg 27f36858fd Add a missing procedure name for NFS-ACL
svn path=/trunk/; revision=35466
2011-01-10 22:31:05 +00:00
Stephen Fisher fe06217c35 Stop gcc warning about type-punned pointer breaks strict anti-aliasing
rules.  (Is this the right fix?  I had to remove a now meaningless
comparison of psm > 0x1000 (4096) since psm is now a guint8 not a guint16.)


svn path=/trunk/; revision=35463
2011-01-10 21:23:25 +00:00
Gerald Combs 1b4d847a90 Add 2869 to the list of HTTP ports: http://support.microsoft.com/kb/886257
svn path=/trunk/; revision=35461
2011-01-10 20:23:21 +00:00
Anders Broman 096e3737bc Add an expert item about not dissected IE's
svn path=/trunk/; revision=35460
2011-01-10 19:48:15 +00:00
Anders Broman 275c3c8818 Shorten long winded strings.
svn path=/trunk/; revision=35456
2011-01-10 17:34:00 +00:00
Bill Meier e0424dde5d Move some DISSECTOR_SRC & DISSECTOR_INCLUDES entries so they are (more or less) in alpha order.
svn path=/trunk/; revision=35454
2011-01-10 15:19:18 +00:00
Jeff Morriss 03c7b7093e Give a couple commented-out hf's abbreviations (to keep checkAPIs happy).
svn path=/trunk/; revision=35452
2011-01-10 14:40:10 +00:00
Anders Broman b321c5d5ea Add application/vnd.3gpp.cw+xml
svn path=/trunk/; revision=35450
2011-01-10 12:28:56 +00:00
Jaap Keuter a1ea8ad71b Clean up the blurbs indicated by checkAPIs.
svn path=/trunk/; revision=35449
2011-01-10 07:39:15 +00:00
Jeff Morriss dc22fbfc50 Give CSID an abbreviation.
svn path=/trunk/; revision=35446
2011-01-10 03:02:43 +00:00
Jaap Keuter 65ca06b9c6 Make comment a real comment, trying to fix the buildbot.
svn path=/trunk/; revision=35445
2011-01-09 22:34:20 +00:00
Anders Broman b9eddc7117 Update value_strings
svn path=/trunk/; revision=35442
2011-01-09 20:41:19 +00:00
Anders Broman 589d38b8f4 More field related fixes.
svn path=/trunk/; revision=35440
2011-01-09 19:37:35 +00:00
Anders Broman 30c2b245cd Fix:
20:15:19          Err  Field 'Link-local Address' (pmip6.lila_lla) is an FT_IPv6
 but is being displayed as BASE_HEX instead of BASE_NONE

svn path=/trunk/; revision=35439
2011-01-09 19:17:39 +00:00
Anders Broman fab599ffc0 Fix:
packet-mip6.c:801: warning: 'hf_pmip6_opt_ipack' defined but not used
packet-mip6.c:802: warning: 'hf_pmip6_opt_ipack_res' defined but not used

svn path=/trunk/; revision=35438
2011-01-09 19:15:11 +00:00
Anders Broman 40acaf76ce Add 26 Link-local Address Option.
Comments and whitespace changes.

svn path=/trunk/; revision=35436
2011-01-09 17:49:31 +00:00
Anders Broman a2bbf3d7cc Put sgsap in the right place.
svn path=/trunk/; revision=35433
2011-01-09 13:50:41 +00:00
Anders Broman 5c6ab22ff3 Get rid of check_col().
svn path=/trunk/; revision=35432
2011-01-09 13:50:03 +00:00
Anders Broman f23d884631 Try to fix:
packet-gtpv2.c:2648: warning: return type defaults to 'int'
packet-gtpv2.c: In function 'dissect_udp_s_port_nr':
packet-gtpv2.c:2690: warning: unused parameter 'length'
packet-gtpv2.c: In function 'dissect_gtpv2_fq_csid':
packet-gtpv2.c:2845: warning: unused parameter 'length'
packet-gtpv2.c: In function 'dissect_gtpv2_emlpp_pri':
packet-gtpv2.c:2927: warning: implicit declaration of function 'be_emlpp_prio'
packet-gtpv2.c: At top level:
packet-gtpv2.c:3056: warning: initialization from incompatible pointer type

svn path=/trunk/; revision=35431
2011-01-08 20:26:35 +00:00
Anders Broman b6427b53b5 Further IE dissection updates.
svn path=/trunk/; revision=35430
2011-01-08 20:09:29 +00:00
Guy Harris 785f7b5191 Use report_failure() to report problems reading the RADIUS dictionary,
so it shows up in the GUI in Wireshark.

svn path=/trunk/; revision=35427
2011-01-08 17:06:04 +00:00
Guy Harris 132f13c2f9 If the lack of a peer conversation is a bug, use one of the
dissector-bug macros.  If it's just that we're missing some packets, we
should handle that as best we can and, if there's stuff we can't do,
maybe put something into the protocol summary or tree saying "not enough
information".  Don't just spit out a warning message which the user
might not even see.

svn path=/trunk/; revision=35426
2011-01-08 16:40:46 +00:00
Sake Blok ea4ac173d0 Add "tcp.window_size_value" and "tcp.window_size_scalefactor" conform
the discussion in bug 5541. Since we now have the window size value as
well as the scaled window size, there is no need anymore for the
tcp preference "tcp_window_scaling".


svn path=/trunk/; revision=35425
2011-01-08 15:51:38 +00:00
Chris Maynard 4a8fa72830 Append text to INFO column. Closes out bug 4472.
svn path=/trunk/; revision=35423
2011-01-07 19:22:09 +00:00
Jeff Morriss bf2796ab92 Don't try to display a string in BASE_DEC. Also delete duplicate registration of hf_gtpv2_pti.
svn path=/trunk/; revision=35422
2011-01-07 19:01:17 +00:00
Anders Broman f235eadf25 ** (process:23326): WARNING **: Field 'Reserved bit(s)' does not have an
abbreviation

** ERROR **: Field 'IPv4 Address' (gtpv2.ipv4_addr) is an FT_IPv4 but is being
displayed as BASE_DEC instead of BASE_NONE

svn path=/trunk/; revision=35420
2011-01-07 18:04:03 +00:00
Anders Broman 6d801a2052 Fix buildbot.
svn path=/trunk/; revision=35419
2011-01-07 16:12:01 +00:00
Jeff Morriss 2c2990fc08 Fix the fuzz failure in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5554 :
Don't assume that g_strsplit() found and returned 3 strings.

svn path=/trunk/; revision=35418
2011-01-07 15:59:26 +00:00
Anders Broman 863e3f80a6 Add dissection of more IE:s
svn path=/trunk/; revision=35417
2011-01-07 15:21:23 +00:00
Guy Harris 1718ab7691 If we get an unknown reply status, don't print a g_warning message -
just put the reply body, if any, into the protocol tree as a blob.  The
protocol tree will note that it's an unknown status.

svn path=/trunk/; revision=35414
2011-01-07 00:26:57 +00:00
Anders Broman bdc3fa5463 From Alexis La Goutte:
- Update RFC Draft (draft-vida-mld-v2-08.txt) to Final RFC
(RFC 3810)
- Make MLD field filterable 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5552

svn path=/trunk/; revision=35413
2011-01-07 00:19:28 +00:00
Guy Harris b711e23baa Don't use g_warning() - either you have a dissector bug, and should use
one of the macros to report that, or you have a problem with the packet,
in which case you should note that in the protocol tree, or you have
something you don't understand, in which case you should dissect
whatever of it you do understand and put something appropriate, if
possible, into the protocol tree for the rest.

(And, if the length isn't right, there's not much you can do about it -
you have to trust the length, and manage to fail somewhere else.)

svn path=/trunk/; revision=35408
2011-01-06 22:52:40 +00:00
Stephen Fisher 802308ca01 More misc. CLDAP improvements for Active Directory including updating
field names and adding descriptions, changing the Domain GUID in the "LDAP
ping" response to a FT_GUID instead of FT_BYTES, etc.


svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
Jeff Morriss 9335685106 Fix the fuzz failure in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5550 :
In dissect_amqp_0_10_array() if the 'type' is unknown, don't loop (for
potentially a very long time) adding the same element over and over again
(since the type is unknown, we don't know how much to increase the offset so
an exception is never thrown).

svn path=/trunk/; revision=35406
2011-01-06 21:07:58 +00:00
Stephen Fisher a9761c53b7 More minor cleanup/fixes for MS Active Directory's use of CLDAP.
svn path=/trunk/; revision=35404
2011-01-06 18:50:39 +00:00
Stephen Fisher 89d9b73e47 Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits
in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1,
revision 26 (11/19/2010).  Also re-format code a bit.


svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
Stephen Fisher ab377e1e09 When showing a DNS query response containing a SRV record, display items
in the tree of the service record broken out.  For example,
"_ldap._tcp.domain.com" shows:

	Service: ldap
	Protocol: tcp
	Name: domain.com


svn path=/trunk/; revision=35401
2011-01-06 17:15:50 +00:00
Jeff Morriss 18f751d877 (After discussion on -dev) revert 35393: the old code is faster (and it is safe).
svn path=/trunk/; revision=35400
2011-01-06 16:08:56 +00:00
Jeff Morriss 8934e6bf26 strtoull() doesn't exist on Windows, use g_ascii_strtoull() instead.
svn path=/trunk/; revision=35399
2011-01-06 15:02:46 +00:00
Jeff Morriss 5a2ef3cb01 Use tvb_memeql() instead of memcmp()+tvb_get_ptr().
svn path=/trunk/; revision=35398
2011-01-06 03:08:03 +00:00
Jeff Morriss eaea469533 Actually use proto_tree_add_item().
svn path=/trunk/; revision=35397
2011-01-06 02:58:26 +00:00
Jeff Morriss 6f1c903e18 There's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_string: just use proto_tree_add_item().
svn path=/trunk/; revision=35396
2011-01-06 02:56:10 +00:00
Jeff Morriss eea559bc2c There's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_string: just use proto_tree_add_item().
svn path=/trunk/; revision=35395
2011-01-06 02:52:00 +00:00
Jeff Morriss 0b49360059 Rather than creating strtoul{l} functions that can deal with possibly non-NULL
terminated strings (retrieved with tvb_get_ptr()), just use
tvb_get_ephemeral_string() and the standard strtoul{l} functions.

svn path=/trunk/; revision=35394
2011-01-06 02:45:01 +00:00
Jeff Morriss fb7450a8df Use tvb_get_ephemeral_stringz() instead of tvb_get_strsize() plus (sometimes multiple) calls to tvb_get_ptr().
svn path=/trunk/; revision=35393
2011-01-06 02:18:36 +00:00
Jeff Morriss 9b3eb1ff4b Reset the global pdu_type *before* returning.
svn path=/trunk/; revision=35391
2011-01-05 22:40:47 +00:00
Jeff Morriss 61317d2dbd Remove an unreached return.
svn path=/trunk/; revision=35390
2011-01-05 22:33:25 +00:00
Jeff Morriss 8535524c6a Remove a duplicate return.
svn path=/trunk/; revision=35389
2011-01-05 22:27:41 +00:00
Jeff Morriss abe40cfaf1 Remove a break that makes other following statements unreached.
svn path=/trunk/; revision=35388
2011-01-05 22:26:43 +00:00
Jeff Morriss fc2b1606cf Remove unreached statement.
svn path=/trunk/; revision=35387
2011-01-05 22:20:39 +00:00
Jeff Morriss f86b14d820 Replace 2 switch()es with duplicated values (but missing most of the case statements--leading the Sun compiler to complain about most of the statements not being reached) with a value_string and a couple of val_to_str() calls. Also some minor reformatting of the function in question.
svn path=/trunk/; revision=35386
2011-01-05 22:17:33 +00:00
Jeff Morriss 11fc9bbe33 Use some tvb_ accessor functions instead of a standard function plus tvb_get_ptr().
svn path=/trunk/; revision=35384
2011-01-05 18:59:47 +00:00
Guy Harris 3e5c04221a Handling a too-long length should be handled better.
svn path=/trunk/; revision=35383
2011-01-05 17:59:50 +00:00
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
Anders Broman 465a18eea4 Extend a comment
svn path=/trunk/; revision=35308
2010-12-30 14:10:35 +00:00
Anders Broman f27aa6297a Extend IE dissetcion.
svn path=/trunk/; revision=35307
2010-12-30 14:09:09 +00:00
Guy Harris 1975175946 Clarify that "don't make changes here" refers to the copy of Pidl, not
to the .cnf files (or perhaps even the .idl files).

svn path=/trunk/; revision=35306
2010-12-30 03:22:45 +00:00
Guy Harris 84c61920d9 OK, I found a URL that will get you to the CPAN page for Yapp without
embedding a version number.  Use it.

"This will build and install the binaries and the manpage (pidl.1)."
refers to the process of installing Pidl; put it immediately after the
steps for installing Pidl.

svn path=/trunk/; revision=35305
2010-12-30 03:13:37 +00:00
Guy Harris e32a3b8a97 The rids argument to samr_GetGroupsForUser() is *not* a single RID, it's
an array of samr_RidWithAttributeArray structures.  Don't equate it to
hf_samr_rid; that causes hf_samr_rid to be added as an item with a
length of -1, but, as hf_samr_rid is an FT_UINT32 field, that causes a
dissector bug error.

The version of Yapp I was using, at least, didn't like C++-style
comments in the IDL file; replace them with C-style comments.

svn path=/trunk/; revision=35304
2010-12-30 02:56:51 +00:00
Guy Harris 4132fab674 Add some white space.
Give more information about getting Yapp; not everybody using it is
necessarily using SUSE (and, yes, that's how it appears to be spelled
now, even though the "u" was for "und" and not originally capitalized).

svn path=/trunk/; revision=35303
2010-12-30 02:10:49 +00:00
Chris Maynard bb6a0a0604 Update list of relevant protocol specs. Some drafts are now RFC's.
svn path=/trunk/; revision=35301
2010-12-29 20:58:14 +00:00
Gerald Combs cf6df46095 Fix a buffer overflow in the engineId preferences. Fixes bug 5530.
svn path=/trunk/; revision=35298
2010-12-29 20:09:27 +00:00
Guy Harris 06a370929b Fix incomplete conversion from an on-the-stack buffer to an ep_allocated
buffer - the size of the latter can't be found with sizeof, as all you
have is a pointer to the buffer.  sizeof (pointer) happened, by chance,
to give the right answer on ILP32 platforms, but gave a too-big answer
on LP64 and LLP64 platforms, which meant we overflowed the buffer when
clearing it.

svn path=/trunk/; revision=35297
2010-12-29 19:40:36 +00:00
Jaap Keuter bf301e6d86 Fix the HAI value display filter string.
svn path=/trunk/; revision=35294
2010-12-29 07:39:52 +00:00
Gerald Combs 73f5cb2503 From non-customers via bug 5530: Fix a buffer overflow in the MAC LTE
dissector.  From me: Add a define, ep_allocate the buffer.

svn path=/trunk/; revision=35292
2010-12-28 20:47:48 +00:00
Chris Maynard d100b2d0e0 From non-customers [AT] operamail [DOT] com, submitted via bug 5529:
Values[9] is fetched twice but Values[8] not at all, despite printing it
    later on.

svn path=/trunk/; revision=35290
2010-12-28 20:19:41 +00:00
Chris Maynard 40106e2f5b From Alexis La Goutte via bug 5528:
Fix wrong Field Type for HAI-Value and MN-Value (RFC 5271)

svn path=/trunk/; revision=35289
2010-12-28 18:26:16 +00:00
Chris Maynard f18068e9ef Improve sanity checking of reception claim count. Fixes bug 5521.
svn path=/trunk/; revision=35287
2010-12-28 18:02:24 +00:00
Anders Broman 735709bee6 Add tvb_bcd_dig_to_ep_str()
/*
 * Given a tvbuff, an offset into the tvbuff, and a length that starts
 * at that offset (which may be -1 for "all the way to the end of the
 * tvbuff"), fetch BCD encoded digits from a tvbuff starting from either 
 * the low or high half byte, formating the digits according to an input digit set, 
 * if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used.
 * A pointer to the EP allocated string will be returned.
 * Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion.
 */

svn path=/trunk/; revision=35286
2010-12-28 12:36:26 +00:00
Anders Broman 23b188ca06 Add dissection of NAS message container.
svn path=/trunk/; revision=35285
2010-12-28 11:24:46 +00:00
Jaap Keuter 64d02a0ae1 From Alexis La Goutte:
A patch to enchance the ICMPv6 dissector
- Update RFC Draft (draft-ietf-ipngwg-icmp-name-lookups-07/08) to Final RFC (RFC 4620)
- Make NI field filterable 
- ....

svn path=/trunk/; revision=35283
2010-12-28 10:34:19 +00:00
Jaap Keuter b964ee34dd From Masashi Honma:
EAP WPS RF band may be '2.4 GHz and 5 GHz'.

svn path=/trunk/; revision=35282
2010-12-28 09:30:24 +00:00
Anders Broman 2c7b85a624 Add dissection of Radio Priority LCS.
svn path=/trunk/; revision=35276
2010-12-27 20:23:26 +00:00
Anders Broman 14e2d5c04a Remove de_sgsap_tmsi as it's not needed.
svn path=/trunk/; revision=35275
2010-12-27 20:19:55 +00:00
Stephen Fisher 4c0447c8cc Fix build by #if 0 out unused de_sgsap_tmsi() function.
svn path=/trunk/; revision=35274
2010-12-27 16:38:03 +00:00
Anders Broman a95df8ac8c Add more IE dissection.
svn path=/trunk/; revision=35273
2010-12-27 15:15:55 +00:00
Anders Broman 2f80045a5c From Alexis La Goutte:
ICMPv6 Enhancements : make ICMP option filterable (Part 2)

*Merge (and update) FMIPv6 Option with ND Option
*Make ICMP option filterable (use proto_tree_add_item..)
*Reorder ND Option
*Add dissector for RA Flags Extension (RFC5075)
*Add dissector for Handover Key Request/Reply (RFC5269)
*Add dissector for Handover Assist Info / Mobile Node ID (RFC5271)
*Add dissector for DNS Search List (RFC6106

From me removed a c++ style comment and changed 
to tvb_memcpy(tvb, (guint8 *)&prefix.bytes in a couple of places.

svn path=/trunk/; revision=35272
2010-12-27 10:57:42 +00:00
Anders Broman d20be4e050 Fix the Message numbering.
svn path=/trunk/; revision=35271
2010-12-27 09:33:39 +00:00
Anders Broman 259061a26b Try to apiece the Ubuntu buildbot.
svn path=/trunk/; revision=35270
2010-12-27 08:23:55 +00:00
Anders Broman 790ba15666 move the enum to packet-gsm_a_common to
make it possible to use element dissecton from this dissector
in other dissectors.
It is left in packet-nas_EPS.c as a comment for easier reference.

svn path=/trunk/; revision=35269
2010-12-27 05:33:58 +00:00
Martin Mathieson ee714ffac4 Only a new transmission grant should end a Scheduling Request.
svn path=/trunk/; revision=35268
2010-12-26 23:40:22 +00:00
Anders Broman df66b02972 Correct:
RESET IP RESOURCE
RESET IP RESOURCE ACKNOWLEDGE
Tags

svn path=/trunk/; revision=35267
2010-12-26 21:23:06 +00:00
Anders Broman 356aced5bf Start of a SGSAP (TS 29.118) dissector for LTE.
svn path=/trunk/; revision=35266
2010-12-26 21:06:08 +00:00
Chris Maynard e867b10b98 Properly define and dissect BGP_EXT_COM_LINKBAND. Fixes bug 4409 reported by
Max Ivanov.

svn path=/trunk/; revision=35260
2010-12-24 13:53:26 +00:00
Jaap Keuter 302d4c14df From Julien Kerihuel:
I've just finished to write a ncacn_http dissector for Wireshark which
provides the ability to dissect Outlook anywhere packets properly (as
specified by [MS-RPCH].pdf documentation.

svn path=/trunk/; revision=35259
2010-12-23 23:50:14 +00:00
Guy Harris 158e9a3dae Clean up indentation.
svn path=/trunk/; revision=35257
2010-12-23 21:22:55 +00:00
Stephen Fisher 3bd641004b Proof of concept for using new tvb_get_ephemeral_unicode_stringz(), which was
just introduced in SVN revision 35253.  This new function has many more uses
in the SMB (and other) dissectors. 


svn path=/trunk/; revision=35254
2010-12-23 18:01:28 +00:00
Jaap Keuter 48784e79a4 Fix for bug 5517:
MEG ID, ICC-based format is text, not binary.

svn path=/trunk/; revision=35252
2010-12-23 17:45:02 +00:00
Martin Mathieson 5e49db3304 Properly read UL grant subframe number.
svn path=/trunk/; revision=35251
2010-12-23 12:16:37 +00:00
Martin Mathieson c08d3b76d9 Skip an outheader field.
svn path=/trunk/; revision=35250
2010-12-23 11:09:52 +00:00
Jaap Keuter 226a722600 From Jiří Engelthaler:
Fixes computing of milliseconds in CP56time2a and add "bitstring of 32 bits" 
and "step position" support (ASDU types 5,7,32,33,47,51,60 and 64).

svn path=/trunk/; revision=35249
2010-12-22 23:28:23 +00:00
Stephen Fisher df6e1f362b Add #define and value_string entries for the remaining SSH message type
numbers as defined in RFC 4250.


svn path=/trunk/; revision=35246
2010-12-22 19:46:57 +00:00
Stephen Fisher 6a76081482 Change prefixes in #define:
SSH -> SSH1
  SSH2 -> SSH

This will make it easier to compare the code to the SSH RFCs, which only
cover SSH version 2.


svn path=/trunk/; revision=35245
2010-12-22 18:53:21 +00:00
Stig Bjørlykke f4c6355281 From Alexis La Goutte via bug 5514:
Fix a Git issue.

svn path=/trunk/; revision=35243
2010-12-22 13:19:38 +00:00
Jaap Keuter d1787cafa4 From daulis0@gmail.com:
There are 2 parts to the CIGI protocol. 1) Host to IG messages and 2) IG to
Host messages. Currently, Host to IG messages are parsed correctly, but IG to
Host messages show Malformed Packet (or may not even detect as CIGI at all)

Some of the protocol format is different between versions. The "Minor Version"
is used by the dissector to separate the differences, but this field is in a
different location in the IG Control Packet (Host to IG message) vs the Start
of Frame Packet (IG to Host message).

Attached patch to correct this.

svn path=/trunk/; revision=35241
2010-12-21 21:29:47 +00:00
Stephen Fisher 0b8494fc2c Fix indentation: change from a mixture of 2 and 4 spaces to tabs (which
is what packet-smb.c uses) and add extra line breaks.  Both changes are
for improved readbility of the frequent complex and cryptic loops.


svn path=/trunk/; revision=35238
2010-12-21 17:51:35 +00:00
Martin Mathieson 1386eb8fa3 Be more consistent about how offset is updated while dissecting lte_rrc fields.
Show cell-id in info column (if don't manage to call RRC).

svn path=/trunk/; revision=35237
2010-12-21 17:46:25 +00:00
Chris Maynard f64b27c979 Fix warnings with format.
svn path=/trunk/; revision=35232
2010-12-20 18:16:12 +00:00
Chris Maynard b9dd529e9c Some PIM enhancements, mostly to allow more fields to be filterable.
svn path=/trunk/; revision=35231
2010-12-20 17:48:26 +00:00
Martin Mathieson c7c4850c38 From Papan Kumar Singh (bug 5504 & 5505):
Add missing break so that PDCP-LTE direction is set properly.

svn path=/trunk/; revision=35228
2010-12-20 11:26:50 +00:00
Jaap Keuter 720f40cd30 From Rob Casey:
Patch to add support for DNP3 protocol Binary Output Change object type.

svn path=/trunk/; revision=35227
2010-12-20 07:57:52 +00:00
Jaap Keuter 13a1233484 From Mathieu Parent:
* Support for XMLAlarmMessage (0x015A)
* every xml data is parsed using the XML dissector

svn path=/trunk/; revision=35226
2010-12-20 07:49:56 +00:00
Guy Harris a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Jaap Keuter 7e16ec5b99 Prepare for handling DLT_IPV4 and DLT_IPV6.
svn path=/trunk/; revision=35223
2010-12-19 18:46:08 +00:00
Jaap Keuter 9dd993d2f2 From Daniel Black:
Adds support for GOST algorithm as per RFC5933. This is used as an option
DNSSEC algorithm.

svn path=/trunk/; revision=35217
2010-12-18 14:29:21 +00:00
Sake Blok c16ac675d9 Add support for the TLSv1.2 format of the CertificateRequest handshake message.
(see: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5485 )


svn path=/trunk/; revision=35216
2010-12-18 01:16:11 +00:00
Martin Mathieson e305c20212 Refactor EDCH-T2 function to also support the very similar EDCH-Common format.
N.B. EDCH-Common support itself not yet tested.

svn path=/trunk/; revision=35212
2010-12-17 17:40:42 +00:00
Stig Bjørlykke bfc709b0d1 Use printf modifier %u for guint32 values.
svn path=/trunk/; revision=35211
2010-12-17 13:03:34 +00:00
Stig Bjørlykke 18e3850d24 Switched to bitwise & instead of logical && in bit operations.
This bug was found by clang.

svn path=/trunk/; revision=35210
2010-12-17 13:01:52 +00:00
Stig Bjørlykke f7ac7ef37e Switched to bitwise | instead of logical || in bit operations.
This bug was found by clang.

svn path=/trunk/; revision=35209
2010-12-17 13:01:12 +00:00
Anders Broman 96659d0252 From Jouni Malinen:
Add support for dissecting TDLS (IEEE 802.11z) frames.
These are mostly used as Action frames that are encapsulated in Data frames (to go through any AP).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5493

svn path=/trunk/; revision=35208
2010-12-16 21:49:55 +00:00
Anders Broman 565b4d46b6 From Jouni Malinen:
Add dissecting for SA Query Action frames (IEEE 802.11w)
The patch hunks that were missed in r33436.

svn path=/trunk/; revision=35204
2010-12-16 18:06:32 +00:00
Anders Broman 86113c5a8c From Pascal Quantin:
When I coded the decoding of the feature group indicator, I decided to do not display the feature group content when it is not supported. After further thinking I find it more useful to always display the features of a given indicator whether it is supported or not.

svn path=/trunk/; revision=35200
2010-12-16 12:33:36 +00:00
Anders Broman b124071369 From Vincent Helfre:
fixed the conversions for utran and eutran threshold which are used for Enhanced Measurement Report.

svn path=/trunk/; revision=35199
2010-12-16 12:26:49 +00:00
Anders Broman 7dd3704e0c Fix a comment.
svn path=/trunk/; revision=35198
2010-12-16 12:26:01 +00:00
Anders Broman 68fba79bed Dissect AVP Code: 606 User-Data if it's xml.
svn path=/trunk/; revision=35197
2010-12-16 10:04:00 +00:00
Jaap Keuter a23223b145 From Harald Welte:
It seems that Hay Systems Limited (HSL) is using stream 0xDD to transport
human-readable debug messages from the BTS to the BSC.

svn path=/trunk/; revision=35196
2010-12-16 08:03:57 +00:00
Jaap Keuter ede9bc5a0a From Harald Welte:
As it seems, there are systems that use an IPA multiplex layer but don't use
it on the standard ports that ip.access is using them for the A-bis interface.

This patch adds a user-configurable preference for the TCP and UDP ports the
IPA dissector should work on.

svn path=/trunk/; revision=35195
2010-12-16 07:55:35 +00:00
Jaap Keuter fb1390652b Fix for bug 5475:
Track dissection properly of Packet Flow Identifier IE to 
avoid Extraneous Data reporting.

svn path=/trunk/; revision=35194
2010-12-16 07:25:01 +00:00
Martin Mathieson 3daaaf8a53 Use value_string for MAC-is descriptor lchid.
svn path=/trunk/; revision=35191
2010-12-15 12:07:41 +00:00
Martin Mathieson 126015ae33 From Tobias Witek:
Bug 5494 -  FP-Hint: Display correct DCH-ID value

In FP-Hint, DCH-IDs are stored as a 5-bit value. While a 5-bit value can 
hold values from 0..31, DCH-IDs in the NBAP, RNSAP and RRC protocols 
have values from 1..32.

This patch adds 1 to the DCH-ID in FP-Hint in order to display the 
correct DCH-ID value in the protcol tree.

svn path=/trunk/; revision=35190
2010-12-15 10:59:10 +00:00
Martin Mathieson dea41913d5 Prettify the dissection of EDCH T2 data.
svn path=/trunk/; revision=35189
2010-12-15 10:53:35 +00:00
Martin Mathieson dc24655c06 Add support for FP E-DCH T2 frames.
svn path=/trunk/; revision=35188
2010-12-15 01:45:43 +00:00
Stephen Fisher da59dc4c46 Introduce a preference to display the third and forth bytes of the RIPv2
header as the "Routing Domain" field as introduced in RFC 1388 [January 1993]
and obsoleted as of RFC 1723 [November 1994].  Defaults to FALSE.


svn path=/trunk/; revision=35187
2010-12-14 18:27:04 +00:00
Stephen Fisher e4a02e802c Rename "Secure Socket Layer" to "Secure Sockets Layer" (plural) and update
protocol reference URLs.


svn path=/trunk/; revision=35186
2010-12-14 17:02:00 +00:00
Jaap Keuter 9da77c4716 Riverbed published patch for dissection of Riverbed TCP Probe/Transparency TCP options.
svn path=/trunk/; revision=35184
2010-12-14 07:43:17 +00:00
Bill Meier 62e44e3f66 Minor cleanup:
- Initialize a few static global variables;
- Remove two unnecessary calls to g_hash_table_foreach_remove;
- Do whitespace cleanup and use consistent indentation;
- Fix a few typos and fix up several comments.

svn path=/trunk/; revision=35183
2010-12-14 01:50:31 +00:00
Chris Maynard 6003c15d6f From Marton Nemeth via bug #5490: Cleanup USB endpoint direction display.
svn path=/trunk/; revision=35182
2010-12-13 15:59:14 +00:00
Martin Mathieson 91436c78f6 Show DDI config info.
svn path=/trunk/; revision=35181
2010-12-13 11:00:05 +00:00
Chris Maynard 44955378b5 From Richard Sharpe via bug 5466: "Changes to dissect persistentreserveout
parameters", with some whitespace changes by me.

svn path=/trunk/; revision=35173
2010-12-10 15:49:33 +00:00
Anders Broman ef35235e5a From Rob Casey:
Addition of support for DNP3 Analog Input Deadband object type
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5471

svn path=/trunk/; revision=35171
2010-12-10 15:32:47 +00:00
Anders Broman c8726eda61 From Lori Tribble:
Enhancements to BACnet's bacapp dissector
Details:
1) Added the low and high instance parameters of the who-is command to the
summary view, if present.
2) Added dissecting of the property active-cov-subscriptions.
3) Added tag details to the decoded view of ProcessId.
4) Fixed the indent levels of the recipientProcess decoding.
5) Fixed the indent tree levels for ReadPropertyMultiple-ACK when decoding
error response.

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

svn path=/trunk/; revision=35170
2010-12-10 14:23:48 +00:00
Anders Broman a9aca792c5 From Mike Morrin:
Fix RSL Channel description and interference dissection.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5479

svn path=/trunk/; revision=35169
2010-12-10 12:39:59 +00:00
Stephen Fisher 8dd830ceec Change "DCE RPC" to "Distributed Computing Environment / Remote Procedure
Call (DCE/RPC)" for the DCERPC dissector's PROTONAME. 


svn path=/trunk/; revision=35152
2010-12-08 00:16:42 +00:00
Bill Meier 229587d32d Init fragment_table and reassembly table every "session" rather than just once in proto_register...()
svn path=/trunk/; revision=35151
2010-12-07 23:27:11 +00:00
Jeff Morriss 2993d4aa54 From Andrew Feren via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5377 :
Add a bunch of NetFlow/IPFIX extensions from Plixer and ntop.

A little cleanup as well.

From me: remove duplicate blurbs.

svn path=/trunk/; revision=35142
2010-12-07 03:46:10 +00:00
Jeff Morriss 7c39ab9934 From Fulko Hew via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5438 :
Various fixes for AgentX protocol decoding:

1/ Fixed the decode of get & getnext PDU to correctly iterate over range lists.
2/ Re-adjust PDU header highlighting to hightlight all 20 octets instead of
only the first 4.
3/ Altered the decode hierarchy so that PDU bodys are no longer a sub-component
of the PDU header, but is now at the same level as the header.
4/ Corrected the highlighted length of decoded OIDs.
5/ Added bitwise decoding of the PDU 'flag' octet.

From me:
- Remove unnecessary includes.
- Some indentation/white space cleanup.
- Remove (new) duplicate blurbs

svn path=/trunk/; revision=35141
2010-12-07 02:44:25 +00:00
Jeff Morriss 19b2af1e70 Make some symbols static.
svn path=/trunk/; revision=35140
2010-12-06 23:20:21 +00:00
Jeff Morriss 2c6e8dfd3a Make a whole bunch of symbols static.
svn path=/trunk/; revision=35139
2010-12-06 23:17:43 +00:00
Jeff Morriss f2fc5d42fd Make some prefs callback functions static. (These modules don't use proto_reg_handoff_*() as their prefs callback.)
svn path=/trunk/; revision=35138
2010-12-06 22:08:48 +00:00
Chris Maynard c0565d8936 Improve dissection of bit-oriented fields. Patch from Richard Sharpe via
bug #5466 with some minor whitespace modifications from me and a fix of an
invalid offset introduced with the patch.  Fuzz testing still needs to be done.
I can't seem to get the fuzz tester to work with the capture files attached to
the bug report. 

svn path=/trunk/; revision=35137
2010-12-06 22:00:08 +00:00
Jeff Morriss 99bc06ceff Make some (preference) variables static.
svn path=/trunk/; revision=35134
2010-12-06 19:48:05 +00:00
Jeff Morriss 9d007f19f1 From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5372 :
Fix crash in LDAP dissector, in a generic way (for all callers of
dissect_nt_sid()).

svn path=/trunk/; revision=35127
2010-12-06 15:57:39 +00:00
Bill Meier 03b57df5a0 Fix various typos and spelling errors.
svn path=/trunk/; revision=35126
2010-12-06 01:34:58 +00:00
Martin Mathieson 7cd3ff263b Add more PHY attributes to MAC frames.
svn path=/trunk/; revision=35125
2010-12-05 23:34:11 +00:00
Jeff Morriss 7fb975bb90 From Allan M. Madsen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5446 :
Bluetooth ACL packets are not defragmented when the packet boundary flags is set
to 'flushable first fragment'.

svn path=/trunk/; revision=35117
2010-12-03 23:44:35 +00:00
Jeff Morriss 132f874faa From Andrew Feren via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5380 :
Comment in the code asked....

 /*XXX: 2 bytes skipped ?? */

Here is what I have found.

The high byte (1) indicates the Classification Engine ID
The low bytes (3) indicate the application ID

Engine ID of 5 is NBAR Standard.
Engine ID of 6 is NBAR Custom.

Attached patch displays all 4 bytes (type and ID) in a readable way.  Also
allows better filtering.

svn path=/trunk/; revision=35116
2010-12-03 23:04:45 +00:00
Bill Meier 19124f8bb1 Fix spelling errors.
svn path=/trunk/; revision=35112
2010-12-03 20:37:34 +00:00
Anders Broman 740a550120 From Fred Fierling:
Fixes invalid long address mappings in NWK layer.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5456

svn path=/trunk/; revision=35106
2010-12-03 07:14:04 +00:00
Jeff Morriss 5430e70144 From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5460 :
MongoDB dissector improperly decodes cursorID in OP_KILL_CURSORS command.
The size of the CursorID is 64 bits, while the code assumes they are 4 bits,
though correctly incrementing the pointer.  Fix this typo.

svn path=/trunk/; revision=35103
2010-12-02 14:35:11 +00:00
Anders Broman a6b1581480 From Slava:
Incorrectly registered range string in sdp infiniband dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5461

svn path=/trunk/; revision=35102
2010-12-02 12:39:24 +00:00
Jeff Morriss a098de3e0a From Zachary Mark via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5457 :
The scsi_persresv_type_val field in packet-scsi.c contains a mapping of
persistent reservation opcodes to their descriptive types.  The opcode for the
Exclusive Access - Registrants Only field is incorrectly set to 7, when the
correct opcode is 6 (as per SPC-2 onward).  The attached patch corrects this
discrepancy.

The attached patch also adds support for dissecting opcodes 7 and 8, the two
all registrants reservation types present in SPC-3 onward.

svn path=/trunk/; revision=35099
2010-12-01 23:30:06 +00:00
Jeff Morriss 2b77738b11 From Neil Piercy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3301 :
The information which is used to determine which sub-dissector to use for the
various Data messages within an SCCP connection is only present within the
initial Connection Request, so even with connection tracking on, unless the
trace contains the Connection Request no sub-dissector is called. It is common
for traces to only contain a single carried protocol anyway - e.g. RANAP.

The supplied patch adds a user preference for a "default payload"
sub-dissector, which is called in preference to the Data dissector if nothing
else has claimed the packet first.

svn path=/trunk/; revision=35098
2010-12-01 23:26:07 +00:00
Jeff Morriss 7967c282c0 From Neil Piercy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3301 :
The packet-sccp.c has a bug in the declared valid ranges of the SSN and DPC
values in the user table used to match to a subdissector. The SSN range is 16
bits rather than 8 (not really an issue) but the DPC range is 16 bits rather
than 24 - so many traces cannot be matched by this table.

svn path=/trunk/; revision=35097
2010-12-01 23:12:46 +00:00
Chris Maynard 77673564bc From Alex Badea via bug #4149: IPcomp: decompress deflated payloads.
svn path=/trunk/; revision=35088
2010-12-01 15:45:24 +00:00
Chris Maynard 4255465926 Rename conflicting draft v2 and v8 display filter fields. Fixes bug 4059.
svn path=/trunk/; revision=35078
2010-11-30 17:08:37 +00:00
Jeff Morriss a7ce50ba95 From Toralf Foerster via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5432 :
The attached patch against that dissector contains :

FIX:
- counting statistics over encrypted packages (line 610 ff)

NEW:
- tag sametime message type 0x0025 as known

MISC:
- better comment
- new line clean ups

svn path=/trunk/; revision=35077
2010-11-30 17:06:13 +00:00
Martin Mathieson 77cf0462dc From Pascal Quantin:
I just found a small bug in LTE PDCP dissector with current top of tree.
If global preference global_pdcp_dissect_user_plane_as_ip is set to true, the dissector will try to decode an IP frame even with signalling plane.
PDCP-LTE
    ...0 0000 = Seq Num: 0
    Signalling Data: 0800183aa808
    MAC: 0x00000000 (0)
[Malformed Packet: IP]
    [Expert Info (Error/Malformed): Malformed Packet (Exception occurred)]

With the attached patch, I get the correct output for both signalling and user plane PDUs.

svn path=/trunk/; revision=35076
2010-11-30 15:10:17 +00:00
Jeff Morriss c755b2fd54 Oh yeah, there's a reason we don't put targets in Makefile.common: the first target in a makefile is what you get when you just run make (without a target). Revert 35073 and 35069.
svn path=/trunk/; revision=35075
2010-11-30 02:04:55 +00:00
Jeff Morriss f1c066bbee Move some checkapi targets into Makefile.common
svn path=/trunk/; revision=35073
2010-11-29 22:34:04 +00:00
Jeff Morriss 050d9379ef Remove a no-longer-used variable.
svn path=/trunk/; revision=35072
2010-11-29 22:11:39 +00:00
Anders Broman 623253b010 Change SIP TCP port preference to a range preference.
svn path=/trunk/; revision=35070
2010-11-29 21:40:49 +00:00
Anders Broman e55dcbcdb7 From Andrei Emeltchenko:
Wrong link type in a packet(bluethouth).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5449

svn path=/trunk/; revision=35064
2010-11-29 18:15:09 +00:00
Anders Broman 4b5a8bff9e From Vincent Helfre:
Make it possible to dissect NAS EPS messages without security header.

svn path=/trunk/; revision=35062
2010-11-29 13:27:00 +00:00
Anders Broman 5a0e550686 From Vincent Helfre:
I have fixed some issue in the measurement information decoding in packet-gsm_a_rr.c.

svn path=/trunk/; revision=35061
2010-11-29 13:12:35 +00:00
Anders Broman 879821bc35 Try to fix Buildbot crash output: fuzz-2010-11-28-11164.pcap
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5448

svn path=/trunk/; revision=35060
2010-11-29 13:02:31 +00:00
Jörg Mayer 7a81be7136 Make the Primary name element filterable in response records.
Same for Nameserver names.

svn path=/trunk/; revision=35058
2010-11-28 21:45:15 +00:00
Anders Broman 42e31d3efe From Slava:
Bug with RWH parsing in Infiniband dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5444

svn path=/trunk/; revision=35056
2010-11-28 21:08:03 +00:00
Anders Broman 5f1b6a507b From Alex Badea:
gsm_a_rr: System Information Type 4 / CBCH mobile allocation dissected incorrectly
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5436

svn path=/trunk/; revision=35054
2010-11-28 20:58:26 +00:00
Martin Mathieson a6368260cc Fix calling of LTE RRC dissector for "rrc_lte_r8" frames.
svn path=/trunk/; revision=35050
2010-11-28 15:37:40 +00:00
Stephen Fisher 6c1e90bfd0 Mention SSHv2 RFCs
svn path=/trunk/; revision=35035
2010-11-26 23:33:05 +00:00
Jaap Keuter b1914ff4df Fix for bug 5435:
Add support for dissecting SLL type 0x17 frames.

svn path=/trunk/; revision=35029
2010-11-25 19:59:19 +00:00
Chris Maynard dbe63e9730 Add support for USB isochronous. From Marton Nemeth via bug #5370.
svn path=/trunk/; revision=35025
2010-11-24 17:33:58 +00:00
Anders Broman 66053b7b3a From Johannes Lange:
Function dissect_per_bit_string_display might read more bytes than available (PER dissector).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5394

svn path=/trunk/; revision=35023
2010-11-24 16:35:23 +00:00
Anders Broman 4d4283ef98 From Johannes Lange:
Bug 5393 - Wrong length calculation in new_octet_aligned_subset_bits() (PER dissector) .
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5393

svn path=/trunk/; revision=35021
2010-11-24 16:21:04 +00:00
Anders Broman 8fc5892e01 Tighten the heuristic.
svn path=/trunk/; revision=35020
2010-11-24 15:15:28 +00:00
Bill Meier df3c52dc2a Whitespace cleanup;
Add some braces;

svn path=/trunk/; revision=35018
2010-11-24 03:43:09 +00:00
Bill Meier 96510d9b38 Tighten up code dissecting message header.
This corrects the specific issue reported in Bug #3317
wherein the dissector decided there was a valid but unknown
header when dissecting a binary (non text) message with a ":"
as the last byte.

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

Note that a larger issue remains: the IMF dissector
presumably shouldn't really even try to dissect a
binary payload (which is proably encrypted text).

svn path=/trunk/; revision=35017
2010-11-24 02:11:43 +00:00
Anders Broman 01eae27dc1 Remove Supported Channels lenght check fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5430

svn path=/trunk/; revision=35016
2010-11-23 19:42:11 +00:00
Jeff Morriss cce1bef672 Based on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5391#c11 : put some DISSECTOR_ASSERTs and THROW's back in.
svn path=/trunk/; revision=35014
2010-11-23 15:27:18 +00:00
Martin Mathieson e1689f4ad4 Check the DDI while dissecting the header.
svn path=/trunk/; revision=35013
2010-11-23 11:01:48 +00:00
Stig Bjørlykke f7c394dfd0 Initialize no_assoc.app_info=0.
svn path=/trunk/; revision=35011
2010-11-22 21:05:49 +00:00
Anders Broman 8bc65842e0 From Mike Morrin:
In bssmap, track L3 handover target (GSM or UMTS) between PDUs
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5294

svn path=/trunk/; revision=35009
2010-11-22 20:24:12 +00:00
Jeff Morriss 1b04b1b765 From Emil Wojak via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5391 :
I'd like to share my enhancements to the TDS dissector with everyone.
The list of improvements follows:
- nearly complete dissection of RPC calls,
- detection and dissection of the ALL_HEADERS rule,
- corrected some existing proto_tree fields to support filters,
- other minor fixes where the interpretation of data conflicted with the
  official documentation from MS.

I tested the new code on a variety of different TDS captures with many diverse
RPC calls. The code compiles and works on 32-bit Linux, I didn't check those
changes on other platforms though.

From me:

- terminate all value_strings
- change ++*offset to *offset += 1 (I think that's more readable)
- replace all the dissector assertions which could be caused by malformed
  packets with expert infos
- Don't throw ReportedBoundsError when the packets have unexpected data in
  them, just report an expert info and continue on

svn path=/trunk/; revision=35007
2010-11-22 18:48:54 +00:00
Jeff Morriss 1f4cdf5a9d From Stephane Bryant via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5358 :
This is a dissector for reload framed message:
ReLOAD packets can be inserted in frame message, as described in
draft-ietf-p2psip-base-10

From me: remove some unnecessary includes.

svn path=/trunk/; revision=35005
2010-11-22 16:19:39 +00:00
Anders Broman 6224708d6c Remove faulty return, probably forgotten during test.
Fixing dissection on Via header.

svn path=/trunk/; revision=35004
2010-11-22 15:02:06 +00:00
Martin Mathieson c018054581 Add another (unsupported) channel type identifier.
svn path=/trunk/; revision=35001
2010-11-22 13:37:13 +00:00
Martin Mathieson 74a74645b1 Add sequence analysis for PDCP, based upon RLC/UM.
For now, only enable it for logged PDCP frames, i.e. not for PDCP found inside RLC (that won't work properly until RLC re-assembly is implemented).

svn path=/trunk/; revision=35000
2010-11-22 13:28:49 +00:00
Chris Maynard 37f3870cac Display priority and protocol, even in the case of WCCP2_SERVICE_STANDARD, but
indicate that these fields are unused in this case and must be zero.
Furthermore, if the value is non-zero, add an expert info warning about it.
Fixes bug 3631.

svn path=/trunk/; revision=34998
2010-11-22 05:09:57 +00:00
Jaap Keuter 0a9a603814 Fix for bug 5425:
Add support for dissecting SLL type 0x0C frames.

svn path=/trunk/; revision=34991
2010-11-21 12:36:24 +00:00
Stig Bjørlykke 3bfd25c34e Removed unused route_preference.
svn path=/trunk/; revision=34990
2010-11-21 11:28:42 +00:00
Anders Broman ebac83d6a3 From Alexis La Goutte:
ICMPv6 Enhancements : make ICMP option filterable.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5424

svn path=/trunk/; revision=34988
2010-11-21 10:30:35 +00:00
Jaap Keuter ba2d64102c Fix for bug 5422:
Add support for dissecting SLL type 0x03 frames.

svn path=/trunk/; revision=34987
2010-11-20 18:14:30 +00:00
Guy Harris f54beaed87 Clean up blurbs a bit. Not much we can do about "Description" - what is
it a description *of*?

svn path=/trunk/; revision=34978
2010-11-19 19:02:08 +00:00
Jeff Morriss f424256889 Verify the number of rectangles, sub-rectangles, the number of bytes of cut
text, etc. are "sane" before:
1) requesting enough bytes (from reassembly) to dissect them all
2) (and) attempting to add them all to the tree

Request all the bytes we'll need to dissect all those rectangles/sub-rectangles
before starting dissection rather than checking before dissecting each
rectangle/sub-rectangle.

Use tvb_get_ephemeral_string().

Use _U_ to mark unused arguments.

Fix up some indentation.

Get rid of one more DISSECTOR_ASSERT.

svn path=/trunk/; revision=34977
2010-11-19 18:54:19 +00:00
Jeff Morriss 8f642bdb5c From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5366 :
Several fixes that make Tight VNC negotiation properly parsed.
It was not parsed correctly previously, for multiple reasons.

svn path=/trunk/; revision=34976
2010-11-19 18:53:40 +00:00
Anders Broman abc2a1d690 Mark a parameter as unused.
svn path=/trunk/; revision=34974
2010-11-19 16:33:12 +00:00
Anders Broman 79939636d1 Pretify dissection of H.248 Annex C.11 SDP equivalents.
svn path=/trunk/; revision=34972
2010-11-19 15:43:35 +00:00
Bill Meier 5cb41c00b1 Remove a check_col();
Fix a typo;
Minor whitespace cleanup.

svn path=/trunk/; revision=34971
2010-11-19 15:26:27 +00:00