8 years agoFrom Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5713 :
morriss [Wed, 23 Feb 2011 17:31:03 +0000 (17:31 +0000)]
From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5713 :

Enhance RIPng
* Replace tvb_memcpy/proto_tree_add_text by proto_tree_add_item
* Remove dependency to packet-ipv6.h
* Remove packet-ripng.h (not needed)

Also update AUTHORS file

From me:
Put a check_col() back and reword (shorten) a couple of the new blurbs.

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

8 years agoFrom Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5713 :
morriss [Wed, 23 Feb 2011 17:00:20 +0000 (17:00 +0000)]
From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5713 :

Enhance PIM
* Replace struct ip6_hdr/tvb_m by tvb_ip6_to_str
* Remove dependency to packet-ipv6.h

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

8 years agoFrom Alexis La Goutte:
etxrab [Wed, 23 Feb 2011 13:51:49 +0000 (13:51 +0000)]
From Alexis La Goutte:
Cleanup packet-ipv6.h and dependency.

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

8 years agoSplit get_dns_name() into get_dns_name() and expand_dns_name().
gerald [Wed, 23 Feb 2011 00:51:02 +0000 (00:51 +0000)]
Split get_dns_name() into get_dns_name() and expand_dns_name().

In dissect_ms_compressed_string() dissect_mscldap_string() simply call
expand_dns_name() instead of using duplicate (and insecure) code. This
*might* break CLDAP and SMB dissection. If that's the case we should
probably revert get_dns_name() and simplify expand_dns_name().

Fixes infinite recursion errors found by joernchen of Phenoelit.

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

8 years agoFix for bug 5702:
jake [Tue, 22 Feb 2011 21:19:13 +0000 (21:19 +0000)]
Fix for bug 5702:
In RFC 5102 (for IPFIX), id=128 is defined as "bgpNextAdjacentAsNumber" which
is DST_AS_PEER and id=129 as "bgpPrevAdjacentAsNumber" which is SRC_AS_PEER.

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

8 years agoFrom Pascal Quantin:
etxrab [Tue, 22 Feb 2011 11:56:10 +0000 (11:56 +0000)]
From Pascal Quantin:
[3GPP protocols] Prettify the display of Mandatory Value information elements


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

8 years agoEnsure we always have a valid top_tree for p1.content. This fixes a problem
stig [Tue, 22 Feb 2011 10:23:44 +0000 (10:23 +0000)]
Ensure we always have a valid top_tree for p1.content.  This fixes a problem
with other dissectors using p1.content, such as p7.

Reset global content_type_id so this will be correct in more cases.
This is still not a good solution, because ContentType and Content are
generic objects which may occur individual in P7.

Indicate when to report invalid content-type.

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

8 years agoFrom Roland Knall:
jake [Mon, 21 Feb 2011 21:33:54 +0000 (21:33 +0000)]
From Roland Knall:
WS_MSVC_NORETURN is undeclared under a non-Windows operating system, which
breaks compilation in the files epan/except.c and dumpcap.c as well as any
file including epan/except.h

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

8 years agoFrom Yaniv Kaul:
jake [Mon, 21 Feb 2011 21:12:21 +0000 (21:12 +0000)]
From Yaniv Kaul:
This one parses the extended desktop size pseudo-encoding, as specified in

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

8 years agoFix a typo.
gerald [Mon, 21 Feb 2011 18:42:19 +0000 (18:42 +0000)]
Fix a typo.

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

8 years agoPrevious UL frame may be 8 OR 16 subframes ago.
martinm [Mon, 21 Feb 2011 14:43:16 +0000 (14:43 +0000)]
Previous UL frame may be 8 OR 16 subframes ago.

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

8 years agoAdded enclosure_item_flags assignment cast.
stig [Mon, 21 Feb 2011 11:36:50 +0000 (11:36 +0000)]
Added enclosure_item_flags assignment cast.

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

8 years agoAdded reassembly of segmented SES packages.
stig [Mon, 21 Feb 2011 11:00:19 +0000 (11:00 +0000)]
Added reassembly of segmented SES packages.
X.225 7.37.1 states that an end SSDU may or may not contain User Data.

This is a fix for bug 5678.

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

8 years agoFrom: Holger Hans Peter Freyther
etxrab [Sun, 20 Feb 2011 18:56:52 +0000 (18:56 +0000)]
From: Holger Hans Peter Freyther

The protocol has a simple addition to provide the InService and
OutOfService notification for a MTPL2 link inside the protocol. This
patch adds these types to the type field, stops handing empty packages
to the MTPL3 dissector and fills out the COL_INFO with the type of
the packet.

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

8 years agoFrom Alexis La Goutte:
etxrab [Sun, 20 Feb 2011 18:51:59 +0000 (18:51 +0000)]
From Alexis La Goutte:
Patch 3 :

Enhance "Header" Tag Element (replace value_string tag_num_vals[] by
range_string tag_num_vals[]...)
Enhance TIM, IBSS, Country Info, (Q)BSS Load, FH Hopping Parameter...


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

8 years agoRenamed x411 to p1, x420 to p22 and s4406 to p772 to be consistent
stig [Sun, 20 Feb 2011 17:03:29 +0000 (17:03 +0000)]
Renamed x411 to p1, x420 to p22 and s4406 to p772 to be consistent
on the naming policy for X.400 protocols.

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

8 years ago[Automatic manuf, services and enterprise-numbers update for 2011-02-20]
gerald [Sun, 20 Feb 2011 16:03:38 +0000 (16:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-02-20]

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

8 years agoCapitalize protocol name.
stig [Sun, 20 Feb 2011 16:02:59 +0000 (16:02 +0000)]
Capitalize protocol name.

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

8 years agoAdd changes in r35546 to template and conformation file.
stig [Sun, 20 Feb 2011 15:05:21 +0000 (15:05 +0000)]
Add changes in r35546 to template and conformation file.

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

8 years agoAdd changes in r35384 to template file.
stig [Sun, 20 Feb 2011 15:03:09 +0000 (15:03 +0000)]
Add changes in r35384 to template file.

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

8 years agoSort capture file types listed by "-F" like editcap does.
cmaynard [Sat, 19 Feb 2011 22:01:14 +0000 (22:01 +0000)]
Sort capture file types listed by "-F" like editcap does.

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

8 years agoFix Visual C++ code analysis warnings.
gerald [Sat, 19 Feb 2011 00:05:12 +0000 (00:05 +0000)]
Fix Visual C++ code analysis warnings.

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

8 years agoFix some dead code and zero division issues found by Clang scan-build.
gerald [Fri, 18 Feb 2011 22:43:48 +0000 (22:43 +0000)]
Fix some dead code and zero division issues found by Clang scan-build.

In convert_string_case() use g_utf8_strup() instead of converting each
character by hand. Hopefully this won't cause any unexpected changes in

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

8 years agoTry to fix more Clang scan-build warnings.
gerald [Fri, 18 Feb 2011 21:44:06 +0000 (21:44 +0000)]
Try to fix more Clang scan-build warnings.

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

8 years agoFrom Roberto Morro via bug #5701: Change the PCEP dissector's port
sfisher [Fri, 18 Feb 2011 20:48:49 +0000 (20:48 +0000)]
From Roberto Morro via bug #5701: Change the PCEP dissector's port
from 1010 to the IANA assigned value of 4189.  From me: Add RFC 5440
to the list of references.

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

8 years agoTry to fix some Clan scan-build warnings.
gerald [Fri, 18 Feb 2011 19:57:18 +0000 (19:57 +0000)]
Try to fix some Clan scan-build warnings.

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

8 years agoFix a few errors found by Clang scan-build.
gerald [Fri, 18 Feb 2011 19:46:05 +0000 (19:46 +0000)]
Fix a few errors found by Clang scan-build.

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

8 years agoFrom Pascal Quantin:
etxrab [Fri, 18 Feb 2011 18:40:29 +0000 (18:40 +0000)]
From Pascal Quantin:
NAS EPS] Fix display of Authentication (Failure) Parameter IEs


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

8 years ago#if out some (currently) unused functions.
morriss [Fri, 18 Feb 2011 17:38:46 +0000 (17:38 +0000)]
#if out some (currently) unused functions.

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

8 years agoFrom Ivan Lawrow:
jake [Fri, 18 Feb 2011 08:02:53 +0000 (08:02 +0000)]
From Ivan Lawrow:
The Final CAP Slot field "wpan.cap" in the Superframe Specification for a
beacon is always displayed as zero.

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

8 years agoAdd more MSG dissection.
etxrab [Fri, 18 Feb 2011 07:00:03 +0000 (07:00 +0000)]
Add more MSG dissection.

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

8 years agoNope, the __declspec(noreturn) didn't suffice - either abort() isn't
guy [Fri, 18 Feb 2011 02:49:46 +0000 (02:49 +0000)]
Nope, the __declspec(noreturn) didn't suffice - either abort() isn't
declared as a noreturn function or declaring except_throw() as a
noreturn function isn't good enough.

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

8 years agoJust for fun, see whether using __declspec(noreturn) on the exception
guy [Fri, 18 Feb 2011 01:28:18 +0000 (01:28 +0000)]
Just for fun, see whether using __declspec(noreturn) on the exception
routines is sufficient to convince the Visual Studio code analyzer that
REPORT_DISSECTOR_BUG() never returns.  (That would probably require that
abort() be tagged with __declspec(noreturn); let's hope Microsoft did
the right thing there.)

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

8 years agoFix more Visual C++ analysis errors.
gerald [Fri, 18 Feb 2011 01:18:44 +0000 (01:18 +0000)]
Fix more Visual C++ analysis errors.

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

8 years agoDisable Code Analysis warning C6011 for now. Hopefully Clang can pick
gerald [Fri, 18 Feb 2011 00:33:35 +0000 (00:33 +0000)]
Disable Code Analysis warning C6011 for now. Hopefully Clang can pick
up the slack.

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

8 years agoPut WS_MSVC_NORETURN back.
gerald [Fri, 18 Feb 2011 00:08:03 +0000 (00:08 +0000)]

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

8 years agoconfig.h is now included, and it defines _WIN32_WINNT.
guy [Thu, 17 Feb 2011 23:36:39 +0000 (23:36 +0000)]
config.h is now included, and it defines _WIN32_WINNT.

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

8 years agoFix compilation on Windows.
gerald [Thu, 17 Feb 2011 23:35:46 +0000 (23:35 +0000)]
Fix compilation on Windows.

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

8 years agoAdd a hint for Visual C++ to DISSECTOR_ASSERT. Hopefully this will
gerald [Thu, 17 Feb 2011 23:21:07 +0000 (23:21 +0000)]
Add a hint for Visual C++ to DISSECTOR_ASSERT. Hopefully this will
reduce some of the /analyze false positives.

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

8 years agoOn Windows, try putting __declspec(noreturn) in front of declarations of
guy [Thu, 17 Feb 2011 23:11:49 +0000 (23:11 +0000)]
On Windows, try putting __declspec(noreturn) in front of declarations of
routines that don't return.  (This requires that some files include
config.h to get WS_MSVC_NORETURN declared properly.)

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

8 years agoFix some Visual C++ analysis warnings.
gerald [Thu, 17 Feb 2011 23:00:34 +0000 (23:00 +0000)]
Fix some Visual C++ analysis warnings.

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

8 years agoApparently, if the argument to the cd command in an nmake file contains
guy [Thu, 17 Feb 2011 21:21:40 +0000 (21:21 +0000)]
Apparently, if the argument to the cd command in an nmake file contains
spaces, it needs to be quoted, the fact that, if the argument to a cd
command typed at cmd.exe contains spaces, it *doesn't* need to be quoted

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

8 years agoFix gcc compilation errors.
gerald [Thu, 17 Feb 2011 20:31:11 +0000 (20:31 +0000)]
Fix gcc compilation errors.

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

8 years agoFix various Visual C++ analysis warnings.
gerald [Thu, 17 Feb 2011 19:43:16 +0000 (19:43 +0000)]
Fix various Visual C++ analysis warnings.

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

8 years agoDon't allocate a bunch of memory on the stack for strings that will be
gerald [Thu, 17 Feb 2011 19:28:30 +0000 (19:28 +0000)]
Don't allocate a bunch of memory on the stack for strings that will be
fed to col_append_fstr; columns have a maximum length of 240 characters
(ITEM_LABEL_LENGTH). Make sure our column text is properly formatted.

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

8 years agoFix dead initialization error found by clang:
sfisher [Thu, 17 Feb 2011 18:53:35 +0000 (18:53 +0000)]
Fix dead initialization error found by clang:

"Value stored to 's' during its initialization is never read"

(it's assigned by a later g_hash_table_lookup call)

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

8 years agoRemove some of the many dead assignments found by clang
sfisher [Thu, 17 Feb 2011 18:45:45 +0000 (18:45 +0000)]
Remove some of the many dead assignments found by clang

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

8 years agoIt wasn't complaining about that null pointer reference.
guy [Thu, 17 Feb 2011 18:43:38 +0000 (18:43 +0000)]
It wasn't complaining about that null pointer reference.

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

8 years agoFixed no_sua_assoc init.
stig [Thu, 17 Feb 2011 11:00:54 +0000 (11:00 +0000)]
Fixed no_sua_assoc init.

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

8 years ago- Introduce association tracking(might not work well with multihoming).
etxrab [Thu, 17 Feb 2011 10:13:05 +0000 (10:13 +0000)]
- Introduce association tracking(might not work well with multihoming).
- prefix hf variables with sua ( hf_sua...)

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

8 years agoIs there an SAL tag that says "this function never returns"?
guy [Thu, 17 Feb 2011 09:13:38 +0000 (09:13 +0000)]
Is there an SAL tag that says "this function never returns"?

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

8 years agoCan we reassure Microsoft's static analyzer that 0 <= mask <= 48?
guy [Thu, 17 Feb 2011 09:08:11 +0000 (09:08 +0000)]
Can we reassure Microsoft's static analyzer that 0 <= mask <= 48?

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

8 years agoOops, wrong pointer comparison.
guy [Thu, 17 Feb 2011 08:39:41 +0000 (08:39 +0000)]
Oops, wrong pointer comparison.

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

8 years agoOK, let's try a couple more explicit checks against NULL, to see whether
guy [Thu, 17 Feb 2011 08:15:05 +0000 (08:15 +0000)]
OK, let's try a couple more explicit checks against NULL, to see whether
that de-confuses Microsoft's code analyzer.

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

8 years agoFrom Alexis La Goutte :
jake [Thu, 17 Feb 2011 08:03:48 +0000 (08:03 +0000)]
From Alexis La Goutte :
A patch to add Vendor ID of VIA Client & Remote AP (from Aruba Networks)
Also add ett_ value for rohc, ike & ike2.

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

8 years agoUse "XXX != NULL" rather than "XXX" to test for a null pointer; either
guy [Thu, 17 Feb 2011 04:35:12 +0000 (04:35 +0000)]
Use "XXX != NULL" rather than "XXX" to test for a null pointer; either
I'm missing something or the MSVC++ code analyzer doesn't realize that

if (XXX)
dereference XXX

will not dereference XXX if it's null - maybe "if (XXX != NULL)" will do
the trick (if so, the code analyzer is buggy, because "if (XXX !=
NULL)", "if (XXX != 0)", and "if (XXX)" mean the exact same thing if XXX
is a pointer-valued expression, really, truly, even if a null pointer
isn't represented as all zero bits or if it's wider than an int).

Clean up indentation.

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

8 years agoSquelch a warning from the MSVC++ static analyzer (it's worried that
guy [Thu, 17 Feb 2011 03:02:18 +0000 (03:02 +0000)]
Squelch a warning from the MSVC++ static analyzer (it's worried that
GetModuleHandle() could return a null pointer, which is possible,
although if it returns one when handed "kernel32.dll", you have bigger

Add some comments.

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

8 years agoFix some Visual C++ static analyzer complaints.
gerald [Thu, 17 Feb 2011 01:11:05 +0000 (01:11 +0000)]
Fix some Visual C++ static analyzer complaints.

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

8 years agoFix Visual C++ code analysis errors.
gerald [Wed, 16 Feb 2011 22:57:36 +0000 (22:57 +0000)]
Fix Visual C++ code analysis errors.

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

8 years agoChange protocol column from "IEEE 802.11" to "802.11" so it fits in
sfisher [Wed, 16 Feb 2011 21:56:28 +0000 (21:56 +0000)]
Change protocol column from "IEEE 802.11" to "802.11" so it fits in
the default column width.

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

8 years agoPut the "MCS known information" field into the protocol tree; yes, it's
guy [Wed, 16 Feb 2011 21:08:40 +0000 (21:08 +0000)]
Put the "MCS known information" field into the protocol tree; yes, it's
somewhat redundant, as items aren't displayed if they're not known, but
it can make it a little clearer to people who aren't familiar with the
gory details of radiotap (which people just looking at network traffic
might not be).

Clean up some capitalization of field names.

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

8 years agoFix compilation on Windows.
gerald [Wed, 16 Feb 2011 19:26:08 +0000 (19:26 +0000)]
Fix compilation on Windows.

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

8 years agoMore cleanup toward being able to compile with GTK+ 3.0. Mostly replacing
sfisher [Wed, 16 Feb 2011 18:27:00 +0000 (18:27 +0000)]
More cleanup toward being able to compile with GTK+ 3.0.  Mostly replacing
deprecated GtkToolTips with new functions.

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

8 years agoGenerate correct type (FT_OID) for "x420.compression_algorithm_id".
stig [Wed, 16 Feb 2011 11:04:28 +0000 (11:04 +0000)]
Generate correct type (FT_OID) for "x420.compression_algorithm_id".

I suspect this should have been fixed in asn2wrs...

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

8 years agoMake swap_mac_addr() take a pointer to a TVB and an offset rather than
morriss [Wed, 16 Feb 2011 03:36:49 +0000 (03:36 +0000)]
Make swap_mac_addr() take a pointer to a TVB and an offset rather than
(generally) a pointer into the TVB.

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

8 years agoUse tvb_ether_to_str()
morriss [Wed, 16 Feb 2011 03:30:59 +0000 (03:30 +0000)]
Use tvb_ether_to_str()

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

8 years agoUse tvb_ether_to_str().
morriss [Wed, 16 Feb 2011 03:26:57 +0000 (03:26 +0000)]
Use tvb_ether_to_str().

There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

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

8 years agoUse tvb_ip_to_str() when it can eliminate a tvb_get_ptr() call.
morriss [Wed, 16 Feb 2011 03:08:45 +0000 (03:08 +0000)]
Use tvb_ip_to_str() when it can eliminate a tvb_get_ptr() call.

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

8 years agoUse tvb_ether_to_str() when it can eliminate a tvb_get_ptr() call.
morriss [Wed, 16 Feb 2011 03:05:13 +0000 (03:05 +0000)]
Use tvb_ether_to_str() when it can eliminate a tvb_get_ptr() call.

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

8 years agoUse tvb_ether_to_str()
morriss [Wed, 16 Feb 2011 03:01:19 +0000 (03:01 +0000)]
Use tvb_ether_to_str()

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

8 years agoRename the _to_str() functions in this dissector to tvb_*_to_str() and make
morriss [Wed, 16 Feb 2011 02:55:58 +0000 (02:55 +0000)]
Rename the _to_str() functions in this dissector to tvb_*_to_str() and make
the functions take a pointer to a TVB and an offset rather than (generally)
a pointer into a TVB.

Use NULL as the value_ptr in proto_tree_add_bytes_format() since the bytes are
coming straight from the TVB anyway.

Remove unnecessary include file.

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

8 years agoReturn an error value for the new error return; it "can't happen" (but
guy [Wed, 16 Feb 2011 02:21:31 +0000 (02:21 +0000)]
Return an error value for the new error return; it "can't happen" (but
either the VC++ analyzer can't determine that or it *can*, in fact,
happen).  Pick an error code that's not too far off.

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

8 years agoCheck the index before storing into the array.
guy [Wed, 16 Feb 2011 02:16:12 +0000 (02:16 +0000)]
Check the index before storing into the array.

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

8 years agoFix checkapi.
gerald [Wed, 16 Feb 2011 01:28:29 +0000 (01:28 +0000)]
Fix checkapi.

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

8 years agoFix errors found by the Visual C++ analyzer.
gerald [Wed, 16 Feb 2011 00:44:12 +0000 (00:44 +0000)]
Fix errors found by the Visual C++ analyzer.

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

8 years agoFix a buffer overflow found by the Visual C++ analyzer.
gerald [Wed, 16 Feb 2011 00:42:06 +0000 (00:42 +0000)]
Fix a buffer overflow found by the Visual C++ analyzer.

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

8 years agoUpdate a few comments about the use of LOCAL_CFLAGS, STANDARD_CFLAGS and WARNING_ARE_...
wmeier [Tue, 15 Feb 2011 16:56:31 +0000 (16:56 +0000)]
Update a few comments about the use of LOCAL_CFLAGS, STANDARD_CFLAGS and WARNING_ARE_ERRORS

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

8 years agoEnable /analyze:WX- only if ENABLE_CODE_ANALYSIS is defined ...
wmeier [Tue, 15 Feb 2011 16:40:09 +0000 (16:40 +0000)]
Enable /analyze:WX-  only if ENABLE_CODE_ANALYSIS is defined ...

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

8 years agoPreviously 1 byte TCP payload to port 2000 got interpreted as malformed Skinny
jmayer [Tue, 15 Feb 2011 12:06:39 +0000 (12:06 +0000)]
Previously 1 byte TCP payload to port 2000 got interpreted as malformed Skinny

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

8 years agoFrom Matthew Parris:
jake [Tue, 15 Feb 2011 07:14:22 +0000 (07:14 +0000)]
From Matthew Parris:
Display "Day of Year" for January 1 as 1, not 0.

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

8 years agoFrom Ania:
jake [Mon, 14 Feb 2011 22:52:14 +0000 (22:52 +0000)]
From Ania:
Patch enables decoding CM 7.1(3b) messages and CM5 CallInfoMessage (0x14A).

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

8 years agoMake sure RTP conversations are created.
jake [Mon, 14 Feb 2011 20:51:40 +0000 (20:51 +0000)]
Make sure RTP conversations are created.

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

8 years agoEnable Enterprise Code Analysis via the ENABLE_CODE_ANALYSIS environment
gerald [Mon, 14 Feb 2011 18:58:37 +0000 (18:58 +0000)]
Enable Enterprise Code Analysis via the ENABLE_CODE_ANALYSIS environment

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

8 years agoPut error messages and expert info for illegal UTCTime elements as a
stig [Mon, 14 Feb 2011 10:18:03 +0000 (10:18 +0000)]
Put error messages and expert info for illegal UTCTime elements as a
subtree on the UTCTime element.

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

8 years agoDisallow invalid char's in the filename passed to idl2wrs. Fixes bug 1129.
cmaynard [Mon, 14 Feb 2011 01:44:15 +0000 (01:44 +0000)]
Disallow invalid char's in the filename passed to idl2wrs.  Fixes bug 1129.

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

8 years agoFrom Fulko Hew:
jake [Sun, 13 Feb 2011 21:19:26 +0000 (21:19 +0000)]
From Fulko Hew:
The 'upper bound field is not being displayed in Register and Unregister PDU's.

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

8 years ago[Automatic manuf, services and enterprise-numbers update for 2011-02-13]
gerald [Sun, 13 Feb 2011 16:03:49 +0000 (16:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-02-13]

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

8 years agoAdvance offsets in the "default" branch to avoid infinite loops.
etxrab [Sun, 13 Feb 2011 15:43:17 +0000 (15:43 +0000)]
Advance offsets in the "default" branch to avoid infinite loops.
** (tshark.exe:4392): WARNING **: Dissector bug, protocol GSM BSSMAP, in packet
194520: More than 1000000 items in the tree -- possible infinite loop

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

8 years agoRegister BICC by name.
etxrab [Sun, 13 Feb 2011 15:01:34 +0000 (15:01 +0000)]
Register BICC by name.

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

8 years agoUpdate standard references.
etxrab [Sun, 13 Feb 2011 13:56:30 +0000 (13:56 +0000)]
Update standard references.

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

8 years agoUse the p2p_dir names for the direction values, and also list
guy [Sat, 12 Feb 2011 20:59:43 +0000 (20:59 +0000)]
Use the p2p_dir names for the direction values, and also list
P2P_DIR_UNKNOWN as "Unspecified" (to distinguish it from "Unknown" as in
"I don't know what that value means").

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

8 years agoUpdate dissection of
etxrab [Sat, 12 Feb 2011 20:17:47 +0000 (20:17 +0000)]
Update dissection of Speech Codec List Speech Codec
to 3GPP TS 48.008 version 9.4.0 Release 9.

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

8 years agoWhen generating the Info column, don't assume the direction is either
guy [Sat, 12 Feb 2011 20:08:47 +0000 (20:08 +0000)]
When generating the Info column, don't assume the direction is either
P2P_DIR_SENT or P2P_DIR_RECV - it might be unknown.

Use some #defines for SDP data element IDs, and rename the routine that
gets data elements tor reflect what it does.

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

8 years agoThe lack of _WITH_PHDR in WTAP_ENCAP_BLUETOOTH_H4 means there's no
guy [Sat, 12 Feb 2011 19:59:41 +0000 (19:59 +0000)]
The lack of _WITH_PHDR in WTAP_ENCAP_BLUETOOTH_H4 means there's no
pseudo-header, and hence there's no direction indication. Don't set
pinfo->p2p_dir for it.  Use WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR, not
WTAP_ENCAP_BLUETOOTH_H4, for capture files where we have the direction.

Don't assume pinfo->p2p_dir is either P2P_DIR_SENT or P2P_DIR_RECV when
setting the info column in various Bluetooth dissectors; it might be

In the HCI H4 dissector, put the direction into the info column
regardless of whether we have a type match or not; the dissectors for
HCI packet types appear to assume it's been set (as they put a blank at
the beginning of the stuff they append to the direction).

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

8 years agoCygwin 1.7 is much pickier about paths. Pass a POSIX path to bash.
gerald [Sat, 12 Feb 2011 17:54:36 +0000 (17:54 +0000)]
Cygwin 1.7 is much pickier about paths. Pass a POSIX path to bash.

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

8 years agoThere is a better (and faster) way to see if all the members of one list are
morriss [Sat, 12 Feb 2011 03:53:29 +0000 (03:53 +0000)]
There is a better (and faster) way to see if all the members of one list are
in another list: convert the 2nd list to a hash.  This speeds checking for ett_
variables up considerably.

Store the pattern to match ett_ variable names in a variable (since it's used 3

Only match ett_ variable declarations that start on their own line (hopefully to
speed things up a bit).

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

8 years agoRegister an ett_ variable.
morriss [Sat, 12 Feb 2011 03:52:05 +0000 (03:52 +0000)]
Register an ett_ variable.

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

8 years agoRemove an unused ett_ variable.
morriss [Sat, 12 Feb 2011 03:51:12 +0000 (03:51 +0000)]
Remove an unused ett_ variable.

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

8 years agoTraditional GtkTooltips deprecated at GTK+ 2.14 (and removed in 3.0), so
sfisher [Sat, 12 Feb 2011 00:27:47 +0000 (00:27 +0000)]
Traditional GtkTooltips deprecated at GTK+ 2.14 (and removed in 3.0), so
use the new functions when available.

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

8 years agoAdd a function to verify that ett_ variables are registered (or at least
morriss [Fri, 11 Feb 2011 22:44:29 +0000 (22:44 +0000)]
Add a function to verify that ett_ variables are registered (or at least
stored in an array which will hopefully be registered).

This is a work-in-progress, so the function is not called.

It is also EXTREMELY slow on big files.  (Or maybe it's looping...
I haven't yet had the patience to let it finish processing packet-rrc.c .)

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