obnox/wireshark/wip.git
8 years agoUse correct offset.
etxrab [Fri, 9 Dec 2011 06:16:07 +0000 (06:16 +0000)]
Use correct offset.

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

8 years agoGet rid of declarations of undefined routines and definitins of unused
guy [Fri, 9 Dec 2011 03:00:56 +0000 (03:00 +0000)]
Get rid of declarations of undefined routines and definitins of unused
routines.

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

8 years agoMove the definition of enum rohc_mode into packet-rohc.h.
guy [Fri, 9 Dec 2011 02:34:53 +0000 (02:34 +0000)]
Move the definition of enum rohc_mode into packet-rohc.h.

Have packet-pdcp-lte.h include packet-rohc.h to pick up that definition.

Get rid of now-no-longer-necessary includes.

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

8 years agopacket-pdcp-lte.h defines "enum rohc_mode", and packet-rohc.h uses it,
guy [Fri, 9 Dec 2011 00:59:47 +0000 (00:59 +0000)]
packet-pdcp-lte.h defines "enum rohc_mode", and packet-rohc.h uses it,
so include packet-pdcp-lte.h first.

Get rid of extra definition of "enum rohc_mode".

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

8 years agopacket-pdcp-lte.h defines "enum rohc_mode", and packet-rohc.h uses it,
guy [Fri, 9 Dec 2011 00:56:48 +0000 (00:56 +0000)]
packet-pdcp-lte.h defines "enum rohc_mode", and packet-rohc.h uses it,
so include packet-pdcp-lte.h first.

No extra tokens after #endif, please.

Fix indentation.

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

8 years agoStart using functions from packet-rohc.c
etxrab [Thu, 8 Dec 2011 21:45:35 +0000 (21:45 +0000)]
Start using functions from packet-rohc.c

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

8 years agoTry to get the container stuff right...
etxrab [Thu, 8 Dec 2011 21:17:03 +0000 (21:17 +0000)]
Try to get the container stuff right...

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

8 years agoUse to display ESP SPI BASE_HEX_DEC as it is in decimal in SIP.
etxrab [Thu, 8 Dec 2011 19:34:04 +0000 (19:34 +0000)]
Use to display ESP SPI BASE_HEX_DEC as it is in decimal in SIP.

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

8 years agoProperly dissect Source-ToTarget-TransparentContainer.
etxrab [Thu, 8 Dec 2011 19:32:51 +0000 (19:32 +0000)]
Properly dissect Source-ToTarget-TransparentContainer.

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

8 years agoStore expert group value, fix output of each record.
martinm [Thu, 8 Dec 2011 15:19:11 +0000 (15:19 +0000)]
Store expert group value, fix output of each record.

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

8 years agoSkip correct number of bytes.
martinm [Thu, 8 Dec 2011 11:15:31 +0000 (11:15 +0000)]
Skip correct number of bytes.

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

8 years agoAdd a dissector table for private extensions.
etxrab [Wed, 7 Dec 2011 19:04:13 +0000 (19:04 +0000)]
Add a dissector table for private extensions.

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

8 years agoFix [-Wunused-but-set-variable] GCC warnings;
wmeier [Wed, 7 Dec 2011 14:47:27 +0000 (14:47 +0000)]
Fix [-Wunused-but-set-variable] GCC warnings;
Remove some trailing blanks;
#include <stdio.h> not needed.

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

8 years agoDon't keep out the cmake folks ;-)
sake [Wed, 7 Dec 2011 13:53:14 +0000 (13:53 +0000)]
Don't keep out the cmake folks ;-)

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

8 years agoFix for bug 6650: IP-ID is 2 bytes.
martinm [Wed, 7 Dec 2011 12:19:59 +0000 (12:19 +0000)]
Fix for bug 6650: IP-ID is 2 bytes.
Note that I'm still aiming to change PDCP to use packet-rohc rather than its own, separate implementation...

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

8 years agoRatingGroup -> RatingGroupId
etxrab [Wed, 7 Dec 2011 06:29:31 +0000 (06:29 +0000)]
RatingGroup -> RatingGroupId

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

8 years agoMake windows buildbots happy...
sake [Tue, 6 Dec 2011 23:52:01 +0000 (23:52 +0000)]
Make windows buildbots happy...

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

8 years ago- Make a distinction between ethernet padding and an ethernet trailer
sake [Tue, 6 Dec 2011 23:07:55 +0000 (23:07 +0000)]
- Make a distinction between ethernet padding and an ethernet trailer
- ... and make that distinction configurable for capture files that do not have padding in small frames, but do have trailers
- Add VSS-Monitoring dissector to show by the TAP inserted time- and portstamps

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

8 years agoRegister giop by name (TCP).
etxrab [Tue, 6 Dec 2011 19:33:55 +0000 (19:33 +0000)]
Register giop by name (TCP).

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

8 years agoEnabling crosshairs on TCP stream graph paints the screen.
etxrab [Tue, 6 Dec 2011 19:28:28 +0000 (19:28 +0000)]
Enabling crosshairs on TCP stream graph paints the screen.
Move the problem to GTK3+

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

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

8 years agoUpdate to 3GPP TS 32.298 V6.4.1 (2006-06)
etxrab [Tue, 6 Dec 2011 19:16:10 +0000 (19:16 +0000)]
Update to 3GPP TS 32.298 V6.4.1 (2006-06)

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

8 years agoAccpet lover case Topology descriptor (tp) as we accept other tokens in lowercase.
etxrab [Tue, 6 Dec 2011 19:10:13 +0000 (19:10 +0000)]
Accpet lover case Topology descriptor (tp) as we accept other tokens in lowercase.

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

8 years agoFix length of Error parameter.
etxrab [Tue, 6 Dec 2011 19:08:01 +0000 (19:08 +0000)]
Fix length of Error parameter.

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

8 years ago#if 0 unused stuff ...
wmeier [Tue, 6 Dec 2011 16:15:24 +0000 (16:15 +0000)]
#if 0 unused stuff ...

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

8 years agoIn capture_prep_monitor_changed_cb(), don't update the monitor mode
guy [Tue, 6 Dec 2011 07:13:40 +0000 (07:13 +0000)]
In capture_prep_monitor_changed_cb(), don't update the monitor mode
checkbox unless we're actually forcing it off.

Small indentation fix.

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

8 years agoOne more contributor...
etxrab [Tue, 6 Dec 2011 07:07:19 +0000 (07:07 +0000)]
One more contributor...

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

8 years agoIf capture_get_if_capabilities() fails, pop up a message, just as we
guy [Tue, 6 Dec 2011 04:00:39 +0000 (04:00 +0000)]
If capture_get_if_capabilities() fails, pop up a message, just as we
print a message in tshark.  That doesn't fix the problem seen on Linux
distributions, such as recent versions of Debian and derivatives, that
have libpcap 1.1.0 or later built without libnl, where the monitor mode
checkbox doesn't work - that's a libpcap bug, fixed in the 1.2 branch
and trunk, so a future 1.2.1 or 1.3.0 release should fix it, and perhaps
a future Debian release will build libpcap with libnl - but at least it
means you get a dialog box rather than just getting mysterious behavior
when you try to check the "monitor mode" checkbox.

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

8 years agoPretify TimeStamp and TimeZone
etxrab [Mon, 5 Dec 2011 21:53:00 +0000 (21:53 +0000)]
Pretify TimeStamp and TimeZone

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

8 years agoExplicitly display "Source or Destination Address/Host" like IPv4.
cmaynard [Mon, 5 Dec 2011 19:12:24 +0000 (19:12 +0000)]
Explicitly display "Source or Destination Address/Host" like IPv4.

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

8 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 4 Dec 2011 18:43:18 +0000 (18:43 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

8 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Sun, 4 Dec 2011 18:43:05 +0000 (18:43 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

8 years agoEnhance Elcom dissector
alagoutte [Sun, 4 Dec 2011 18:40:19 +0000 (18:40 +0000)]
Enhance Elcom dissector
Fix indent and update modelines

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

8 years agoEnhance Elcom dissector
alagoutte [Sun, 4 Dec 2011 18:19:18 +0000 (18:19 +0000)]
Enhance Elcom dissector
Replace proto_tree_add_* by proto_tree_add_item
Replace switch/case by value_string

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

8 years agoFrom Vincent Helfre.
etxrab [Sun, 4 Dec 2011 15:21:22 +0000 (15:21 +0000)]
From Vincent Helfre.
The offset in "Cell Selection Indicator after Release of all TCH and SDCCH" was not correct because the length was element was decoded twice.  So I removed the second decoding of the length.

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

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

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.

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

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

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

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.

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

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)]
Fix:

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"

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

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.

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

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

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

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

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

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 10.5.6.1, 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.

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

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

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

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 @@

 #.USE_VALS_EXT
 GSMMAPOperationLocalvalue
+OperationLocalvalue

 #.EXPORTS
 AddressString

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

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

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6610#add_comment

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.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6610#add_comment

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.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6610#add_comment

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
http://www.iana.org/assignments/pwe3-parameters
- Updated the VCCV bitmaps as per RFC 5885

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

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