8 years ago[Automatic manuf, services and enterprise-numbers update for 2011-12-04]
gerald [Sun, 4 Dec 2011 15:03:28 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-12-04]

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

8 years agoFix 2 newly reported Coverity CID's 1331 & 1332: UNUSED_VALUE.
cmaynard [Sat, 3 Dec 2011 22:53:55 +0000 (22:53 +0000)]
Fix 2 newly reported Coverity CID's 1331 & 1332: UNUSED_VALUE.

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

8 years ago"Expert Info Composite" is now "Expert Info" (with the old "Expert Info" having been...
wmeier [Sat, 3 Dec 2011 22:08:28 +0000 (22:08 +0000)]
"Expert Info Composite" is now "Expert Info" (with the old "Expert Info" having been removed).

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

8 years agoDo 'md wsluarm_src' only if dir doesn't alreay exist.
wmeier [Sat, 3 Dec 2011 19:59:48 +0000 (19:59 +0000)]
Do 'md wsluarm_src' only if dir doesn't alreay exist.

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

8 years agoCall tap_queue_packet() after pinfo data is updated. Also, like IPv4, display next...
cmaynard [Sat, 3 Dec 2011 17:03:06 +0000 (17:03 +0000)]
Call tap_queue_packet() after pinfo data is updated.  Also, like IPv4, display next header field in decimal instead of hexadecimal (REF: iana.org/assignments/protocol-numbers/protocol-numbers.xml)

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

8 years agoFrom Michael Sakaluk:
jake [Sat, 3 Dec 2011 13:35:06 +0000 (13:35 +0000)]
From Michael Sakaluk:
This patch adds support to the BGP dissector for RFC 5512 and RFC 5640.

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

8 years agoHandle 20 byte GTP' V0 header.
etxrab [Sat, 3 Dec 2011 12:11:01 +0000 (12:11 +0000)]
Handle 20 byte GTP' V0 header.

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

8 years agoUpdate some comments to reflect current reality (as in "a lot of stuff
guy [Sat, 3 Dec 2011 07:16:56 +0000 (07:16 +0000)]
Update some comments to reflect current reality (as in "a lot of stuff
is no longer available, but there's an IETF list of snoop datalink
types, at least").

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

8 years agoFix bug with updating rr_offset before we're done fetching the matchedprefix and...
cmaynard [Sat, 3 Dec 2011 06:10:37 +0000 (06:10 +0000)]
Fix bug with updating rr_offset before we're done fetching the matchedprefix and causing malformed packets, not to mention incorrect matchedprefixes to be displayed.  Some if() blocks need to execute regardless of whether tree is NULL or not.  Add some additional expert infos to report invalid matchlen values > 128 in violation of RFC 2894.  Fix hf_icmpv6_rr_rm_flag_reserved's bitmask from FFFD to FFFC and change order of flags displayed in tree so they appear from msb to lsb.  Lastl, fix a typo.

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

8 years agoBitfields indicate how many bits they are; "guint8 foo:4" is
guy [Sat, 3 Dec 2011 04:33:05 +0000 (04:33 +0000)]
Bitfields indicate how many bits they are; "guint8 foo:4" is
self-contradictory (it's 4 bits, not 8).  Furthermore, the C language
doesn't support "unsigned char" as a bitfield type; some compilers might
accept that, but if you crank up the warning levels, even GCC will warn
about that.

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

8 years agoSome code needs to execute (potentially) whether the tree is NULL or not. Also,...
cmaynard [Sat, 3 Dec 2011 04:32:08 +0000 (04:32 +0000)]
Some code needs to execute (potentially) whether the tree is NULL or not.  Also, changed "Left Segments" to read, "Segments Left" to better match RFC 2460 and RFC 3775 terminology.

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

8 years agoIf a type 2 Mobile IP routing header is present, only set pinfo->dst if seg_left...
cmaynard [Sat, 3 Dec 2011 04:07:20 +0000 (04:07 +0000)]
If a type 2 Mobile IP routing header is present, only set pinfo->dst if seg_left is non-zero.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6560

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

8 years agoThe TCP Packet Mood Option was a cute April 1 RFC, but TCP option 25 is
guy [Sat, 3 Dec 2011 03:01:08 +0000 (03:01 +0000)]
The TCP Packet Mood Option was a cute April 1 RFC, but TCP option 25 is
officially listed as "Unassigned", and people might use it for their own
purposes (and, in fact, one bug-submitter was doing so; they probably
should have used 253 or 254, but...).  Get rid of the code to dissect

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

8 years agoThe cool kids say "dissector_add_uint()", not "dissector_add()", now.
guy [Sat, 3 Dec 2011 02:59:43 +0000 (02:59 +0000)]
The cool kids say "dissector_add_uint()", not "dissector_add()", now.

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

8 years agoFrom Salil Kanitkar:
jake [Fri, 2 Dec 2011 23:42:52 +0000 (23:42 +0000)]
From Salil Kanitkar:
This patch covers following -
i) Support for detecting OSPFv2 Opaque RI LSA. (RFC4970)
ii) Support for detecting OSPFv2 RI Capabilities TLV (RFC4970)
iii) Support for detecting OSPF Dynamic Hostname TLV (RFC5642)
iv) As per RFC4970, support for detecting RI LSA for OSPFv3 as well.

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

8 years agofrom Petr Sumbera:
jake [Fri, 2 Dec 2011 22:23:07 +0000 (22:23 +0000)]
from Petr Sumbera:
Solaris 11 snoop files with IP over Infiniband data are not recognized.
Attached patch allows to view such data.

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

8 years agoFrom Juha Takala:
etxrab [Fri, 2 Dec 2011 22:05:14 +0000 (22:05 +0000)]
From Juha Takala:
dissector for ELCOM communication protocol.  This protocol is
used mainly by power utilities, to exchange historical, cyclic, and event based
data between SCADA systems.


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

8 years agoFrom Pascal Quantin:
etxrab [Fri, 2 Dec 2011 21:56:10 +0000 (21:56 +0000)]
From Pascal Quantin:
Add S1 related info to the DRX parameter dissection (IE
common to 2G/3G/LTE) as specified in 3GPP 24.301 Release 9.8.0 chapter


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

8 years agoExtend ULI dissection.
etxrab [Fri, 2 Dec 2011 21:45:45 +0000 (21:45 +0000)]
Extend ULI dissection.

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

8 years agoAdd a contributor.
etxrab [Fri, 2 Dec 2011 05:46:11 +0000 (05:46 +0000)]
Add a contributor.

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

8 years agoFrom Pascal Quantin:
martinm [Thu, 1 Dec 2011 23:17:17 +0000 (23:17 +0000)]
From Pascal Quantin:

Show SDU lengths for UM PDUs.
Also, if the logged pduLength is < the real RLC PDU length, show that the length of the last segment is unknown.

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

8 years agoSquelch a warning.
etxrab [Thu, 1 Dec 2011 21:48:25 +0000 (21:48 +0000)]
Squelch a warning.

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

8 years agoExtend dissection of GTPv2 EPS Security Context and Quadruplets.
etxrab [Thu, 1 Dec 2011 21:26:22 +0000 (21:26 +0000)]
Extend dissection of GTPv2 EPS Security Context and Quadruplets.

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

8 years agoFrom Pascal Quantin:
etxrab [Thu, 1 Dec 2011 20:09:01 +0000 (20:09 +0000)]
From Pascal Quantin:
updates the decoding of the Test Procedures functions
described in 3GPP 44.014, 34.109 and 36.509.
It also fixes a small issue where Wireshark was trying to decode the skip
indicator as a transaction identifier for those messages.


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

8 years agoFix:
jmayer [Thu, 1 Dec 2011 14:35:29 +0000 (14:35 +0000)]

trunk/plugins/profinet/packet-pn-rt.c: In function ‘IsDFP_Frame’:
trunk/plugins/profinet/packet-pn-rt.c:182:9: error: ‘u8SFCycleCounter’ undeclared (first use in this function)
trunk/plugins/profinet/packet-pn-rt.c:182:9: note: each undeclared identifier is reported only once for each function it appears in

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

8 years agoWhen have RLC PDUs that are truncated after headers:
martinm [Thu, 1 Dec 2011 13:53:09 +0000 (13:53 +0000)]
When have RLC PDUs that are truncated after headers:
- set extent of headers item properly
- show in the info column what the data would look like, based upon reported length and segment offsets

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

8 years agopacket-dcerpc-pn-io.c:8735: warning: unused variable 'iSubFrameLen'
etxrab [Thu, 1 Dec 2011 06:35:02 +0000 (06:35 +0000)]
packet-dcerpc-pn-io.c:8735: warning: unused variable 'iSubFrameLen'
packet-dcerpc-pn-io.c:8734: warning: unused variable 'iTotalLen'

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

8 years agoGet rid of warnings.
etxrab [Thu, 1 Dec 2011 06:33:14 +0000 (06:33 +0000)]
Get rid of warnings.

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

8 years agoFrom Michael Mann:
etxrab [Thu, 1 Dec 2011 06:05:39 +0000 (06:05 +0000)]
From Michael Mann:
ENIP dissector - improved I/O connection dissection through "better conversation"


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

8 years agoFrom Wido Kelling:
etxrab [Thu, 1 Dec 2011 05:58:55 +0000 (05:58 +0000)]
From Wido Kelling:
Enhancements to profinet decoding (IEC 61158) V2.3.


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

8 years agoFrom Pascal Quantin:
etxrab [Thu, 1 Dec 2011 05:42:07 +0000 (05:42 +0000)]
From Pascal Quantin:
adds to the Protocol Configuration Options the decoding of
the following container identifiers:
- Selected Bearer Control Mode
- DSMIPv6 Home Agent Address
- DSMIPv6 Home Network Prefix
- DSMIPv6 IPv4 Home Agent Address
- P-CSCF IPv4 Address
- DNS Server IPv4 Address


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

8 years agoDafine G_DISABLE_SINGLE_INCLUDES while compiling. This mimics a patch
jmayer [Thu, 1 Dec 2011 02:31:47 +0000 (02:31 +0000)]
Dafine G_DISABLE_SINGLE_INCLUDES while compiling. This mimics a patch
that has been in configure.in for quite some while.

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

8 years agoFrom Krishnamurthy Mayya:
etxrab [Wed, 30 Nov 2011 20:00:42 +0000 (20:00 +0000)]
From Krishnamurthy Mayya:
Add Copyright.

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

8 years agoUse gtk_box_new() if GTK3+
etxrab [Wed, 30 Nov 2011 19:53:59 +0000 (19:53 +0000)]
Use gtk_box_new() if GTK3+

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

8 years agoMake it possible to add a subdissector for the info string.
etxrab [Wed, 30 Nov 2011 19:48:17 +0000 (19:48 +0000)]
Make it possible to add a subdissector for the info string.

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

8 years agoUse g_ascii_strncasecmp() rather than strncasecmp().
martinm [Wed, 30 Nov 2011 16:36:54 +0000 (16:36 +0000)]
Use g_ascii_strncasecmp() rather than strncasecmp().

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

8 years agoHopefully clarify usage a bit to indicate multiple infile's can be specified to be...
cmaynard [Wed, 30 Nov 2011 15:55:53 +0000 (15:55 +0000)]
Hopefully clarify usage a bit to indicate multiple infile's can be specified to be merged.  Also, add GPL and copyright info.

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

8 years agoAdd missing comments in syntax description for -z expert
martinm [Wed, 30 Nov 2011 15:45:20 +0000 (15:45 +0000)]
Add missing comments in syntax description for -z expert

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

8 years agoChange the -z args for expert item. You can now give the minimum severity level...
martinm [Wed, 30 Nov 2011 15:41:39 +0000 (15:41 +0000)]
Change the -z args for expert item.  You can now give the minimum severity level to report as well as a filter.  Also, now show duplicate reports only once, and give the frequency rather than the frame number.

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

8 years agoFrom Eugene Bogush: Initialize read_err to 0 so mergecap works again. Fixes https...
cmaynard [Wed, 30 Nov 2011 15:28:58 +0000 (15:28 +0000)]
From Eugene Bogush: Initialize read_err to 0 so mergecap works again.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6623

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

8 years agoExtend coverage of #ifdef HAVE_PCAP_REMOTE to cover the static function insert_new_ro...
martinm [Wed, 30 Nov 2011 09:47:10 +0000 (09:47 +0000)]
Extend coverage of #ifdef HAVE_PCAP_REMOTE to cover the static function insert_new_rows().

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

8 years agoGet rid of warnings.
etxrab [Wed, 30 Nov 2011 06:58:44 +0000 (06:58 +0000)]
Get rid of warnings.

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

8 years agoFrom Pascal Quantin:
etxrab [Tue, 29 Nov 2011 22:32:31 +0000 (22:32 +0000)]
From Pascal Quantin:
decoding of IPv6 Control Protocol embedded in PCO


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

8 years agoFrom Pascal Quantin:
etxrab [Tue, 29 Nov 2011 22:25:21 +0000 (22:25 +0000)]
From Pascal Quantin:
Currently Wireshark limits the Access Point Name length to 50 bytes. But
according to 3GPP 24.008 chapter, the maximum length is 100 bytes (102
bytes minus the IEI and length fields) and not 50.
The attached patch increases the MAX_APN_LENGTH define value and allow the
correct display of an APN with a size greater than 50 bytes.


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

8 years agoMust include header files in a macro, so they get included in the
guy [Tue, 29 Nov 2011 20:25:49 +0000 (20:25 +0000)]
Must include header files in a macro, so they get included in the
release tarball.

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

8 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Tue, 29 Nov 2011 19:54:00 +0000 (19:54 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

8 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Tue, 29 Nov 2011 19:53:02 +0000 (19:53 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

8 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Tue, 29 Nov 2011 19:50:30 +0000 (19:50 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

8 years agoArubaOS 6.x use a new GRE ID (0x9000) for communication between controller and AP
alagoutte [Tue, 29 Nov 2011 19:46:12 +0000 (19:46 +0000)]
ArubaOS 6.x use a new GRE ID (0x9000) for communication between controller and AP
Add this new ID in GRE dissector

The frame with the new GRE ID is not 802.11 frame such as 80XX GRE ID but a 802.3 frame with curious ethertype (8211 the same id with PAPI Protocol...)

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

8 years agoFrom c.David via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6527
alagoutte [Tue, 29 Nov 2011 19:36:53 +0000 (19:36 +0000)]
From c.David via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6527
corba dissector generator improvement

Patch 2 : create a defaulf field hf_operationrequest which provides the requested operation on both the resquest and the reply messages.

From me :
Regenerate GIOP Plugins

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

8 years agoFrom c.David via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6527
alagoutte [Tue, 29 Nov 2011 19:22:35 +0000 (19:22 +0000)]
From c.David via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6527
corba dissector generator improvement

Patch 1 : field names is used in dissection instead of "enum value" which is not clear

From me :
Regenerate GIOP Plugins

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

8 years agoGtk3 package byte highlighter colour fix.
etxrab [Tue, 29 Nov 2011 17:46:38 +0000 (17:46 +0000)]
Gtk3 package byte highlighter colour fix.

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

8 years agoUpdate value strings.
etxrab [Tue, 29 Nov 2011 17:31:52 +0000 (17:31 +0000)]
Update value strings.

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

8 years agoAdd priority to the channel table.
martinm [Tue, 29 Nov 2011 14:42:22 +0000 (14:42 +0000)]
Add priority to the channel table.

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

8 years agoWireshark crashes in gsm_map dissector
etxrab [Tue, 29 Nov 2011 07:03:31 +0000 (07:03 +0000)]
Wireshark crashes in gsm_map dissector

For now use Jeff's fix:
"The REAL problem is that the GSM_MAP dissector is using this value_string_ext
in the hf without BASE_EXT_STRING:

    { &hf_gsm_old_localValue,
      { "localValue", "gsm_old.localValue",
        FT_INT32, BASE_DEC, &gsm_old_GSMMAPOperationLocalvalue_vals_ext, 0,
        "OperationLocalvalue", HFILL }},

This, in turn, appears to be caused because OperationLocalValue is an alias
for/of GSMMAPOperationLocalValue and only the latter is defined with

I can fix it by doing:

Index: asn1/gsm_map/gsm_map.cnf
--- asn1/gsm_map/gsm_map.cnf    (revision 39628)
+++ asn1/gsm_map/gsm_map.cnf    (working copy)
@@ -54,6 +54,7 @@



But it seems to be that asn2wrs should arguably be figuring this out on its

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

8 years agoAllow for, but don't yet use, GTK+ 2.24.
gerald [Tue, 29 Nov 2011 00:07:54 +0000 (00:07 +0000)]
Allow for, but don't yet use, GTK+ 2.24.

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

8 years agoAdd newline at the end of the file.
martinm [Mon, 28 Nov 2011 18:33:58 +0000 (18:33 +0000)]
Add newline at the end of the file.

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

8 years agoFix Checkapi found errors.
etxrab [Mon, 28 Nov 2011 18:10:57 +0000 (18:10 +0000)]
Fix Checkapi found errors.

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

8 years agoFrom Krishnamurthy Mayya:
etxrab [Mon, 28 Nov 2011 17:59:54 +0000 (17:59 +0000)]
From Krishnamurthy Mayya:

Part of patch:
2. BFD extension has been added as per RFC 6428, to decode the BFD packet with
ACH encapsulation(without IP/UDP header encapsulation). The channel type in ACH
header identifies the BFD payload as BFD CC or CV packet. Also decoding for
MPLS-TP source MEP-ID TLV in BFD CV packet has been added.

applied with a change to add packet-bfd.h


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

8 years agoFrom Krishnamurthy Mayya:
etxrab [Mon, 28 Nov 2011 17:31:09 +0000 (17:31 +0000)]
From Krishnamurthy Mayya:
LSP Ping extension has been added as per RFC 6426, to decode the LSP Ping
packet with ACH encapsulation(without IP/UDP header encapsulation). The channel
type in ACH header identifies the LSP Ping packet. Also support for decoding
new TLVs and Sub-TLVs defined in the RFC 6426 has been provided.


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

8 years agoFrom Krishnamurthy Mayya:
etxrab [Mon, 28 Nov 2011 17:13:45 +0000 (17:13 +0000)]
From Krishnamurthy Mayya:
BFD extension has been added as per RFC 6428, to decode the BFD packet with
ACH encapsulation(without IP/UDP header encapsulation). The channel type in ACH
header identifies the BFD payload as BFD CC or CV packet. Also decoding for
MPLS-TP source MEP-ID TLV in BFD CV packet has been added.


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

8 years agofrom Shobhank Sharma:
etxrab [Mon, 28 Nov 2011 17:05:35 +0000 (17:05 +0000)]
from Shobhank Sharma:

- Removed some mpls preferences which are no longer relevant/needed like
  decode PWAC payloads as PPP traffic and assume all channel types except 0x21
are raw BFD.
- MPLS extension from PW-ACH to MPLS Generic Associated Channel as per RFC 5586
- Updated Pseudowire Associated Channel Types as per
- Updated the VCCV bitmaps as per RFC 5885


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

8 years agoSquelsh warnings.
etxrab [Mon, 28 Nov 2011 16:42:43 +0000 (16:42 +0000)]
Squelsh warnings.

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

8 years agoPrevet a crash when dissecting linked TI.
etxrab [Mon, 28 Nov 2011 16:41:59 +0000 (16:41 +0000)]
Prevet a crash when dissecting linked TI.

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

8 years agolet packet-gsm_a_gm.c dissect Protocol Configuration Options.
etxrab [Mon, 28 Nov 2011 16:40:29 +0000 (16:40 +0000)]
let packet-gsm_a_gm.c dissect Protocol Configuration Options.

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

8 years agoUse __except(EXCEPTION_EXECUTE_HANDLER) rather than __except(TRUE);
wmeier [Mon, 28 Nov 2011 16:23:55 +0000 (16:23 +0000)]
Use __except(EXCEPTION_EXECUTE_HANDLER) rather than __except(TRUE);

 Strictly speaking, it appears that __except(EXCEPTION_EXECUTE_HANDLER)
 rather than __exept(TRUE) should be used altho in actuality there's
 no difference since TRUE (as defined by GLIB) == EXCEPTION_EXECUTE_HANDLER.

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

8 years agoAllow configuration protocol to configure UL priority for channels in mapping.
martinm [Mon, 28 Nov 2011 14:52:11 +0000 (14:52 +0000)]
Allow configuration protocol to configure UL priority for channels in mapping.
This value then gets used in call_rlc_dissector().

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

8 years agoDon't specify an hf[] item as using a range_string when it's really using a value_string.
wmeier [Sun, 27 Nov 2011 21:14:59 +0000 (21:14 +0000)]
Don't specify an hf[] item as using a range_string when it's really using a value_string.

Fixes Bug #6618


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

8 years agoFix Coverity CID 1330, "Missing Break" by adding some /* FALLTHRU */'s.
cmaynard [Sun, 27 Nov 2011 16:29:42 +0000 (16:29 +0000)]
Fix Coverity CID 1330, "Missing Break" by adding some /* FALLTHRU */'s.

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

8 years agoFix a typo.
cmaynard [Sun, 27 Nov 2011 16:17:22 +0000 (16:17 +0000)]
Fix a typo.

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

8 years agoVarious Minor cleanup:
wmeier [Sun, 27 Nov 2011 15:34:07 +0000 (15:34 +0000)]
Various Minor cleanup:
- Remove unneeded #includes;
- Use val_to_str_const() in several places;
- Reformat long lines;
- Fix whitepace and indentation.

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

8 years agoUse preference port (not defined constant) when port against src port;
wmeier [Sun, 27 Nov 2011 15:30:29 +0000 (15:30 +0000)]
Use preference port (not defined constant) when port against src port;
Remove unneeded #include.

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

8 years ago[Automatic manuf, services and enterprise-numbers update for 2011-11-27]
gerald [Sun, 27 Nov 2011 15:03:25 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-11-27]

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

8 years agoFix a wrong copy/paste....
alagoutte [Sat, 26 Nov 2011 16:32:20 +0000 (16:32 +0000)]
Fix a wrong copy/paste....

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

8 years agoFrom Kari Vatjus-Anttila via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id...
alagoutte [Sat, 26 Nov 2011 16:23:37 +0000 (16:23 +0000)]
From Kari Vatjus-Anttila  via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5956
kNet (KristalliNet) dissector for Wireshark

kNet is a connection-oriented network protocol for transmitting arbitrary application-specific messages between network hosts. It is designed primarily for applications that require a method for rapid space-efficient real-time communication. kNet is an application-level protocol which can be ran either over UDP, TCP or SCTP transports.

From me :
* Add Modelines information and fix trailing whitespace
* Merge packet-knet.h in packet-knet.c
* Make Checkhf happy
* Fix Clang/GCC Warning about unused variable
* Add Authors info & CMakeList.txt

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

8 years agoThere is now an early (source only) Win32 version of GTK3 available.
jmayer [Sat, 26 Nov 2011 10:50:27 +0000 (10:50 +0000)]
There is now an early (source only) Win32 version of GTK3 available.

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

8 years agoDon't pass 'len' to the dissect routine since we know there's only 1 byte present...
cmaynard [Sat, 26 Nov 2011 04:45:49 +0000 (04:45 +0000)]
Don't pass 'len' to the dissect routine since we know there's only 1 byte present.  This fixes the buildbot complaint about using 'len' uninitialized.

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

8 years agoAdd a few casts to try to make the buildbots happy.
cmaynard [Sat, 26 Nov 2011 04:31:40 +0000 (04:31 +0000)]
Add a few casts to try to make the buildbots happy.

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

8 years agoIP option improvements. While fixing bug 6561, I noticed some deficiencies in the...
cmaynard [Sat, 26 Nov 2011 04:16:11 +0000 (04:16 +0000)]
IP option improvements.  While fixing bug 6561, I noticed some deficiencies in the IP options dissection capabilities.  Testing of these changes primarily used the capture file attached to that bug report as there were several IP options present.  Packet 222 is an interesting packet that illustrates some of the new filters available.  Further work is needed, but hopefully this is a good first step.  Fuzz testing was performed using my own "menagerie".

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

8 years agoAdd missing '*/' to the end of a comment: Fixes gcc compile error.
wmeier [Fri, 25 Nov 2011 22:08:25 +0000 (22:08 +0000)]
Add missing '*/' to the end of a comment: Fixes gcc compile error.

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

8 years agoFrom Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes
wmeier [Fri, 25 Nov 2011 22:02:25 +0000 (22:02 +0000)]
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes


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

8 years agoMark drep parameter as unused in the epm_dissect_tower_data function
sfisher [Fri, 25 Nov 2011 17:19:00 +0000 (17:19 +0000)]
Mark drep parameter as unused in the epm_dissect_tower_data function
since its use was removed in r40002.

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

8 years agoFrom Wido Kelling: EPM tower UUID must be interpreted always as little endian.
wmeier [Fri, 25 Nov 2011 17:02:51 +0000 (17:02 +0000)]
From Wido Kelling: EPM tower UUID must be interpreted always as little endian.


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

8 years agoAdd the reason for a UL ReTx (PDCCH retx grant or PHICH NACK).
martinm [Fri, 25 Nov 2011 11:19:03 +0000 (11:19 +0000)]
Add the reason for a UL ReTx (PDCCH retx grant or PHICH NACK).

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

8 years agoRemove unused code (Add in Revision 836)
alagoutte [Fri, 25 Nov 2011 10:41:11 +0000 (10:41 +0000)]
Remove unused code (Add in Revision 836)
Fix also some Clang/GCC Warning about unused variable

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

8 years agoFix H.460.18 and H.460.19 integration into H.245
kukosa [Thu, 24 Nov 2011 15:18:11 +0000 (15:18 +0000)]
Fix H.460.18 and H.460.19 integration into H.245

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

8 years agoOnly add the priority level if it is set inside valid range.
martinm [Thu, 24 Nov 2011 12:44:11 +0000 (12:44 +0000)]
Only add the priority level if it is set inside valid range.

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

8 years agoFix gcc compile error
wmeier [Thu, 24 Nov 2011 03:33:29 +0000 (03:33 +0000)]
Fix gcc compile error

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

8 years agoUse a GHashTable to store templates instead of
wmeier [Thu, 24 Nov 2011 03:20:44 +0000 (03:20 +0000)]
Use a GHashTable to store templates instead of
  using a home-grown hash table (which didn't handle collisions);
Include complete "connection info" (srcAddr,srcPort,dstAddr,dstPort) in "Template Name";
Rename various variables;
Re-indent & Re-format code.

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

8 years agoDisplay protocol ID consistently in decimal throughout. Append each IP option to...
cmaynard [Wed, 23 Nov 2011 18:33:45 +0000 (18:33 +0000)]
Display protocol ID consistently in decimal throughout.  Append each IP option to top-level Options field.  Whitespace cleanup - the majority of the dissector used 2-space indentation, so that's the format chosen.  Added modelines to match.

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

8 years agoMove some comments around to make it more boilerplate like.
jake [Tue, 22 Nov 2011 21:51:24 +0000 (21:51 +0000)]
Move some comments around to make it more boilerplate like.

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

8 years agoFix two compiler errors.
wmeier [Tue, 22 Nov 2011 20:48:49 +0000 (20:48 +0000)]
Fix two compiler errors.

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

8 years agoHandle 2 issues related to cacheing templates:
wmeier [Tue, 22 Nov 2011 20:42:25 +0000 (20:42 +0000)]
Handle 2 issues related to cacheing templates:
 - Use a (slightly) less simplistic hashing algorithm to reduce collisions;
   Note: A GHashTable which handles collisions rather than
         a home-grown hash table (which does not) needs to be implemented.
 - Don't replace an existing template in the cache when a collision occurs;

Fixes Bug #6325

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

8 years agoShow a "Capturing on ..." message similar to TShark.
guy [Tue, 22 Nov 2011 19:07:49 +0000 (19:07 +0000)]
Show a "Capturing on ..." message similar to TShark.

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

8 years agoAdd more packet highlights to the info column.
martinm [Tue, 22 Nov 2011 17:57:25 +0000 (17:57 +0000)]
Add more packet highlights to the info column.

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

8 years agoFix bugs related to Nounce IE dissection.
etxrab [Tue, 22 Nov 2011 17:44:50 +0000 (17:44 +0000)]
Fix bugs related to Nounce IE dissection.

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

8 years agoFor now, display the protocol in hexadecimal again so displaying it in decimal doesn...
cmaynard [Tue, 22 Nov 2011 15:18:20 +0000 (15:18 +0000)]
For now, display the protocol in hexadecimal again so displaying it in decimal doesn't get backported to the 1.6 and 1.4 trunks at the request of Joerg.

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

8 years agoUnconditionally install idl2wrs
rbalint [Tue, 22 Nov 2011 13:53:17 +0000 (13:53 +0000)]
Unconditionally install idl2wrs

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

8 years agohardcode /bin/sh to idl2wrs
rbalint [Tue, 22 Nov 2011 13:53:06 +0000 (13:53 +0000)]
hardcode /bin/sh to idl2wrs

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

8 years agoIf we're not running as a child process, report the interfaces on which
guy [Tue, 22 Nov 2011 10:08:26 +0000 (10:08 +0000)]
If we're not running as a child process, report the interfaces on which
we're capturing.  (We do not require a -i flag; the message could be
useful if you don't specify the interface, as it lets you know which
interface was chosen, which might not be the interface you'd think it
would be.  Yes, that's arguably a libpcap bug, which I plan to look at;
it should probably try to figure out which interfaces are "active" if
possible, and prefer those.)

Use cmdarg_err() for invalid capture filters and other capture errors.

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