obnox/wireshark/wip.git
13 years ago** (process:23326): WARNING **: Field 'Reserved bit(s)' does not have an
etxrab [Fri, 7 Jan 2011 18:04:03 +0000 (18:04 +0000)]
** (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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35420 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix buildbot.
etxrab [Fri, 7 Jan 2011 16:12:01 +0000 (16:12 +0000)]
Fix buildbot.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35419 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix the fuzz failure in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5554 :
morriss [Fri, 7 Jan 2011 15:59:26 +0000 (15:59 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35418 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd dissection of more IE:s
etxrab [Fri, 7 Jan 2011 15:21:23 +0000 (15:21 +0000)]
Add dissection of more IE:s

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35417 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoIf we get an unknown reply status, don't print a g_warning message -
guy [Fri, 7 Jan 2011 00:26:57 +0000 (00:26 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35414 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Alexis La Goutte:
etxrab [Fri, 7 Jan 2011 00:19:28 +0000 (00:19 +0000)]
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35413 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoTell the user about the Q&A site.
jake [Thu, 6 Jan 2011 23:34:46 +0000 (23:34 +0000)]
Tell the user about the Q&A site.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35412 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoOn Windows, convert all of our command-line arguments from UTF-16 to
gerald [Thu, 6 Jan 2011 23:28:58 +0000 (23:28 +0000)]
On Windows, convert all of our command-line arguments from UTF-16 to
UTF-8 where we don't already do so. In Wireshark use g_utf16_to_utf8
instead of utf_16to8. This should fix bug 5520.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35411 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoProhibit strtoull(): Windows doesn't have it. (Putting this in just saves waiting...
morriss [Thu, 6 Jan 2011 23:23:28 +0000 (23:23 +0000)]
Prohibit strtoull(): Windows doesn't have it.  (Putting this in just saves waiting for the buildbot to complain.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35410 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoLet's discourage the use of g_warning in dissectors. Either use one of
guy [Thu, 6 Jan 2011 23:04:48 +0000 (23:04 +0000)]
Let's discourage the use of g_warning in dissectors.  Either use one of
the dissector-bug macros, or try your best to dissect a packet that's
"wrong".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35409 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't use g_warning() - either you have a dissector bug, and should use
guy [Thu, 6 Jan 2011 22:52:40 +0000 (22:52 +0000)]
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.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35408 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMore misc. CLDAP improvements for Active Directory including updating
sfisher [Thu, 6 Jan 2011 22:24:10 +0000 (22:24 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35407 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix the fuzz failure in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5550 :
morriss [Thu, 6 Jan 2011 21:07:58 +0000 (21:07 +0000)]
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).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35406 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd URL to Lua website. Whitespace cleanup.
jake [Thu, 6 Jan 2011 20:29:05 +0000 (20:29 +0000)]
Add URL to Lua website. Whitespace cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35405 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMore minor cleanup/fixes for MS Active Directory's use of CLDAP.
sfisher [Thu, 6 Jan 2011 18:50:39 +0000 (18:50 +0000)]
More minor cleanup/fixes for MS Active Directory's use of CLDAP.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35404 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMinor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits
sfisher [Thu, 6 Jan 2011 18:08:14 +0000 (18:08 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35403 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoGEOIP_COUNTRY_EDITION_V6 isn't guaranteed to be defined.
gerald [Thu, 6 Jan 2011 17:19:20 +0000 (17:19 +0000)]
GEOIP_COUNTRY_EDITION_V6 isn't guaranteed to be defined.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35402 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoWhen showing a DNS query response containing a SRV record, display items
sfisher [Thu, 6 Jan 2011 17:15:50 +0000 (17:15 +0000)]
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35401 f5534014-38df-0310-8fa8-9805f1628bb7

13 years ago(After discussion on -dev) revert 35393: the old code is faster (and it is safe).
morriss [Thu, 6 Jan 2011 16:08:56 +0000 (16:08 +0000)]
(After discussion on -dev) revert 35393: the old code is faster (and it is safe).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35400 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agostrtoull() doesn't exist on Windows, use g_ascii_strtoull() instead.
morriss [Thu, 6 Jan 2011 15:02:46 +0000 (15:02 +0000)]
strtoull() doesn't exist on Windows, use g_ascii_strtoull() instead.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35399 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse tvb_memeql() instead of memcmp()+tvb_get_ptr().
morriss [Thu, 6 Jan 2011 03:08:03 +0000 (03:08 +0000)]
Use tvb_memeql() instead of memcmp()+tvb_get_ptr().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35398 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoActually use proto_tree_add_item().
morriss [Thu, 6 Jan 2011 02:58:26 +0000 (02:58 +0000)]
Actually use proto_tree_add_item().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35397 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoThere's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_...
morriss [Thu, 6 Jan 2011 02:56:10 +0000 (02:56 +0000)]
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().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35396 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoThere's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_...
morriss [Thu, 6 Jan 2011 02:52:00 +0000 (02:52 +0000)]
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().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35395 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRather than creating strtoul{l} functions that can deal with possibly non-NULL
morriss [Thu, 6 Jan 2011 02:45:01 +0000 (02:45 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35394 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse tvb_get_ephemeral_stringz() instead of tvb_get_strsize() plus (sometimes multiple...
morriss [Thu, 6 Jan 2011 02:18:36 +0000 (02:18 +0000)]
Use tvb_get_ephemeral_stringz() instead of tvb_get_strsize() plus (sometimes multiple) calls to tvb_get_ptr().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35393 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRearrange the Intenals and Help menu somewhat.
jake [Wed, 5 Jan 2011 23:12:51 +0000 (23:12 +0000)]
Rearrange the Intenals and Help menu somewhat.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35392 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoReset the global pdu_type *before* returning.
morriss [Wed, 5 Jan 2011 22:40:47 +0000 (22:40 +0000)]
Reset the global pdu_type *before* returning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35391 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove an unreached return.
morriss [Wed, 5 Jan 2011 22:33:25 +0000 (22:33 +0000)]
Remove an unreached return.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35390 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove a duplicate return.
morriss [Wed, 5 Jan 2011 22:27:41 +0000 (22:27 +0000)]
Remove a duplicate return.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35389 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove a break that makes other following statements unreached.
morriss [Wed, 5 Jan 2011 22:26:43 +0000 (22:26 +0000)]
Remove a break that makes other following statements unreached.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35388 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove unreached statement.
morriss [Wed, 5 Jan 2011 22:20:39 +0000 (22:20 +0000)]
Remove unreached statement.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35387 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoReplace 2 switch()es with duplicated values (but missing most of the case statements...
morriss [Wed, 5 Jan 2011 22:17:33 +0000 (22:17 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35386 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUpdate manuf, which the auto-update script has been missing for the past
gerald [Wed, 5 Jan 2011 19:35:08 +0000 (19:35 +0000)]
Update manuf, which the auto-update script has been missing for the past
few weeks.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35385 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse some tvb_ accessor functions instead of a standard function plus tvb_get_ptr().
morriss [Wed, 5 Jan 2011 18:59:47 +0000 (18:59 +0000)]
Use some tvb_ accessor functions instead of a standard function plus tvb_get_ptr().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35384 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoHandling a too-long length should be handled better.
guy [Wed, 5 Jan 2011 17:59:50 +0000 (17:59 +0000)]
Handling a too-long length should be handled better.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35383 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix (legitimate) warning.
guy [Wed, 5 Jan 2011 17:38:03 +0000 (17:38 +0000)]
Fix (legitimate) warning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35382 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse proto_tree_add_item() to add some FT_BYTES to the tree instead of calling proto_t...
morriss [Wed, 5 Jan 2011 17:28:17 +0000 (17:28 +0000)]
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'.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35381 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Steve Huston: add support for AMQP 0-10.
guy [Wed, 5 Jan 2011 17:19:48 +0000 (17:19 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35380 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't pass the result of tvb_get_ptr() into a %s format string: the string may
morriss [Wed, 5 Jan 2011 17:16:29 +0000 (17:16 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35379 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoEnhance IE dissection.
etxrab [Wed, 5 Jan 2011 16:46:40 +0000 (16:46 +0000)]
Enhance IE dissection.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35378 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't pass the result of tvb_get_ptr() into a %s format string: the string may
morriss [Wed, 5 Jan 2011 15:23:53 +0000 (15:23 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35377 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't pass the result of tvb_get_ptr() into a %s format string: the string may
morriss [Wed, 5 Jan 2011 15:18:54 +0000 (15:18 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35376 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't pass the result of tvb_get_ptr() into a %s format string: the string may
morriss [Wed, 5 Jan 2011 15:11:32 +0000 (15:11 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35375 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove a stray debug printf().
martinm [Wed, 5 Jan 2011 14:45:31 +0000 (14:45 +0000)]
Remove a stray debug printf().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35374 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoSupport FP_R8 over ATM, plus a couple of other tidying-ups.
martinm [Wed, 5 Jan 2011 14:36:48 +0000 (14:36 +0000)]
Support FP_R8 over ATM, plus a couple of other tidying-ups.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35373 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoClean up the white space.
jake [Wed, 5 Jan 2011 07:31:46 +0000 (07:31 +0000)]
Clean up the white space.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35372 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUpdate the AUTHORS file
etxrab [Wed, 5 Jan 2011 07:27:41 +0000 (07:27 +0000)]
Update the AUTHORS file

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35371 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Francesco Fondelli:
etxrab [Wed, 5 Jan 2011 07:16:09 +0000 (07:16 +0000)]
From Francesco Fondelli:
RSVP: support for Vendor Private objects, RFC 3936
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5468

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35370 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoPut end-of-field-table checks back into dissect_amqp_field_table().
guy [Wed, 5 Jan 2011 06:11:10 +0000 (06:11 +0000)]
Put end-of-field-table checks back into dissect_amqp_field_table().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35369 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse reported length (instead of the captured length) when dissecting error
morriss [Wed, 5 Jan 2011 03:40:02 +0000 (03:40 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35368 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoReverse r34810 other than the comment because the re-ordering of dns_types[]
sfisher [Wed, 5 Jan 2011 00:48:40 +0000 (00:48 +0000)]
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"

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35367 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoWhen generating a tvb subset for chunks, parameters, and error causes, set the:
morriss [Tue, 4 Jan 2011 23:07:32 +0000 (23:07 +0000)]
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).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35366 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDrop Python dissectors directory flag from programs that don't have dissectors.
jake [Tue, 4 Jan 2011 22:12:25 +0000 (22:12 +0000)]
Drop Python dissectors directory flag from programs that don't have dissectors.
Win32: remove superfluous dumpcap build dependancy on wiretap.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35365 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCheck hf entries *after* removing comments (in case there are commented-out entries).
morriss [Tue, 4 Jan 2011 18:48:26 +0000 (18:48 +0000)]
Check hf entries *after* removing comments (in case there are commented-out entries).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35364 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDetect (and error on) NULL or empty abbreviations. Wireshark aborts on the former...
morriss [Tue, 4 Jan 2011 18:43:24 +0000 (18:43 +0000)]
Detect (and error on) NULL or empty abbreviations.  Wireshark aborts on the former and warns on the latter.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35363 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoGive a couple of fields abbreviations.
morriss [Tue, 4 Jan 2011 18:41:25 +0000 (18:41 +0000)]
Give a couple of fields abbreviations.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35362 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMaeke use of dissect_e212_mcc_mnc_ep_str().
etxrab [Tue, 4 Jan 2011 16:58:55 +0000 (16:58 +0000)]
Maeke use of dissect_e212_mcc_mnc_ep_str().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35361 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoIntroduce dissect_e212_mcc_mnc_ep_str()
etxrab [Tue, 4 Jan 2011 16:58:07 +0000 (16:58 +0000)]
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35360 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5544 :
morriss [Tue, 4 Jan 2011 15:39:12 +0000 (15:39 +0000)]
From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5544 :

Include the packet-ipv6.h changes too.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35359 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix build.
etxrab [Tue, 4 Jan 2011 08:45:03 +0000 (08:45 +0000)]
Fix build.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35358 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't use DISSECTOR_ASSERT() to catch malformed packets. Fixes bug
guy [Tue, 4 Jan 2011 08:04:27 +0000 (08:04 +0000)]
Don't use DISSECTOR_ASSERT() to catch malformed packets.  Fixes bug
4048.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35357 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoInstead of going over the Report segment twice, once to get the fields
guy [Tue, 4 Jan 2011 07:48:28 +0000 (07:48 +0000)]
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.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35356 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Alexis La Goutte:
jake [Tue, 4 Jan 2011 07:44:39 +0000 (07:44 +0000)]
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
- ...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35355 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd more info to the tree.
etxrab [Tue, 4 Jan 2011 07:14:11 +0000 (07:14 +0000)]
Add more info to the tree.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35354 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFree dumpcap from linking to wiretap.
jake [Tue, 4 Jan 2011 07:06:01 +0000 (07:06 +0000)]
Free dumpcap from linking to wiretap.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35353 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoPrettify dissection of User Location Info (ULI). (Complete)
etxrab [Mon, 3 Jan 2011 23:21:49 +0000 (23:21 +0000)]
Prettify dissection of User Location Info (ULI). (Complete)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35352 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoPrettify dissection of User Location Info (ULI).
etxrab [Mon, 3 Jan 2011 22:13:11 +0000 (22:13 +0000)]
Prettify dissection of User Location Info (ULI).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35351 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Hadar Shoham:
jake [Mon, 3 Jan 2011 21:40:03 +0000 (21:40 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35350 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoState in the developer documentation that the tvb_fake_unicode() and
sfisher [Mon, 3 Jan 2011 19:37:13 +0000 (19:37 +0000)]
State in the developer documentation that the tvb_fake_unicode() and
tvb_get_ephemeral_fake_unicode() functions have been superceded by
tvb_get_unicode_string() and tvb_get_ephemeral_unicode_string() respectivey.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35349 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove the other use of tvb_fake_unicode() from the DCE/RPC dissector and
sfisher [Mon, 3 Jan 2011 19:28:52 +0000 (19:28 +0000)]
Remove the other use of tvb_fake_unicode() from the DCE/RPC dissector and
replace it with tvb_get_unicode_string().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35348 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix (or at least quiet Valgrind about) https://bugs.wireshark.org/bugzilla/show_bug...
morriss [Mon, 3 Jan 2011 18:48:29 +0000 (18:48 +0000)]
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().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35347 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoSwitch one of the places in the DCERPC dissector from using
sfisher [Mon, 3 Jan 2011 18:33:58 +0000 (18:33 +0000)]
Switch one of the places in the DCERPC dissector from using
tvb_fake_unicode() to tvb_get_unicode_string().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35346 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDocument new tvb_get_unicode_string() and tvb_get_ephemeral_string()
sfisher [Mon, 3 Jan 2011 18:33:02 +0000 (18:33 +0000)]
Document new tvb_get_unicode_string() and tvb_get_ephemeral_string()
functions.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35345 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoIntroduce two new functions for Unicode (UTF-16) string handling:
sfisher [Mon, 3 Jan 2011 18:29:29 +0000 (18:29 +0000)]
Introduce two new functions for Unicode (UTF-16) string handling:

tvb_get_unicode_string()
tvb_get_ephemeral_unicode_string()

These function like their counterparts, tvb_get_string and
tvb_get_epemeral_string, for standard strings.

Also update comment on what the first such function,
tvb_get_ephemeral_unicode_stringz does regarding updating lengthp.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35344 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoPartially fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5542 :
morriss [Mon, 3 Jan 2011 17:55:23 +0000 (17:55 +0000)]
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().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35343 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5537 :
morriss [Mon, 3 Jan 2011 17:37:41 +0000 (17:37 +0000)]
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).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35342 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMark unused parameters as such.
etxrab [Mon, 3 Jan 2011 17:32:15 +0000 (17:32 +0000)]
Mark unused parameters as such.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35341 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMark unused parameters as such.
etxrab [Mon, 3 Jan 2011 17:30:35 +0000 (17:30 +0000)]
Mark unused parameters as such.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35340 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoComment out a faulty line.
etxrab [Mon, 3 Jan 2011 17:26:12 +0000 (17:26 +0000)]
Comment out a faulty line.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35339 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoEnhance IE dissection and a number of bug fixes.
etxrab [Mon, 3 Jan 2011 17:22:02 +0000 (17:22 +0000)]
Enhance IE dissection and a number of bug fixes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35338 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoWe must always return an error code on an error; otherwise, our caller
guy [Mon, 3 Jan 2011 09:17:20 +0000 (09:17 +0000)]
We must always return an error code on an error; otherwise, our caller
will see random crap as the error code.

However, if we're skipping a "TCPIPTRACE-W-BUFFERSFUL" error, if the
"error" we get is an end-of-file indication, that's *not* an error.

It is, however, ultimately a "we dropped some packets" indication; add a
comment noting that we should eventually treat it as such.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35337 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoPut the query list items under the top-level query list item (which
guy [Mon, 3 Jan 2011 08:31:45 +0000 (08:31 +0000)]
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).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35336 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoIf we have no value to dissect, because the AVP has the wrong length for
guy [Mon, 3 Jan 2011 08:21:35 +0000 (08:21 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35335 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd relevant docbook tags in the source.
jake [Mon, 3 Jan 2011 07:41:33 +0000 (07:41 +0000)]
Add relevant docbook tags in the source.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35334 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoInclude dumpcap in the description.
jake [Mon, 3 Jan 2011 07:40:21 +0000 (07:40 +0000)]
Include dumpcap in the description.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35333 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDo length checking for Integer32, Integer64, Unsigned64, Float32, and
guy [Mon, 3 Jan 2011 03:30:20 +0000 (03:30 +0000)]
Do length checking for Integer32, Integer64, Unsigned64, Float32, and
Float64, as well as for Unsigned32.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35332 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoNote that this is ultimately not necessarily the right fix.
guy [Sun, 2 Jan 2011 21:49:00 +0000 (21:49 +0000)]
Note that this is ultimately not necessarily the right fix.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35331 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFor those cases where we interpret the contents of an OCTET STRING,
guy [Sun, 2 Jan 2011 21:27:57 +0000 (21:27 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35330 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix indentation.
guy [Sun, 2 Jan 2011 19:53:48 +0000 (19:53 +0000)]
Fix indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35329 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix some cut-and-pasteos and other typoes.
guy [Sun, 2 Jan 2011 19:39:24 +0000 (19:39 +0000)]
Fix some cut-and-pasteos and other typoes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35328 f5534014-38df-0310-8fa8-9805f1628bb7

13 years ago[Automatic manuf, services and enterprise-numbers update for 2011-01-02]
gerald [Sun, 2 Jan 2011 16:03:26 +0000 (16:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-01-02]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35325 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd missing packet-btsdp.h
krj [Sun, 2 Jan 2011 08:29:33 +0000 (08:29 +0000)]
Add missing packet-btsdp.h

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35324 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Allan M. Madsen via. bug 5445:
krj [Sun, 2 Jan 2011 08:13:40 +0000 (08:13 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35323 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoNew Year.
stig [Sat, 1 Jan 2011 12:23:21 +0000 (12:23 +0000)]
New Year.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35322 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd packet-json.c
krj [Sat, 1 Jan 2011 09:42:12 +0000 (09:42 +0000)]
Add packet-json.c

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35321 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUpdate some URLs, add another spec.
guy [Fri, 31 Dec 2010 23:30:38 +0000 (23:30 +0000)]
Update some URLs, add another spec.

At least for one of the DOCSIS suboptions, do length checking.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35320 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoA Query List has more than one has multiple QCODEs; you cannot handle
guy [Fri, 31 Dec 2010 22:28:57 +0000 (22:28 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35319 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom FRAsse via bug 5539:
gerald [Fri, 31 Dec 2010 22:24:06 +0000 (22:24 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35318 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Jakub Zawadzki via bug 4753: New dissector: JSON, w/minor changes by me:
cmaynard [Fri, 31 Dec 2010 18:03:23 +0000 (18:03 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35317 f5534014-38df-0310-8fa8-9805f1628bb7