obnox/wireshark/wip.git
13 years agoAdd 2869 to the list of HTTP ports: http://support.microsoft.com/kb/886257
gerald [Mon, 10 Jan 2011 20:23:21 +0000 (20:23 +0000)]
Add 2869 to the list of HTTP ports: support.microsoft.com/kb/886257

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

13 years agoAdd an expert item about not dissected IE's
etxrab [Mon, 10 Jan 2011 19:48:15 +0000 (19:48 +0000)]
Add an expert item about not dissected IE's

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

13 years agoShorten long winded strings.
etxrab [Mon, 10 Jan 2011 17:34:00 +0000 (17:34 +0000)]
Shorten long winded strings.

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

13 years agoRevert back to NSIS from NSIS Unicode to resolve bug 5558.
cmaynard [Mon, 10 Jan 2011 16:27:09 +0000 (16:27 +0000)]
Revert back to NSIS from NSIS Unicode to resolve bug 5558.

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

13 years agoMove some DISSECTOR_SRC & DISSECTOR_INCLUDES entries so they are (more or less) in...
wmeier [Mon, 10 Jan 2011 15:19:18 +0000 (15:19 +0000)]
Move some DISSECTOR_SRC & DISSECTOR_INCLUDES entries so they are (more or less) in alpha order.

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

13 years agoRevert 35447 and 35364: remove comments and strings in one regex (so it doesn't get...
morriss [Mon, 10 Jan 2011 14:43:29 +0000 (14:43 +0000)]
Revert 35447 and 35364: remove comments and strings in one regex (so it doesn't get confused by things like /* inside a string).  And don't remove comments+strings before checking the hf's.

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

13 years agoGive a couple commented-out hf's abbreviations (to keep checkAPIs happy).
morriss [Mon, 10 Jan 2011 14:40:10 +0000 (14:40 +0000)]
Give a couple commented-out hf's abbreviations (to keep checkAPIs happy).

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

13 years agoIntroduce match_strval_idx_ext()
etxrab [Mon, 10 Jan 2011 14:31:33 +0000 (14:31 +0000)]
Introduce match_strval_idx_ext()

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

13 years agoAdd application/vnd.3gpp.cw+xml
etxrab [Mon, 10 Jan 2011 12:28:56 +0000 (12:28 +0000)]
Add application/vnd.3gpp.cw+xml

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

13 years agoClean up the blurbs indicated by checkAPIs.
jake [Mon, 10 Jan 2011 07:39:15 +0000 (07:39 +0000)]
Clean up the blurbs indicated by checkAPIs.

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

13 years agoSimplified a #ifdef __WIN32.
stig [Mon, 10 Jan 2011 07:01:23 +0000 (07:01 +0000)]
Simplified a #ifdef __WIN32.

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

13 years agoRemove the comments and strings separately so that we can check the hf's when the...
morriss [Mon, 10 Jan 2011 03:04:26 +0000 (03:04 +0000)]
Remove the comments and strings separately so that we can check the hf's when the comments are gone but the strings are not.

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

13 years agoGive CSID an abbreviation.
morriss [Mon, 10 Jan 2011 03:02:43 +0000 (03:02 +0000)]
Give CSID an abbreviation.

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

13 years agoMake comment a real comment, trying to fix the buildbot.
jake [Sun, 9 Jan 2011 22:34:20 +0000 (22:34 +0000)]
Make comment a real comment, trying to fix the buildbot.

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

13 years agoAdd the graphic files to the distribution.
jake [Sun, 9 Jan 2011 22:17:14 +0000 (22:17 +0000)]
Add the graphic files to the distribution.

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

13 years agoUpdate the pop-up menu screen shots.
jake [Sun, 9 Jan 2011 21:59:00 +0000 (21:59 +0000)]
Update the pop-up menu screen shots.

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

13 years agoUpdate value_strings
etxrab [Sun, 9 Jan 2011 20:41:19 +0000 (20:41 +0000)]
Update value_strings

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

13 years agoUpdate the menu screenshots and descriptions.
jake [Sun, 9 Jan 2011 19:44:21 +0000 (19:44 +0000)]
Update the menu screenshots and descriptions.

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

13 years agoMore field related fixes.
etxrab [Sun, 9 Jan 2011 19:37:35 +0000 (19:37 +0000)]
More field related fixes.

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

13 years agoFix:
etxrab [Sun, 9 Jan 2011 19:17:39 +0000 (19:17 +0000)]
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

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

13 years agoFix:
etxrab [Sun, 9 Jan 2011 19:15:11 +0000 (19:15 +0000)]
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

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

13 years agoAdd 26 Link-local Address Option.
etxrab [Sun, 9 Jan 2011 17:49:31 +0000 (17:49 +0000)]
Add 26 Link-local Address Option.
Comments and whitespace changes.

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

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

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

13 years agoPut sgsap in the right place.
etxrab [Sun, 9 Jan 2011 13:50:41 +0000 (13:50 +0000)]
Put sgsap in the right place.

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

13 years agoGet rid of check_col().
etxrab [Sun, 9 Jan 2011 13:50:03 +0000 (13:50 +0000)]
Get rid of check_col().

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

13 years agoTry to fix:
etxrab [Sat, 8 Jan 2011 20:26:35 +0000 (20:26 +0000)]
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

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

13 years agoFurther IE dissection updates.
etxrab [Sat, 8 Jan 2011 20:09:29 +0000 (20:09 +0000)]
Further IE dissection updates.

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

13 years agoFrom H.sivank:
guy [Sat, 8 Jan 2011 18:46:01 +0000 (18:46 +0000)]
From H.sivank:

-A patch to fix configure with cmake with macports libs.
(gdk-pixbuf has now its own port. Location of headers has
changed.)

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

13 years agoFrom H.sivank:
guy [Sat, 8 Jan 2011 18:44:21 +0000 (18:44 +0000)]
From H.sivank:

-A patch to allow drag and drop on wireshark icon doc.
It does not require old(Carbon) ScriptExec.

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

13 years agoUse report_failure() to report problems reading the RADIUS dictionary,
guy [Sat, 8 Jan 2011 17:06:04 +0000 (17:06 +0000)]
Use report_failure() to report problems reading the RADIUS dictionary,
so it shows up in the GUI in Wireshark.

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

13 years agoIf the lack of a peer conversation is a bug, use one of the
guy [Sat, 8 Jan 2011 16:40:46 +0000 (16:40 +0000)]
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.

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

13 years agoAdd "tcp.window_size_value" and "tcp.window_size_scalefactor" conform
sake [Sat, 8 Jan 2011 15:51:38 +0000 (15:51 +0000)]
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".

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

13 years agoAppend text to INFO column. Closes out bug 4472.
cmaynard [Fri, 7 Jan 2011 19:22:09 +0000 (19:22 +0000)]
Append text to INFO column.  Closes out bug 4472.

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

13 years agoDon't try to display a string in BASE_DEC. Also delete duplicate registration of...
morriss [Fri, 7 Jan 2011 19:01:17 +0000 (19:01 +0000)]
Don't try to display a string in BASE_DEC.  Also delete duplicate registration of hf_gtpv2_pti.

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

13 years agodeclare_wslua.h is built, so we need to also search in the wslua build directory...
morriss [Fri, 7 Jan 2011 18:32:17 +0000 (18:32 +0000)]
declare_wslua.h is built, so we need to also search in the wslua build directory for it.  (This fixes out-of-source-tree builds with Lua.)

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

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