Commit graph

481 commits

Author SHA1 Message Date
Alexis La Goutte
648ac74b5e Fix errors found by fix-encoding-args tools
svn path=/trunk/; revision=49158
2013-05-04 08:12:50 +00:00
Michael Mann
31320e7271 Dissect SSID List element.
From Jouni Malinen, bug 8613 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8613)

svn path=/trunk/; revision=49137
2013-05-02 13:08:31 +00:00
Michael Mann
f52ecf47c8 Remove global variable g_pinfo.
svn path=/trunk/; revision=49135
2013-05-02 12:59:07 +00:00
Michael Mann
5b416c8479 IEEE802.11 improvements:
1. ANQP Venue Name is a UTF-8 string
2. Dissect Hotspot 2.0 indication and ANQP elements
3. Dissect TFS Request/Response
4. Dissect WNM-Notification Request frames

svn path=/trunk/; revision=49131
2013-05-02 01:59:34 +00:00
Michael Mann
f1918b01e1 Add BSS Max Idle Period, WNM-Sleep Mode.
Fix and enhance TCLAS dissection.

From Jouni Malinen, bug 8613 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8613)

svn path=/trunk/; revision=49129
2013-05-02 01:15:25 +00:00
Alexis La Goutte
049399b2fa Add dissection of Aruba Networks Vendor Specific stuff. With ArubaOS 6.2, there is a option to add AP Name in Beacon frame.
svn path=/trunk/; revision=48963
2013-04-22 12:31:04 +00:00
Guy Harris
72c5985ec6 Don't use ENC_NA for integer fields longer than 1 byte; use
ENC_BIG_ENDIAN or ENC_LITTLE_ENDIAN.

Treat the AP PS Buffer State subfield of the QoS field the same way we
treat other subfields in the second byte of the QoS field - show it as
the upper 8 bits of the (shown as big-endian) QoS field.  Fix a bitmap
while we're at it.

Show the channel map as an FT_NONE - it's a structure with two bytes.

svn path=/trunk/; revision=48924
2013-04-19 08:59:45 +00:00
Jörg Mayer
171fe6de6c Small cosmetic fixes to CCX decoding
svn path=/trunk/; revision=48923
2013-04-19 05:44:41 +00:00
Alexis La Goutte
b7844a673b From report of Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8561 802.11 QoS decode broken from 1.9.2
Wrong encoding type (ENC_BIG_ENDIAN => ENC_LITTLE_ENDIAN)
Also fix a wrong increment offset about TXOP

svn path=/trunk/; revision=48769
2013-04-07 15:57:20 +00:00
Alexis La Goutte
8576eb409f Move #define OUI include in ieee80211 dissector to epan/oui.h Add Modelines to epan/oui.h
svn path=/trunk/; revision=48768
2013-04-07 15:57:11 +00:00
Alexis La Goutte
a09722c937 Enhance 802.11 Vendor Specific IE * Remove hf_ieee80211_tag_interpretation...
svn path=/trunk/; revision=48766
2013-04-07 15:56:52 +00:00
Alexis La Goutte
f84fde9439 Enhance 802.11(n) Vendor Specific IE HT * Remove hf_ieee80211_tag_interpretation...
svn path=/trunk/; revision=48765
2013-04-07 15:56:37 +00:00
Jaap Keuter
97136126bc Typo's. That is all.
svn path=/trunk/; revision=48685
2013-04-01 15:29:49 +00:00
Evan Huus
37600a157b Rename value string (and similar) functions to use a consistent pattern. This
was done using textual search+replace, not anything syntax-aware, so presumably
it got most comments as well (except where there were typos).

Use a consistent coding style, and make proper use of the WS_DLL_* defines.

Group the functions appropriately in the header.

I ended up getting rid of most of the explanatory comments since many of them
duplicated what was in the value_string.c file (and were out of sync with the
recent updates I made to those in r48633). Presumably most of the comments
should be in the .h file not the .c file, but there's enough churn ahead that
it's not worth fixing yet.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8467

svn path=/trunk/; revision=48634
2013-03-29 00:26:23 +00:00
Alexis La Goutte
269c4fd8c2 From Johannes Berg via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8534 802.11: doesn't parse extended channel switch announcement frames correctly
There are more fixed fields in extended channel switch announcement frames.

svn path=/trunk/; revision=48599
2013-03-27 21:07:45 +00:00
Guy Harris
606e1ed681 Fix two errors in ieee80211_status_code - one out-of-order entry and one
(presumed) typo (61 would be a duplicate, and was between 70 and 72, so
I assume it was supposed to be 71).

svn path=/trunk/; revision=48556
2013-03-26 01:11:06 +00:00
Guy Harris
a2414d8909 Don't wire into the reassembly code the notion that reassemblies should
be done on flows from one address to another; reassembly for protocols
running atop TCP should be done on flows from one TCP endpoint to
another.

We do this by:

	adding "reassembly table" as a data structure;

	associating hash tables for both in-progress reassemblies and
	completed reassemblies with that data structure (currently, not
	all reassemblies use the latter; they might keep completed
	reassemblies in the first table);

	having functions to create and destroy keys in that table;

	offering standard routines for doing address-based and
	address-and-port-based flow processing, so that dissectors not
	needing their own specialized flow processing can just use them.

This fixes some mis-reassemblies of NIS YPSERV YPALL responses (where
the second YPALL response is processed as if it were a continuation of
a previous response between different endpoints, even though said
response is already reassembled), and also allows the DCE RPC-specific
stuff to be moved out of epan/reassembly.c into the DCE RPC dissector.

svn path=/trunk/; revision=48491
2013-03-22 23:59:54 +00:00
Alexis La Goutte
d16cb61d96 From chaitanya via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8497
Add support for 11R RIC IE's: Data and Descriptors for both FT-Over-Air and FT-Over-DS

Add 802.11 Tag RIC Data (57)
Add 802.11 Tag RIC Descriptor (75) (Not tested...)

From me:
- Remove tabs and whitespace
- Fix fix-encodings-args "warning"

svn path=/trunk/; revision=48421
2013-03-19 16:59:06 +00:00
Alexis La Goutte
6c6d8f1629 Enhance 802.11 FCS check - Replace proto_tree_add_* by proto_tree_add_item - Add bad FCS to colorfilters
svn path=/trunk/; revision=48361
2013-03-17 19:22:19 +00:00
Alexis La Goutte
bfe7af447d Enhance 802.11 Qos Control dissection - Replace proto_tree_add_* by proto_tree_add_item - Use Bitmask feature
svn path=/trunk/; revision=48360
2013-03-17 19:22:10 +00:00
Alexis La Goutte
1f7466aa63 Enhance 802.11 Frame control dissection - Replace proto_tree_add_* by proto_tree_add_item - Add Expert info when Retry 802.11 Frame
svn path=/trunk/; revision=48359
2013-03-17 19:22:01 +00:00
Alexis La Goutte
6dcc65e366 Enhance Vendor RSN IE - Remove hf_ieee80211_tag_interpretation... - Replace proto_tree_add_* by proto_tree_add_item
svn path=/trunk/; revision=48358
2013-03-17 19:21:52 +00:00
Alexis La Goutte
a9787be380 Add 802.11 Tag RM Enabled Capabilities (70)
svn path=/trunk/; revision=48357
2013-03-17 19:21:42 +00:00
Anders Broman
81e80f2c0b From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48355
2013-03-17 16:48:47 +00:00
Michael Mann
3a48e7e1e2 Bugfix Decryption Key Management dialog, bug 8446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8446)
Needed to convert use of old IEEE802.11 preference strings to UAT.  Since UAT is self-contained within its own file, the entire preference file doesn't need to be rewritten/saved when UAT values are changed.

svn path=/trunk/; revision=48308
2013-03-15 01:31:53 +00:00
Alexis La Goutte
e22e3eeb0e From chaitanya via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8354 Add support for WAPI parameter set IE dissection
Need to add support for WAPI parameter set IE in management frames.
We already have WAI frames dissection support in place.

From me:
Small changes...
- Add links to WAPI specs
- Replace tabs by space
- Remove whitespaces

svn path=/trunk/; revision=48276
2013-03-13 14:49:46 +00:00
Anders Broman
d0efafbcb1 From beroset:
remove C++ incompatibilities from UAT_VS_DEF macro and all uses

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

svn path=/trunk/; revision=48259
2013-03-12 06:40:13 +00:00
Guy Harris
f7e497a522 Properly pluralize "octet" for the Extended Capabilities tag.
If we don't decode a tag, just say "Undecoded" on the top-level item;
the tag name or number is already on that item, and the length is
underneath it.

svn path=/trunk/; revision=48180
2013-03-07 21:42:01 +00:00
Alexis La Goutte
42dce2d033 Add 802.11 Tag RSNI IE (65)
(Not tested...)

svn path=/trunk/; revision=48063
2013-03-04 17:16:35 +00:00
Alexis La Goutte
512a68479c From chaitanya via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8432 BE (3) AC is wrongly named as "Video" in (qos_acs)
In the array of WME AC names, the name for tid 3 is wrongly named as "Video" it should be "Best Effort" instead.

#BACKPORT(1.8,1.6)

svn path=/trunk/; revision=48062
2013-03-04 17:16:26 +00:00
Alexis La Goutte
ea4c5708b2 Add 802.11 Tag Antenna (64)
svn path=/trunk/; revision=48061
2013-03-04 17:16:17 +00:00
Alexis La Goutte
95dff87ead Add 802.11 Tag BSS Average Access Delay IE (63)
svn path=/trunk/; revision=48060
2013-03-04 17:16:07 +00:00
Alexis La Goutte
430c8b13e3 Add 802.11 BSS AC Access Delay IE (68)
(Only display the value in decimal don't yet display the Average Access Delay , See 8.4.2.41 BSS Average Access Delay element )

svn path=/trunk/; revision=48057
2013-03-04 17:15:40 +00:00
Alexis La Goutte
5a43ae12f6 Fix typo about BSS AC/AVG Access Delay
svn path=/trunk/; revision=48056
2013-03-04 17:15:24 +00:00
Alexis La Goutte
089f1832af Enhance HT Control (proto_tree_add_uint/boolean/* => proto_tree_add_item
svn path=/trunk/; revision=48055
2013-03-04 17:15:09 +00:00
Alexis La Goutte
559aa015d6 Remove expert_info for unknown/undecode Atheros frame...
svn path=/trunk/; revision=48054
2013-03-04 17:14:58 +00:00
Alexis La Goutte
e16ea8d71e From 802.11-2012.pdf
Enhance Extended Capabilities IE (127)
* Update list of supported bits...
* ...

svn path=/trunk/; revision=48053
2013-03-04 17:14:49 +00:00
Alexis La Goutte
f725d4c261 Fix typo about length of BSS Available Admission Capacity IE
svn path=/trunk/; revision=48052
2013-03-04 17:14:37 +00:00
Pascal Quantin
0d9dfe4b26 Fixed two wrong encoding parameters found by fix-encoding-args.pl and a typo error
svn path=/trunk/; revision=48041
2013-03-03 19:32:22 +00:00
Guy Harris
6b629c4d92 Move show_exception() and show_reported_bounds_error() to
epan/show_exception.c, as it's used outside
epan/dissectors/packet-frame.c.  Update their callers to include
<epan/show_exception.h> to get their declaration.

Add a CATCH_NONFATAL_ERRORS macro that catches all exceptions that, if
there's more stuff in the packet to dissect after the dissector call
that threw the exception, doesn't mean you shouldn't go ahead and
dissect that stuff.  Use it in all those cases, including ones where
BoundsError was inappropriately being caught (you want those passed up
to the top level, so that the packet is reported as having been cut
short in the capture process).

Add a CATCH_BOUNDS_ERRORS macro that catches all exceptions that
correspond to running past the end of the data for a tvbuff; use it
rather than explicitly catching those exceptions individually, and
rather than just catching all exceptions (the only place that
DissectorError should be caught, for example, is at the top level, so
dissector bugs show up in the protocol tree).

Don't catch and then immediately rethrow exceptions without doing
anything else; just let the exceptions go up to the final catcher.

Use show_exception() to report non-fatal errors, rather than doing it
yourself.
 
If a dissector is called from Lua, catch all non-fatal errors and use
show_exception() to report them rather than catching only
ReportedBoundsError and adding a proto_malformed item.

Don't catch exceptions when constructing a trailer tvbuff in
packet-ieee8023.c - just construct it after the payload has been
dissected, and let whatever exceptions that throws be handled at the top
level.

Avoid some TRY/CATCH/ENDTRY cases by using checks such as
tvb_bytes_exist() before even looking in the tvbuff.

svn path=/trunk/; revision=47924
2013-02-27 22:43:54 +00:00
Gerald Combs
977730ed7c The IEEE may not care what's in an SSID but Pango is much more picky.
If the SSID isn't valid UTF-8 truncate it and indicate that we did so.
(As bug 5738 points out this is part of a more general problem but in
the meantime this keeps us from crashing.)

Don't try to decrypt too-long SSIDs.

I feel compelled to change my SSID at home to a series of carriage
returns, linefeeds, and SNOWMAN (U+2603).

svn path=/trunk/; revision=47871
2013-02-25 04:16:37 +00:00
Alexis La Goutte
3972e6ba82 From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8368
Minor corrections to the VHT IE decode

* Correct the Rx, Tx and Basic MCS map decodes. The number of Spatial streams should run from 1-8 (not 0-7).
* Change Several misstyped Mhz into MHz

From me:
Remove comma for big number (use space)
Add Octets unit in some hf description

svn path=/trunk/; revision=47858
2013-02-24 19:10:11 +00:00
Alexis La Goutte
ac0692bfb8 Fix AP / Sta CF Pollable value_string (the value is shifted !)
svn path=/trunk/; revision=47857
2013-02-24 19:09:55 +00:00
Alexis La Goutte
961f9d1f70 Remove some "duplicate" TFS in 802.11 field capability Add in use / not in use in common TFS
svn path=/trunk/; revision=47856
2013-02-24 19:09:04 +00:00
Alexis La Goutte
cafb554d29 From 802.11k-2008 : Amendment 1: Radio Resource Measurement of Wireless LANs Add Radio Measurement flag from Capability Information Field
svn path=/trunk/; revision=47838
2013-02-23 11:21:29 +00:00
Alexis La Goutte
0885b65773 Replace by proto_tree_add_item and use FT_NONE type for fixed parameters
svn path=/trunk/; revision=47835
2013-02-23 11:21:02 +00:00
Alexis La Goutte
2fda9a32c2 Enhance dissection of A-MSDU Frame (Make length filterable...)
svn path=/trunk/; revision=47824
2013-02-22 16:51:33 +00:00
Alexis La Goutte
5416f1093e Add 802.11 BSS Available Admission Capacity (67)
svn path=/trunk/; revision=47822
2013-02-22 16:51:15 +00:00
Alexis La Goutte
0157943ca1 Enhance 802.11 dissector when IE Tag is unknown (Add also a Expert info)
svn path=/trunk/; revision=47819
2013-02-22 16:50:49 +00:00
Alexis La Goutte
0b8125d9cb From 802.11-2012.pdf Update Information Element (IE Tag) List
svn path=/trunk/; revision=47817
2013-02-22 16:50:08 +00:00