metze/wireshark/wip.git
13 years agoTell the user about the Q&A site.
Jaap Keuter [Thu, 6 Jan 2011 23:34:46 +0000 (23:34 -0000)]
Tell the user about the Q&A site.

svn path=/trunk/; revision=35412

13 years agoOn Windows, convert all of our command-line arguments from UTF-16 to
Gerald Combs [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.

svn path=/trunk/; revision=35411

13 years agoProhibit strtoull(): Windows doesn't have it. (Putting this in just saves waiting...
Jeff 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.)

svn path=/trunk/; revision=35410

13 years agoLet's discourage the use of g_warning in dissectors. Either use one of
Guy Harris [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".

svn path=/trunk/; revision=35409

13 years agoDon't use g_warning() - either you have a dissector bug, and should use
Guy Harris [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.)

svn path=/trunk/; revision=35408

13 years agoMore misc. CLDAP improvements for Active Directory including updating
Stephen Fisher [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.

svn path=/trunk/; revision=35407

13 years agoFix the fuzz failure in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5550 :
Jeff 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).

svn path=/trunk/; revision=35406

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

svn path=/trunk/; revision=35405

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

svn path=/trunk/; revision=35404

13 years agoMinor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits
Stephen Fisher [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.

svn path=/trunk/; revision=35403

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

svn path=/trunk/; revision=35402

13 years agoWhen showing a DNS query response containing a SRV record, display items
Stephen Fisher [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

svn path=/trunk/; revision=35401

13 years ago(After discussion on -dev) revert 35393: the old code is faster (and it is safe).
Jeff 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).

svn path=/trunk/; revision=35400

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

svn path=/trunk/; revision=35399

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

svn path=/trunk/; revision=35398

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

svn path=/trunk/; revision=35397

13 years agoThere's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_...
Jeff 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().

svn path=/trunk/; revision=35396

13 years agoThere's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_...
Jeff 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().

svn path=/trunk/; revision=35395

13 years agoRather than creating strtoul{l} functions that can deal with possibly non-NULL
Jeff 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.

svn path=/trunk/; revision=35394

13 years agoUse tvb_get_ephemeral_stringz() instead of tvb_get_strsize() plus (sometimes multiple...
Jeff 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().

svn path=/trunk/; revision=35393

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

svn path=/trunk/; revision=35392

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

svn path=/trunk/; revision=35391

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

svn path=/trunk/; revision=35390

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

svn path=/trunk/; revision=35389

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

svn path=/trunk/; revision=35388

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

svn path=/trunk/; revision=35387

13 years agoReplace 2 switch()es with duplicated values (but missing most of the case statements...
Jeff 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.

svn path=/trunk/; revision=35386

13 years agoUpdate manuf, which the auto-update script has been missing for the past
Gerald Combs [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.

svn path=/trunk/; revision=35385

13 years agoUse some tvb_ accessor functions instead of a standard function plus tvb_get_ptr().
Jeff 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().

svn path=/trunk/; revision=35384

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

svn path=/trunk/; revision=35383

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

svn path=/trunk/; revision=35382

13 years agoUse proto_tree_add_item() to add some FT_BYTES to the tree instead of calling proto_t...
Jeff 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'.

svn path=/trunk/; revision=35381

13 years agoFrom Steve Huston: add support for AMQP 0-10.
Guy Harris [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.

svn path=/trunk/; revision=35380

13 years agoDon't pass the result of tvb_get_ptr() into a %s format string: the string may
Jeff 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.

svn path=/trunk/; revision=35379

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

svn path=/trunk/; revision=35378

13 years agoDon't pass the result of tvb_get_ptr() into a %s format string: the string may
Jeff 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.

svn path=/trunk/; revision=35377

13 years agoDon't pass the result of tvb_get_ptr() into a %s format string: the string may
Jeff 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.

svn path=/trunk/; revision=35376

13 years agoDon't pass the result of tvb_get_ptr() into a %s format string: the string may
Jeff 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.

svn path=/trunk/; revision=35375

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

svn path=/trunk/; revision=35374

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

svn path=/trunk/; revision=35373

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

svn path=/trunk/; revision=35372

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

svn path=/trunk/; revision=35371

13 years agoFrom Francesco Fondelli:
Anders Broman [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

svn path=/trunk/; revision=35370

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

svn path=/trunk/; revision=35369

13 years agoUse reported length (instead of the captured length) when dissecting error
Jeff 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.

svn path=/trunk/; revision=35368

13 years agoReverse r34810 other than the comment because the re-ordering of dns_types[]
Stephen Fisher [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"

svn path=/trunk/; revision=35367

13 years agoWhen generating a tvb subset for chunks, parameters, and error causes, set the:
Jeff 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).

svn path=/trunk/; revision=35366

13 years agoDrop Python dissectors directory flag from programs that don't have dissectors.
Jaap Keuter [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.

svn path=/trunk/; revision=35365

13 years agoCheck hf entries *after* removing comments (in case there are commented-out entries).
Jeff 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).

svn path=/trunk/; revision=35364

13 years agoDetect (and error on) NULL or empty abbreviations. Wireshark aborts on the former...
Jeff 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.

svn path=/trunk/; revision=35363

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

svn path=/trunk/; revision=35362

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

svn path=/trunk/; revision=35361

13 years agoIntroduce dissect_e212_mcc_mnc_ep_str()
Anders Broman [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

svn path=/trunk/; revision=35360

13 years agoFrom Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5544 :
Jeff 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.

svn path=/trunk/; revision=35359

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

svn path=/trunk/; revision=35358

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

svn path=/trunk/; revision=35357

13 years agoInstead of going over the Report segment twice, once to get the fields
Guy Harris [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.)

svn path=/trunk/; revision=35356

13 years agoFrom Alexis La Goutte:
Jaap Keuter [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
- ...

svn path=/trunk/; revision=35355

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

svn path=/trunk/; revision=35354

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

svn path=/trunk/; revision=35353

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

svn path=/trunk/; revision=35352

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

svn path=/trunk/; revision=35351

13 years agoFrom Hadar Shoham:
Jaap Keuter [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.

svn path=/trunk/; revision=35350

13 years agoState in the developer documentation that the tvb_fake_unicode() and
Stephen Fisher [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.

svn path=/trunk/; revision=35349

13 years agoRemove the other use of tvb_fake_unicode() from the DCE/RPC dissector and
Stephen Fisher [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().

svn path=/trunk/; revision=35348

13 years agoFix (or at least quiet Valgrind about) https://bugs.wireshark.org/bugzilla/show_bug...
Jeff 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().

svn path=/trunk/; revision=35347

13 years agoSwitch one of the places in the DCERPC dissector from using
Stephen Fisher [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().

svn path=/trunk/; revision=35346

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

svn path=/trunk/; revision=35345

13 years agoIntroduce two new functions for Unicode (UTF-16) string handling:
Stephen Fisher [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.

svn path=/trunk/; revision=35344

13 years agoPartially fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5542 :
Jeff 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().

svn path=/trunk/; revision=35343

13 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5537 :
Jeff 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).

svn path=/trunk/; revision=35342

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

svn path=/trunk/; revision=35341

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

svn path=/trunk/; revision=35340

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

svn path=/trunk/; revision=35339

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

svn path=/trunk/; revision=35338

13 years agoWe must always return an error code on an error; otherwise, our caller
Guy Harris [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.

svn path=/trunk/; revision=35337

13 years agoPut the query list items under the top-level query list item (which
Guy Harris [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).

svn path=/trunk/; revision=35336

13 years agoIf we have no value to dissect, because the AVP has the wrong length for
Guy Harris [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.

svn path=/trunk/; revision=35335

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

svn path=/trunk/; revision=35334

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

svn path=/trunk/; revision=35333

13 years agoDo length checking for Integer32, Integer64, Unsigned64, Float32, and
Guy Harris [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.

svn path=/trunk/; revision=35332

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

svn path=/trunk/; revision=35331

13 years agoFor those cases where we interpret the contents of an OCTET STRING,
Guy Harris [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.

svn path=/trunk/; revision=35330

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

svn path=/trunk/; revision=35329

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

svn path=/trunk/; revision=35328

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

svn path=/trunk/; revision=35325

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

svn path=/trunk/; revision=35324

13 years agoFrom Allan M. Madsen via. bug 5445:
Kovarththanan Rajaratnam [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.

svn path=/trunk/; revision=35323

13 years agoNew Year.
Stig Bjørlykke [Sat, 1 Jan 2011 12:23:21 +0000 (12:23 -0000)]
New Year.

svn path=/trunk/; revision=35322

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

svn path=/trunk/; revision=35321

13 years agoUpdate some URLs, add another spec.
Guy Harris [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.

svn path=/trunk/; revision=35320

13 years agoA Query List has more than one has multiple QCODEs; you cannot handle
Guy Harris [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.

svn path=/trunk/; revision=35319

13 years agoFrom FRAsse via bug 5539:
Gerald Combs [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.

svn path=/trunk/; revision=35318

13 years agoFrom Jakub Zawadzki via bug 4753: New dissector: JSON, w/minor changes by me:
Chris Maynard [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.

svn path=/trunk/; revision=35317

13 years agoWhops, packet-sgsap.c is not ASN1.
Stig Bjørlykke [Fri, 31 Dec 2010 16:25:53 +0000 (16:25 -0000)]
Whops, packet-sgsap.c is not ASN1.

svn path=/trunk/; revision=35316

13 years agoAdded missing packet-sgsap.c
Stig Bjørlykke [Fri, 31 Dec 2010 16:24:24 +0000 (16:24 -0000)]
Added missing packet-sgsap.c

svn path=/trunk/; revision=35315

13 years agoAdd current list of ROHC profile names, taken from:
Martin Mathieson [Fri, 31 Dec 2010 00:24:50 +0000 (00:24 -0000)]
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

13 years agoIt's not a good idea to use tcph->th_seglen if you haven't set it.
Guy Harris [Fri, 31 Dec 2010 00:02:54 +0000 (00:02 -0000)]
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

13 years agoUpdate the export dialog screen shots.
Gerald Combs [Thu, 30 Dec 2010 20:22:42 +0000 (20:22 -0000)]
Update the export dialog screen shots.

svn path=/trunk/; revision=35312

13 years agoCorrected comment for col_custom_occurrence.
Stig Bjørlykke [Thu, 30 Dec 2010 20:16:33 +0000 (20:16 -0000)]
Corrected comment for col_custom_occurrence.

svn path=/trunk/; revision=35311