Commit Graph

12369 Commits

Author SHA1 Message Date
Alexis La Goutte 0ca0a54d09 From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

[PATCH 8/9] add support for Root Announcement (RANN) IEs

svn path=/trunk/; revision=38280
2011-07-30 15:36:47 +00:00
Alexis La Goutte 0a00741085 From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

[PATCH 7/9] update parsing of mesh control field

During development of the 80211s standard, a "mesh header" was conceived. This mesh header has been renamed the "mesh control field". Further, the conditions under which it is expected to appear have also changed. Specifically, the mesh control field appears in multihop action frames and mesh data frames. In the former case, it appears after the action category and action code, so no special header parsing is required to parse it.

The latter case is a bit more complicated. We know the mesh control field is present if the data frame was transmitted by a mesh STA, AND the new "Mesh Control Present" bit in the QoS control field is set.  This second thing is easy enough to check. But the first thing is not. So we continue to rely on heuristics.  Specifically, we only expect the mesh control field for valid from-ds/to-ds settings, and if the mesh control field itself is valid.

Other relevant changes in this patch include:

-- rename mesh_header to mesh_control as appropriate
-- consider the mesh control field to be part of the header when accounting for payload padding.
-- parse some of the qos fields earlier so they can be used to determine if the mesh control field is present.
-- use existing mesh control parsing code instead of duplicating it.

svn path=/trunk/; revision=38279
2011-07-30 15:31:59 +00:00
Alexis La Goutte 3726e53776 From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

[PATCH 6/9] update mesh path discovery (hwmp) IEs to 802.11s v12

This includes adding the new mesh reason codes

From me
Fix checkAPI Errors (the blurb field matches the field name)

svn path=/trunk/; revision=38278
2011-07-30 15:29:09 +00:00
Alexis La Goutte ac8e9e7e44 From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

[PATCH 5/9] make pre-80211s marvell mesh use its own data structures

The pre-80211s legacy mesh networking developed by marvell has some similarities to the latest 80211s mesh networking. However, there are enough differences in naming and convention that they should have their own data.  For clarity, we break up the marvell and 80211s mesh dissection.

Note that as of this patch, 80211s parsing uses the legacy data structures. That will change in subsequent patches in this set.

svn path=/trunk/; revision=38277
2011-07-30 15:23:33 +00:00
Alexis La Goutte 6d1430440e From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

Subject: [PATCH 4/9] eliminate obsolete non-standard 80211s peer link action frame code

The peer link action frame no longer exists.  Its data now appears in the self-protected action frame and the peering management IE.

Note that this leaves a gap in the internal field codes that is addressed in a subsequent patch.

svn path=/trunk/; revision=38276
2011-07-30 15:20:40 +00:00
Alexis La Goutte b5bc73f869 From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

[PATCH 3/9] add support for 802.11s v12.0 mesh peering management IE

The v12.0 mesh peering management IE replaces the exiting mesh peer link management IE and has a slightly different format.

From me
Fix checkAPI Errors (the blurb field matches the field name)
Remove unused hf_ieee80211_mesh_mgt_pl_reason_code

svn path=/trunk/; revision=38275
2011-07-30 15:19:10 +00:00
Alexis La Goutte afd9d6f633 From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

[PATCH 2/9] add support for 802.11s v12.0 action frame fixed fields

From me
Fix checkAPI Errors (the blurb field matches the field name)

svn path=/trunk/; revision=38274
2011-07-30 15:16:30 +00:00
Alexis La Goutte 4864e95f69 From Brian Cavagnolo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6173
Update 802.11s packet dissecting to the ratified standard (v12.0)

[PATCH 1/9] update mesh ID and mesh config IEs to latest 80211s draft (v12)

svn path=/trunk/; revision=38273
2011-07-30 15:14:19 +00:00
Alexis La Goutte cc2b9a77d8 * Replace FALSE by ENC_BIG_ENDIAN for encoding parameter
* Remove some whitespace...

svn path=/trunk/; revision=38272
2011-07-30 14:11:08 +00:00
Anders Broman eb31fad0b5 Add 3GPP Sv interface.
svn path=/trunk/; revision=38271
2011-07-30 14:05:55 +00:00
Anders Broman e1313c5756 Add 3GPP Sv interface.
svn path=/trunk/; revision=38270
2011-07-30 14:05:31 +00:00
Stig Bjørlykke ec2940333f Fix a typo.
svn path=/trunk/; revision=38269
2011-07-30 09:52:40 +00:00
Anders Broman 0146079da4 CCRSI is not included in 3GPP 29.274 R8.
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6183

svn path=/trunk/; revision=38268
2011-07-30 09:33:10 +00:00
Bill Meier cccda1f981 Remove unneeded #includes and do other minor cleanup.
svn path=/trunk/; revision=38259
2011-07-29 16:07:00 +00:00
Alexis La Goutte 12592dab19 From Owen Kirby via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6147
6LoWPAN: Support for IP-in-IP tunnelingy

svn path=/trunk/; revision=38258
2011-07-29 14:26:41 +00:00
Alexis La Goutte a513ad55ba From Colin O'Flynn & Robert Craige via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6109
Add support for PANA Relay

svn path=/trunk/; revision=38257
2011-07-29 13:19:16 +00:00
Anders Broman 3203f39543 From Lei Chen:
support PSI5 and PSI13 in packet-gsm_rlcmac.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6177

svn path=/trunk/; revision=38248
2011-07-29 05:19:29 +00:00
Stig Bjørlykke 10c3eaa321 Avoid a possible infinite loop in dissect_delete().
This may fix the "Malformed IKE Packet DoS" bug.

svn path=/trunk/; revision=38247
2011-07-28 22:19:46 +00:00
Bill Meier d6253e7504 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.
svn path=/trunk/; revision=38246
2011-07-28 18:17:16 +00:00
Bill Meier 103509672d Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.
svn path=/trunk/; revision=38245
2011-07-28 17:57:11 +00:00
Bill Meier b2aee4f4c2 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning;
Also:
   Return same 'offset' from functions whether or not 'if(tree)'

svn path=/trunk/; revision=38244
2011-07-28 17:05:56 +00:00
Bill Meier b72bd299ab Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning;
Also:
  Return same 'offset' from functions whether or not 'if(tree)'

svn path=/trunk/; revision=38243
2011-07-28 16:54:42 +00:00
Martin Mathieson 2c877da104 Make links forward from DL tx to retx frames.
svn path=/trunk/; revision=38242
2011-07-28 16:52:02 +00:00
Bill Meier cfbe5cf55d Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning;
Also:
  Use -1 iso tvb_[reported_]length() as 'len' arg in proto_tree_add_...();
  Use tvb_reported_length_remaining() where appropriate.

svn path=/trunk/; revision=38241
2011-07-28 15:34:18 +00:00
Anders Broman e9edaef048 application/simservs+xml
svn path=/trunk/; revision=38235
2011-07-28 10:04:12 +00:00
Anders Broman 3e2aa69b02 From Edwin Groothuis:
Add preference to Mute noise of TCP Timestamp Option in the summary line.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6162

svn path=/trunk/; revision=38232
2011-07-28 05:42:25 +00:00
Anders Broman 9c92699857 From Lei Chen:
support 'Packet System Information Type 3' in packet-gsm_rlcmac.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6170

svn path=/trunk/; revision=38231
2011-07-28 05:38:07 +00:00
Alexis La Goutte b7fad24596 From Eric Zhu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5846
Wireshark cannot display Reachable time & Retrans timer in IPv6 RA messages

svn path=/trunk/; revision=38227
2011-07-27 15:19:17 +00:00
Anders Broman 36e5bc35c4 Use tvb_length when adding MSISDN.
svn path=/trunk/; revision=38226
2011-07-27 13:17:58 +00:00
Anders Broman 2fb3c1a4c3 from T. Loebner:
Dissector for XR IDMS from ETSI TS 182 063 v3.5.2 Annex W 

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

svn path=/trunk/; revision=38225
2011-07-27 12:27:39 +00:00
Chris Maynard b8a7e02e4b Avoid a crash reported in bug 6138 by never allowing frame1Size < dataLength.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6138

svn path=/trunk/; revision=38213
2011-07-26 16:19:48 +00:00
Martin Mathieson ca126bace5 Don't attach sequence analysis results to control/data PDUs when not appropriate. The problem is that I use the frame number in the result hash table - I may end up adding more info (e.g. channel, SN) to further avoid attaching reports to wrong PDUs.
svn path=/trunk/; revision=38208
2011-07-26 10:16:02 +00:00
Anders Broman 6956686beb From Lei Chen:
This patch tries to support 'Packet System Information Type 2' in gsm rlcmac
dissector.

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

svn path=/trunk/; revision=38206
2011-07-26 04:20:39 +00:00
Anders Broman c7c53a5b11 From Lei Chen:
CSN_RECURSIVE_TARRAY should count the last '0' bit.

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

svn path=/trunk/; revision=38205
2011-07-26 03:52:29 +00:00
Bill Meier 788cf96878 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.
Also: various minor cleanup and a few minor bug fixes:

svn path=/trunk/; revision=38204
2011-07-25 20:54:13 +00:00
Martin Mathieson c2dadba8f4 From Pascal Quantin (bug 6159).
When decoding drb payload, call IPv4, IPv6 or data dissector as appropriate.

Am slightly concerned that we always dereference the first byte of the frame - is it safe to assume that the length can't be 0?

svn path=/trunk/; revision=38199
2011-07-25 13:47:26 +00:00
Martin Mathieson be1334ed8f Fix bug 6160.
Use correct string to search for RRC BCH dissectors.

svn path=/trunk/; revision=38198
2011-07-25 13:34:40 +00:00
Bill Meier dfb996beb4 Fix a benign bug in the patch from Bug #5795.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5795

svn path=/trunk/; revision=38192
2011-07-24 21:03:01 +00:00
Bill Meier 8ec1ed9fea Commit missing parts of Bug #5795 patch (those not committed in SVN 38175 & 38176).
(See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5795)


svn path=/trunk/; revision=38190
2011-07-24 20:48:57 +00:00
Alexis La Goutte 20aefe36c7 Wrong patch commit in Rev38175...
Fix :
packet-tcp.c:3337: error: ‘dissect_tcpopt_maxseg’ undeclared here (not in a function)
packet-tcp.c:2264: error: ‘dissec_tcpopt_exp’ defined but not used

svn path=/trunk/; revision=38176
2011-07-23 16:31:10 +00:00
Alexis La Goutte a880ea378d From Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5795
Add TCP Options support for #253, #254 (experimental), expand MSS / SACKPERM view, add hidden TCP Option Kind/Length to all

svn path=/trunk/; revision=38175
2011-07-23 16:13:05 +00:00
Alexis La Goutte 541be89168 Update last IANA Parameters
RFC-ietf-ipsecme-failure-detection-08.txt => RFC6290
RFC-ietf-ipsecme-ipsecha-protocol-06.txt => RFC6311

svn path=/trunk/; revision=38174
2011-07-23 15:53:19 +00:00
Chris Maynard 0693606010 Avoid potential midday problems by narrowing the midnight rollover test.
svn path=/trunk/; revision=38171
2011-07-23 00:30:24 +00:00
Bill Meier c67363e4de Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38170
2011-07-22 18:33:44 +00:00
Anders Broman 50e89d0567 From Ludovic Haessler:
Add 3GPP LLC/SNDCP protocols management in GSMTAP dissecto.

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

svn path=/trunk/; revision=38166
2011-07-22 08:24:48 +00:00
Anders Broman 78e17be242 From Lei Chen:
Support "Packet System Information Type 1" in packet-gsm_rlcmac.c

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

svn path=/trunk/; revision=38165
2011-07-22 08:18:59 +00:00
Anders Broman bdc9f65888 From Lei Chen:
pDescr should not step on until proto_tree_add_text() has been called.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6151

svn path=/trunk/; revision=38164
2011-07-22 08:10:25 +00:00
Anders Broman 7439bba9dc Try to do a more syntactically correct import.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6150

svn path=/trunk/; revision=38159
2011-07-21 22:46:07 +00:00
Bill Meier 2e4ea6c4d0 From Daniel Willmann: packet-lon.c: Fix Multicast decoding when M_Length is zero.
In case M_Length is 0 the M_List field does not exist.
The attached patch fixes this and it also changes the names of the M_List and
M_List length field to more general names.

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

svn path=/trunk/; revision=38158
2011-07-21 22:34:50 +00:00
Bill Meier 5de7f53e08 From Daniel Willmann: Visual improvements for the LON (EIA-709.1) dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6148

svn path=/trunk/; revision=38157
2011-07-21 22:24:46 +00:00
Bill Meier 8e01cc53fc Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: In various places: compute 'offset' whether or not 'if(tree)'.

svn path=/trunk/; revision=38156
2011-07-21 21:54:09 +00:00
Anders Broman a9259c309e From Martin Kaiser:
Add support for the ca_pmt_reply apdu as defined in section 8.4.3.5 of the DVB-CI standard (EN 50221).

Also some new apdu tags and their descriptions are added for completeness.
After applying this patch, DVB-CI support is complete except for reassembly

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

svn path=/trunk/; revision=38137
2011-07-20 22:34:57 +00:00
Anders Broman 4b692c92c8 From Lei Chen:
patch to support "Additional MS Radio Access Capability" and "Packet Pause" in packet-gsm_rlcmac.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6133

svn path=/trunk/; revision=38136
2011-07-20 22:07:31 +00:00
Anders Broman 0a65432f96 Use ENC_BIG_ENDIAN.
svn path=/trunk/; revision=38135
2011-07-20 14:09:19 +00:00
Martin Mathieson 7d7f7d870e Register nicer entry points for LTE RRC BCH messages, and use them in RLC, MAC, PDCP.
svn path=/trunk/; revision=38131
2011-07-20 12:19:22 +00:00
Chris Maynard 0506627c30 Apply some endian heuristics when dissecting ICMP originate, receive and transmit timestamps. Fixes bug 6114.
Ref: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6114

svn path=/trunk/; revision=38129
2011-07-20 00:22:31 +00:00
Guy Harris c34b796445 Add a DREP_LITTLE_ENDIAN for the DCE RPC endianness bit in the data
representation.  Use it rather than a raw 0x10.

Add a DREP_ENC_INTEGER() macro that takes a pointer to the data
representation and returns either ENC_LITTLE_ENDIAN or ENC_BIG_ENDIAN;
use it for the encoding argument to proto_tree_add_item(), rather than
just the AND of drep[0] and DREP_LITTLE_ENDIAN, as it's not a boolean
any more, and for string values we'll be supporting character encodings
as well and thus won't be able to trust that the 0x10 bit will mean
"little endian".

Use ENC_NA for some other encoding values, i.e. for FT_BYTES and the
like.

Fix a couple of places in the DCOM dissector where we were passing the
byte-order bit rather than the field value to
proto_tree_add_uint_format().

Clean up white space.

svn path=/trunk/; revision=38128
2011-07-19 23:02:02 +00:00
Stig Bjørlykke ba2aae0f8e Use ENC_NA as encoding for FT_PROTOCOL, FT_NONE and FT_BYTES.
svn path=/trunk/; revision=38122
2011-07-19 18:48:31 +00:00
Martin Mathieson 049643cf28 From Pradip Biswas, bug 6127 - Added Decode for RRC BCCH (BCH and DL_SCH) messages on RLC-over-UDP.
Add separate codes/cases for BCH-over-BCH and BCH-over-DLSCH.

svn path=/trunk/; revision=38115
2011-07-19 16:41:56 +00:00
Chris Maynard 7bc1f25843 Based on the information provided by Steve Karg via -dev, change all occurrences of ENC_LITTLE_ENDIAN to ENC_BIG_ENDIAN.
Ref: http://www.wireshark.org/lists/wireshark-dev/201107/msg00305.html


svn path=/trunk/; revision=38110
2011-07-19 13:19:49 +00:00
Stig Bjørlykke f282154ab0 Use correct encoding for proto_tree_add_item().
svn path=/trunk/; revision=38107
2011-07-19 10:51:12 +00:00
Guy Harris 93abdd9804 Use ENC_LITTLE_ENDIAN rather than TRUE in proto_tree_add_item() calls.
(Yes, that means that all but one call uses ENC_LITTLE_ENDIAN, and one
uses ENC_BIG_ENDIAN.  I guess that's how the protocol works....)

svn path=/trunk/; revision=38106
2011-07-19 03:20:02 +00:00
Chris Maynard b968cc5c0b From Michael Mann via bug 5769: In fDevice_Instance(), add field in proper
big-endian byte order.

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

svn path=/trunk/; revision=38105
2011-07-19 02:47:12 +00:00
Bill Meier 3f7e7672c9 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38095
2011-07-18 19:11:32 +00:00
Bill Meier 6bdcd858e9 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38086
2011-07-18 15:54:25 +00:00
Bill Meier 5db6069274 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38085
2011-07-18 15:52:16 +00:00
Bill Meier e6f1541bf1 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38082
2011-07-18 12:50:26 +00:00
Martin Mathieson b1eb5b9a1a For UL retx, show links forward to next Tx as well as backwards to previous.
svn path=/trunk/; revision=38077
2011-07-18 11:57:38 +00:00
Martin Mathieson 3f3fde986f Add a generated field for the number of NACKs in an AM status PDU.
svn path=/trunk/; revision=38076
2011-07-18 10:40:57 +00:00
Sake Blok 796564ed90 Repair "Follow TCP Stream" which got broken by my change in SVN 38056
Mental note: Try to not do half work ;-)


svn path=/trunk/; revision=38065
2011-07-17 11:08:02 +00:00
Sake Blok d00167886f Stop using the conversation index for tcp stream values as the gaps in the numbering is causing to many questions. Also, numbering could be different for the same file when viewed on different Wireshark versions, which could lead to confusion too.
(see also: http://ask.wireshark.org/questions/5056/how-does-wireshark-calculate-the-tcp-stream-index)

svn path=/trunk/; revision=38056
2011-07-15 23:40:16 +00:00
Stephen Fisher e6a964dc62 Update URL addition in r37899 with an "original" site instead of a mirror.
svn path=/trunk/; revision=38054
2011-07-15 22:50:53 +00:00
Bill Meier b17543e2c0 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38049
2011-07-15 19:07:25 +00:00
Bill Meier 111e08bb3d Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Whitespace changes: "4 space tabs" --> spaces.

svn path=/trunk/; revision=38047
2011-07-15 16:59:18 +00:00
Sake Blok 950646b751 * If first 8 bytes in icmp data do not look like a timestamp in BE, try LE representation.
* Change field title to not confuse people when the clocks of the pinging system and the capturing system are not in sync.


svn path=/trunk/; revision=38041
2011-07-15 08:57:59 +00:00
Chris Maynard 78d9816855 Fix "comparison between signed and unsigned" warning.
svn path=/trunk/; revision=38039
2011-07-15 04:40:03 +00:00
Chris Maynard 0ffe6deac1 Be sure there's enough bytes in the ICMP payload before trying to access it in
order to try to determine if it contains a timestamp.  Added some FIXME notes.

svn path=/trunk/; revision=38038
2011-07-15 02:39:53 +00:00
Bill Meier a739833277 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: whitespace cleanup.

svn path=/trunk/; revision=38036
2011-07-15 00:15:01 +00:00
Bill Meier ea9a55f1d2 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38035
2011-07-15 00:13:59 +00:00
Bill Meier 4dacef1ff9 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also:
 - Move proto_reg_handoff_msrp() to the end of the file;
 - Define a function and a global variable as static;


svn path=/trunk/; revision=38034
2011-07-15 00:08:45 +00:00
Sake Blok 0eacf5ab26 Make windows buildbot happy (hopefully!)
svn path=/trunk/; revision=38030
2011-07-14 22:03:13 +00:00
Sake Blok 43116e9a0b If the first 8 bytes of the icmp echo/echo-reply data look like a timestamp, dissect it as a timestmap and calculate the time since the icmp packet was created.
svn path=/trunk/; revision=38028
2011-07-14 21:27:17 +00:00
Graeme Lunt 9e4afbfd49 Update the algorithms in line with RFC 5912 including support for eliptic curve algorithms.
svn path=/trunk/; revision=38017
2011-07-14 13:47:13 +00:00
Graeme Lunt f8a7d85e1c Update to correct the definition of the clearance attribute used in certificates.
RFC3281 erroneously defined the Clearance attribute to be different to that defined in X.509. This has been recognised and corrected in RFC5755.
The RFC3281 syntax is retained and registered as the "RFC3281Clearance" syntax, which can be used to override the correct syntax in the BER oidtables if necessary.


svn path=/trunk/; revision=38014
2011-07-14 08:47:05 +00:00
Bill Meier 3af6394891 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings
svn path=/trunk/; revision=38001
2011-07-13 19:48:58 +00:00
Bill Meier b3c8baf2d5 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings
svn path=/trunk/; revision=37999
2011-07-13 18:42:40 +00:00
Bill Meier 12ff22254f Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings
svn path=/trunk/; revision=37998
2011-07-13 17:04:55 +00:00
Gerald Combs 49b92440de More GLIB_CHECK_VERSION cleanups. Update the minimum GLib/GTK+ versions
in README.devloper. Remove g_gnuc.h since it's no longer needed. Remove
tvbuff_init(), tvbuff_cleanup(), reassemble_init(), and
reassemble_cleanup() since they were only used for older GLib versions
which didn't support GSlices. Assume we always support the "matches"
operator.

svn path=/trunk/; revision=37978
2011-07-11 20:32:19 +00:00
Anders Broman 0604267b6d Change encoding type from FALSE to ENC_BIG_ENDIAN.
svn path=/trunk/; revision=37963
2011-07-11 13:44:29 +00:00
Anders Broman c5fab10bf1 From qgj:
when dissect the capwap control header,the sequence's value is decoded
improperly,it tooks the wrong offset value,so the control messages' sequence is
showed improperly.
Changed to uset proto_add_item and encoding type changed from FALSE to ENC_BIG_ENDIAN.

svn path=/trunk/; revision=37962
2011-07-11 13:43:12 +00:00
Anders Broman 7b0ca24a90 Change encoding type from FALSE to ENC_BIG_ENDIAN.
svn path=/trunk/; revision=37961
2011-07-11 13:41:19 +00:00
Anders Broman 1f0ca1440c From Ludovic Haessler:
Add 3GPP TS44.060 RLC/MAC control blocks management in GSMTAP dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6103

svn path=/trunk/; revision=37960
2011-07-11 13:32:04 +00:00
Anders Broman 66e3012f0f Make sure consumed is set.
svn path=/trunk/; revision=37959
2011-07-11 10:42:16 +00:00
Anders Broman 25d82cf3e3 From Michael Mann:
Added filters for BOOTP options of "basic" types (modeled after packet-wssap.c)

"bootp.option.length" only used when specific option filter can't be found.
"bootp.option.value" expanded to support multiple types

Converted "custom options string" to UAT

replacing many proto_tree_add_text() calls with
proto_tree_add_item(), so the BOOTP dissector is considerably more filterable

svn path=/trunk/; revision=37958
2011-07-11 10:12:40 +00:00
Chris Maynard c23afc424e As noted by Jaap Keuter on -dev, be sure to use message_size instead of
header->message_size for a correct host endianness comparison.


svn path=/trunk/; revision=37957
2011-07-11 00:17:08 +00:00
Anders Broman 94bf8a52be From Jaap:
Limit the search to the line.

svn path=/trunk/; revision=37955
2011-07-10 22:13:03 +00:00
Guy Harris a3ae744636 Add port 2710 for the XBT BitTorrent tracker (and note why it's added;
the other unusual ports should be mentioned as well).

svn path=/trunk/; revision=37952
2011-07-10 18:34:15 +00:00
Guy Harris b02af4355c Make sure the SID string attached to a dcerpc_call_value has session
duration, just as the dcerpc_call_value itself does.

svn path=/trunk/; revision=37951
2011-07-10 17:57:39 +00:00
Guy Harris 9988c54700 Put Modbus/UDP support back.
svn path=/trunk/; revision=37947
2011-07-09 19:58:19 +00:00
Guy Harris a53bf09cc1 If the reply length is < 32, that's an overflow, not a bug in the
dissector (unless you consider the calculation not being done in 64 bits
as a bug).  For now, toss a ReportedBoundsError.

svn path=/trunk/; revision=37946
2011-07-09 18:56:21 +00:00
Chris Maynard f93d3aeeb1 Per README.developer, we must call subdissectors regardless of whether "tree"
is NULL or not.  With this change, GRE-encapsulated packets (such as IP)
should now appear in then endpoint and conversation lists.  This was
essentially the request made at Sharkfest '11.  The actual request was for a
"GRE" tab to be added, but that doesn't really make much sense to me.  I
believe this change should fulfill that request.


svn path=/trunk/; revision=37945
2011-07-09 02:04:48 +00:00
Martin Mathieson 33a21986f1 Trivial: add a couple of newlines.
svn path=/trunk/; revision=37941
2011-07-08 16:10:25 +00:00
Guy Harris eedafe0a92 %u suffices, as varargs are widened. (It aslso doesn't cause Clang to
complain.)

svn path=/trunk/; revision=37933
2011-07-08 01:58:30 +00:00
Chris Maynard 0dcd4ac28c In elem_cell_id_aux(), in the case of an unknown/invalid disc, be sure to
increment the curr_offset by the correct number of bytes; otherwise we can run
into an infinite loop condition such as was the case for bug 6044.

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


svn path=/trunk/; revision=37930
2011-07-07 16:37:33 +00:00
Alexis La Goutte 0e2d677887 From Ali Bahar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6093
802.11 Association Response Packet's "Status Code" field is imprecisely decoded/described.

From me :
* Display Reason code in decimal (not Hexa)
* Check list from last standard (802.11-2007, 802.11r-2008, 802.11n-2009, 802.11w-2009 & 802.11z-2011)
* Add link to 802.11z-2010 documentation

svn path=/trunk/; revision=37927
2011-07-07 10:19:02 +00:00
Anders Broman 2a6c45c5a2 From Ludovic Haessler:
CSN Ack/Nack Description wrongly handled in gsm_rlcmac_dl dissector (3GPP TS 44.060)

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

svn path=/trunk/; revision=37926
2011-07-07 07:44:25 +00:00
Chris Maynard f16b234b84 Fix memory leak, using ep_alloc() instead of g_malloc().
svn path=/trunk/; revision=37923
2011-07-06 16:03:43 +00:00
Anders Broman 0c812dbe61 From György Szaniszló:
Introduced a new tcp state variable: maxseqtobeacked, this is the
maximum seq number that can be acked by the rev party in normal case.
This new state variable only serves the proper detection of
tcp.analysis.ack_lost_segment indicator, and decouples it from the detection of
tcp.analysis.lost_segment indicator.

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

svn path=/trunk/; revision=37922
2011-07-06 15:45:56 +00:00
Anders Broman 51b2410345 From Ludovic Haessler:
Wrong decoding of RLC/MAC EGPRS Packet Downlink Ack/Nack (3GPP TS 44.060)

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

svn path=/trunk/; revision=37919
2011-07-06 12:53:04 +00:00
Anders Broman 6fdf0eed8f From HAESSLER:
Abis interface not correctly handled in gsmtap dissector

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

svn path=/trunk/; revision=37918
2011-07-06 12:47:21 +00:00
Guy Harris 859aadfd5f Add a URL for the specifications. (No, the Wireshark source code is not
a specification.)

Put V1 support back, in case there are captures out there with V1
packets and somebody wants to read them.

We don't need two identical tests against the minimum length.

For an unknown version, just put in a text item for the data, don't
append a note to the length field (which is the wrong field to append to
in any case).

Make routines not used outside this file static.

svn path=/trunk/; revision=37912
2011-07-06 05:31:42 +00:00
Guy Harris 053c583fda Add some additional routine variants that handle string encodings, and
make FT_STRING and FT_UINT_STRING handle string encodings.

Get rid of FT_EBCDIC in favor of FT_STRING with ENC_EBCDIC.

Add some URLs for DRDA.

Clean up some stuff in TN3270 and TN5250, including using ENC_ values
for proto_tree_add_item().

svn path=/trunk/; revision=37909
2011-07-05 23:59:23 +00:00
Guy Harris 2ef2ecde9a The #if 0'ed out code was being used; #if 0'ing it out meant that some
items didn't get put into the protocol tree.  See, for example, the
4548-Bug4668.pcap capture in the Wireshark menagerie (and attached to
bug 4668).

Instead, replace the #if 0'ed out code with code that does what the
non-commented-out line of code did, but doesn't assign to the unused and
now non-existent pi variable.

Make the "hf_id != -1" case the first one, as that should be the
"normal" case.

svn path=/trunk/; revision=37908
2011-07-05 23:14:00 +00:00
Guy Harris 9788778543 Add ett_a11_rqi_grantedqos to the list of ett_ values to be allocated.
Clean up indentation.

svn path=/trunk/; revision=37906
2011-07-05 21:11:58 +00:00
Anders Broman 1103e61a2a From Michael Mann:
Added choice to display UTC or local time.  Defaulted to local for "backwards compatibility"

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

svn path=/trunk/; revision=37902
2011-07-05 15:22:28 +00:00
Anders Broman 9e5a06a2ef From Sven Eckelmann:
Add support for v14

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

svn path=/trunk/; revision=37901
2011-07-05 08:20:23 +00:00
Anders Broman 99d0148b99 From Sven Eckelmann:
Rename HNA to TT to use the same names as upstream.

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

svn path=/trunk/; revision=37900
2011-07-05 08:17:46 +00:00
Guy Harris 6a4693d7ff Add a URL for DECnet Phase IV specifications.
svn path=/trunk/; revision=37899
2011-07-04 22:01:36 +00:00
Anders Broman 78d22ed8ee From Sven Eckelmann:
Fix size of unicast fragment packet in v12.

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

svn path=/trunk/; revision=37897
2011-07-04 21:20:18 +00:00
Anders Broman b00a34230c From Sven Eckelmann:
Remove unused length_remaining.

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

svn path=/trunk/; revision=37896
2011-07-04 21:16:51 +00:00
Anders Broman e85447a30f From Sven Eckelmann:
Unify handling of NULL-tree in dissection routines.

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

svn path=/trunk/; revision=37894
2011-07-04 21:14:02 +00:00
Anders Broman 49b4ec10b6 From Christopher Maynard:
From doc/README.tapping:

IF the tap is going to return private data using the last parameter to
tap_queue_packet() and IF the protocol can appear multiple times inside the
same packet, you will have to make sure that each instance of
tap_queue_packet() is using its own instance of private struct variable
so they don't overwrite each other.

This was the case here, so I changed the static allocation of tap_rec to be
ep_alloc'd.  I also tried to clean up the Info column a bit.  With this patch
applied, the graph now shows the APM and ANM correctly instead of 2 ANM's.

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

svn path=/trunk/; revision=37893
2011-07-04 20:43:29 +00:00
Anders Broman 639e59a9f9 From Michael Mann:
Removed "key prefix" need within GUI so it's a little more intuitive (because
that's what this bug is complaining about).  Slight backwards compatibility
issue with UAT (because key prefix was in previous keys), but all development 
(including fix for BUG 1123 that created UAT) has just been on SVN and not
released.

Also adjusted AirPCap (airpcap_loader.c) to account for the lack of "key
prefix".

Addressed some memory leaks/excess string creation.

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

svn path=/trunk/; revision=37888
2011-07-04 14:07:20 +00:00
Anders Broman 509c6a7fc0 From Roland Knall:
This patch will add preliminary Profinet IO transport protocol dissection to
the openSAFETY protocol.

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

svn path=/trunk/; revision=37887
2011-07-04 14:00:51 +00:00
Anders Broman 3d17e592d5 From Pascal Quantin:
Do not trigger an assert when reaching an unknown extension in CHOICE and SEQUENCE types.

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

svn path=/trunk/; revision=37886
2011-07-04 06:22:15 +00:00
Anders Broman 241958363d Error: the blurb for field "Extension header" ("gtp.ext_hdr") matches the field name in packet-gtp.c
svn path=/trunk/; revision=37885
2011-07-04 06:11:38 +00:00
Anders Broman d86c200706 From Martin Isaksson:
PDCP PDU number extension header support.

svn path=/trunk/; revision=37880
2011-07-03 19:16:21 +00:00
Guy Harris 338af96b2e Add a tvb_get_ephemeral_string_enc() routine that's like
tvb_get_ephemeral_string() but takes an ENC_ value for the character
encoding.  Use it in the MQ dissector to fetch strings to put, for
example, into the Info column, so we properly handle EBCDIC strings
there.

svn path=/trunk/; revision=37876
2011-07-03 17:08:25 +00:00
Anders Broman 8b303cc61a From Roland Knall:
The way heuristic dissection was handled by the openSAFETY plugin, could lead
to out-of-memory problems with large files (>50.000 packets). The new version
does not use ep_alloc anymore, but a static boolean instead.

Also, the code registering for the SercosIII dissector got simplified, as the
SercosIII dissector is no longer a plugin.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6061

svn path=/trunk/; revision=37874
2011-07-03 16:03:46 +00:00
Guy Harris ae7f40cbfc Add ENC_ values for UTF-8 and EBCDIC, support them for FT_STRINGZ
values, and use them in the MQ dissector, so EBCDIC strings are
displayed as such.

Fix up some other final arguments to proto_tree_add_item().

svn path=/trunk/; revision=37872
2011-07-03 01:40:12 +00:00
Chris Maynard 5f2f261f52 Since the TCP Flags tree encompasses 12 bits including the 3 reserved bits and
the nonce bit, we should display 3 nibbles on the Flags summary line in order
to represent all flag bits.  While arguably we need not worry about reserved
bits, the nonce bit is not currently represented, so that bit alone pushes us
into the next nibble.


svn path=/trunk/; revision=37856
2011-07-01 19:40:35 +00:00
Chris Maynard 220341f369 I decode_tcp_ports(), don't abort processing zero window probe packets, even if the payload is only a single byte. Also, for the keep-alives, display any payload that might be present.
svn path=/trunk/; revision=37854
2011-07-01 19:17:02 +00:00
Chris Maynard d927b60f21 Initialize the TCP windows to the maximum value instead of 0 to avoid false zero window conditions, especially at the beginning of a capture or if only one side of a conversation is captured. This resolves bug 4716: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4716.
svn path=/trunk/; revision=37853
2011-07-01 19:00:14 +00:00
Stig Bjørlykke c026f4b01c Avoid absurdly large values used in for-loops.
svn path=/trunk/; revision=37842
2011-06-30 09:31:11 +00:00
Chris Maynard 2d99c2dbb4 Although technically not needed, for clarity, explicity catch invalid Ethernet frames, increment the "other" count and return. Previously, code execution would have fallen through to the ETHERNET_II case and capture_ethertype() would have incremented the "other" count.
svn path=/trunk/; revision=37835
2011-06-29 17:22:18 +00:00
Chris Maynard e27a75ac39 Indicate TCP fast retransmissions as an expert info note, rather than a warning,just as TCP retransmissions are. This was a user request from Sharkfest '11.
svn path=/trunk/; revision=37834
2011-06-29 16:59:37 +00:00
Chris Maynard 3dd1b0c0de Based on Guy's suggestion from the user mailing list, dissect Ethernet frames with a type/len field in the range of 1501-1535 as invalid, and add an expert info to make it that much easier to find such invalid frames.
Also did some whitespace cleanup, converting tabs to spaces since most of the file was spaced, not tabbed, and swapped the order that the lg and ig bits get added to the tree because I think it looks better reading bits left-to-right.

TODO: I'm not entirely sure what to do in capture_eth() if that invalid range is encountered, so for now I just added some #if 0'd code as a placeholder.

Ref: http://www.wireshark.org/lists/wireshark-users/201106/msg00127.html


svn path=/trunk/; revision=37832
2011-06-29 16:05:56 +00:00
Jakub Zawadzki abe9ce28a5 Update my email address.
svn path=/trunk/; revision=37831
2011-06-29 11:03:41 +00:00
Stig Bjørlykke 958919b8ca Strengthen heuristics for Packets.
This fixes bug 6073.

svn path=/trunk/; revision=37828
2011-06-29 07:02:04 +00:00
Guy Harris c5a413c569 Don't return an offset that you won't later use.
The length fields in a pcap_pkthdr are unsigned, so presumably the
equivalent fields in the rpcap protocol are also unsigned.

Make sure the captured data length isn't bigger than the remaining data
in the packet before attempting to construct a tvbuff for the packet
data.  If it is, report that as an error, and don't even try to
construct the tvbuff; that'll fail.  This fixes bug 6073.

svn path=/trunk/; revision=37826
2011-06-29 05:21:10 +00:00
Stig Bjørlykke 8443bbbf75 Replace all strerror() with g_strerror().
Remove our local strerror implementation.
Mark strerror as locale unsafe API.

This fixes bug 5715.

svn path=/trunk/; revision=37812
2011-06-28 09:00:11 +00:00
Stig Bjørlykke 4244ec0357 Remove Makefile.in when 'make maintainer-clean'.
svn path=/trunk/; revision=37796
2011-06-27 08:02:46 +00:00
Jaap Keuter eaa3542ae7 Update the dissector_add call to use the current API.
svn path=/trunk/; revision=37782
2011-06-24 19:57:14 +00:00
Jaap Keuter c9809b51dc From Peter Nahas:
This patch adds support for the two-way Sythetic Loss Measurement 
opcodes (SLM & SLR) defined in the latest ITU-T Y.1731. 

svn path=/trunk/; revision=37781
2011-06-24 06:49:20 +00:00
Jaap Keuter f1bb0e1735 From Dejan Bucar:
Added support new multicore header in the LINX Ethernet protocol.
Added linx/tcp.

svn path=/trunk/; revision=37777
2011-06-23 21:52:58 +00:00
Jaap Keuter 9832ff5657 From Andrey Kulikov:
Patch to show GOST certificate types in CertificateRequest message.

svn path=/trunk/; revision=37776
2011-06-23 21:33:29 +00:00
Jaap Keuter 525b5fb796 From Andrey Kulikov:
Patch to TLS dissector to show GOST ciphesuites names. 

svn path=/trunk/; revision=37775
2011-06-23 21:17:42 +00:00
Bill Meier 2994dae6d4 From Ivan Lawrow: GTS Descriptor count is a 3 bit field;
The IEEE 802.15.4 GTS descriptor count is a 3-bit field (see page 144
of attached spec).

The mask for this field is incorrectly defined as a 2-bit field in
epan/dissectors/packet-ieee802154.h line 74:


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

svn path=/trunk/; revision=37771
2011-06-23 15:40:34 +00:00
Stig Bjørlykke 12214c85d0 Added missing $Id$
svn path=/trunk/; revision=37767
2011-06-23 13:48:38 +00:00
Anders Broman 2465e8e92d Add a protocol decode.
svn path=/trunk/; revision=37764
2011-06-23 13:03:37 +00:00