obnox/wireshark/wip.git
13 years agoExport dissect_gsm_map_ISDN_AddressString_PDU();
etxrab [Sun, 27 Feb 2011 14:54:26 +0000 (14:54 +0000)]
Export dissect_gsm_map_ISDN_AddressString_PDU();

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

13 years agoiSCSI REJECT PDU contains the full header of the offending command as payload.
sahlberg [Sun, 27 Feb 2011 01:11:24 +0000 (01:11 +0000)]
iSCSI REJECT PDU contains the full header of the offending command as payload.
Add dissection of this header.

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

13 years agoAdded functionality for handling global profiles.
stig [Sat, 26 Feb 2011 17:23:24 +0000 (17:23 +0000)]
Added functionality for handling global profiles.

Global profiles can be installed in a "profiles" directory in the
Global configuration directory, and a global profile will be copied
to the users profiles on first time usage.

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

13 years ago- Add a dissector table for Private Extensions.
etxrab [Sat, 26 Feb 2011 09:37:43 +0000 (09:37 +0000)]
- Add a dissector table for Private Extensions.
- Use ENC_BIG_ENDIAN.

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

13 years agoFrom Robert Bullen: ... code is not incrementing wtap_dumper.bytes_dumped.
wmeier [Fri, 25 Feb 2011 20:33:43 +0000 (20:33 +0000)]
From Robert Bullen: ... code is not incrementing wtap_dumper.bytes_dumped.

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

Fro me: use 4 -space indentation (not tab) to match surrounding code lines.

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

13 years agoFrom Herbert Oppmann: Fix "RTMP dissector unknown audio codec"
wmeier [Fri, 25 Feb 2011 19:17:17 +0000 (19:17 +0000)]
From Herbert Oppmann: Fix "RTMP dissector unknown audio codec"

"
The [...] variable rtmpt_audio_codecs should be enhanced.

According to [Flash Developer's Guide]
10 = HE-AAC and 11 = Speex are missing.

There is also [Adobe "RTMP Specification V1.0]
which additionally lists 3 = INTEL (not used), 7 = G711A, 8 = G711U
and 9 = NellyMoser 16kHz.
"

From me: All but 'Intel (not used)' added to the list of audio codecs

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

13 years agoComments have to be at the beginning of the line.
gerald [Fri, 25 Feb 2011 17:17:41 +0000 (17:17 +0000)]
Comments have to be at the beginning of the line.

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

13 years agoClean up comments: canaries are also used to pad allocations to an 8-byte boundary.
morriss [Fri, 25 Feb 2011 15:49:28 +0000 (15:49 +0000)]
Clean up comments: canaries are also used to pad allocations to an 8-byte boundary.

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

13 years agoRevert file commited by misstake.
etxrab [Fri, 25 Feb 2011 15:14:12 +0000 (15:14 +0000)]
Revert file commited by misstake.

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

13 years agoVerify tools fails if wireshark-win32-libs does not exist.
etxrab [Fri, 25 Feb 2011 15:10:35 +0000 (15:10 +0000)]
Verify tools fails if wireshark-win32-libs does not exist.

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

13 years agoVerify tools fails if wireshark-win32-libs does not exist.
etxrab [Fri, 25 Feb 2011 15:09:05 +0000 (15:09 +0000)]
Verify tools fails if wireshark-win32-libs does not exist.

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

13 years agoEnsure we write the current recent file before copying.
stig [Fri, 25 Feb 2011 15:06:37 +0000 (15:06 +0000)]
Ensure we write the current recent file before copying.

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

13 years agoAdd a comment explaining what the canary between allocations looks like.
morriss [Fri, 25 Feb 2011 03:18:02 +0000 (03:18 +0000)]
Add a comment explaining what the canary between allocations looks like.

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

13 years agoFrom Robert Bullen: Fix "Potential access violation when writing to LANalyzer files"
wmeier [Fri, 25 Feb 2011 00:40:22 +0000 (00:40 +0000)]
From Robert Bullen: Fix "Potential access violation when writing to LANalyzer files"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5698

(Note from me: Before the fix "File ! Save As" in Lanalyzer format
                crashed quite consistently on my Windows 7)

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

13 years agoRevert SVN #36059; patch from Bug #5698 to be used instead
wmeier [Fri, 25 Feb 2011 00:26:37 +0000 (00:26 +0000)]
Revert SVN #36059; patch from Bug #5698 to be used instead

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

13 years agoFix Bug #5698: "Potential access violation when writing to LANalyzer files"
wmeier [Fri, 25 Feb 2011 00:15:34 +0000 (00:15 +0000)]
Fix Bug #5698: "Potential access violation when writing to LANalyzer files"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5698

Note: before fix
 File ! SaveAs  in Lanalyzer format crashed quite consistently on Windows.

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

13 years agoFrom Roland Knall via bug #5726: Adding a dissector registration, so the
sfisher [Thu, 24 Feb 2011 21:47:37 +0000 (21:47 +0000)]
From Roland Knall via bug #5726: Adding a dissector registration, so the
dissector may be called by other dissectors.

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

13 years agoFix Bug #5716: "dumpcap: -q option behavior doesn't match documentation"
wmeier [Thu, 24 Feb 2011 19:26:38 +0000 (19:26 +0000)]
Fix Bug #5716: "dumpcap: -q option behavior doesn't match documentation"
Rework code slightly to print "Packets captured: " at 'dumpcap -q ...' exit.
Also: SigInfo now prints: "Packets captured:  n" iso "n Packets captured".

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

13 years agoAdd exports.
etxrab [Thu, 24 Feb 2011 15:06:16 +0000 (15:06 +0000)]
Add exports.

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

13 years agoFrom Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5724 :
morriss [Thu, 24 Feb 2011 14:49:10 +0000 (14:49 +0000)]
From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5724 :

Fix a possible bug/crash with rev 36045.

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

13 years agoInitialize option_len to avoid a (false positive) unitialized variable warning.
morriss [Thu, 24 Feb 2011 14:40:01 +0000 (14:40 +0000)]
Initialize option_len to avoid a (false positive) unitialized variable warning.

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

13 years agoFrom Wade Hennessey:
jake [Thu, 24 Feb 2011 06:46:47 +0000 (06:46 +0000)]
From Wade Hennessey:
Add support for new header options in the KDP protocol.

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

13 years agoFrom Håkon Nessjøen
jake [Thu, 24 Feb 2011 06:22:52 +0000 (06:22 +0000)]
From Håkon Nessjøen
Additions:
  More correct way of checking direction of packets
  Support for two new packet types: ping, pingreply

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

13 years agoFix Bug #5624: "Unknown MMS multipart media is shown in the wrong subtree"
wmeier [Thu, 24 Feb 2011 03:46:30 +0000 (03:46 +0000)]
Fix Bug #5624: "Unknown MMS multipart media is shown in the wrong subtree"

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

Do ti = proto_tree_add_text(...,...); yyy=proto_item_add_subtree(ti,...) in the usual manner.

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

13 years agoForward port r36036 from trunk-1.4: Make sure we ep_allocate enough
gerald [Wed, 23 Feb 2011 22:49:59 +0000 (22:49 +0000)]
Forward port r36036 from trunk-1.4: Make sure we ep_allocate enough
memory.

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

13 years agoFrom Stephen Donnelly via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5708 :
morriss [Wed, 23 Feb 2011 17:54:00 +0000 (17:54 +0000)]
From Stephen Donnelly via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5708 :

The ERF record format defines several error flags.

This patch exposes ERF error flags using 'Expert Infos' for highlighting and
counting.

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

13 years agoFrom Fulko Hew via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5709 :
morriss [Wed, 23 Feb 2011 17:45:03 +0000 (17:45 +0000)]
From Fulko Hew via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5709 :

When Wireshark receives an AgentX Ping-PDU that contains a zero length
'context' identifier it emits the following warning:

14:30:20          Warn Dissector bug, protocol AgentX, in packet 1066:
tvbuff.c:2571: failed assertion "bufsize != 0"

The attached patch prevents the warning message from appearing under that
circumstance.  Note:  This patch will also prevent the warning under all other
conditions where a zero length string is specified anywhere in the protocol
dissector.

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

13 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

13 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

13 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.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5713

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

13 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

13 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

13 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

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

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

13 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

13 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

13 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
http://www.tigervnc.com/cgi-bin/rfbproto#extendeddesktopsize-pseudo-encoding

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

13 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

13 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

13 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

13 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

13 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.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5706

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

13 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...

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

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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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
behavior.

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

13 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

13 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

13 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

13 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

13 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

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

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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

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

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

13 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

13 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

13 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

13 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

13 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

13 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
nonwithstanding.

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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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
in

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

13 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
problems...).

Add some comments.

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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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