Commit graph

294 commits

Author SHA1 Message Date
Alexis La Goutte
7f2b76ad4c From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5830
Fix a minor typo about bitmask of a reserved field.

svn path=/trunk/; revision=37530
2011-06-03 06:47:23 +00:00
Alexis La Goutte
96215c08a9 From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5830
802.11 Tag WME Qos Info field is not decoded

From me :
* Update from Trunk
* Make item fiterable


svn path=/trunk/; revision=37497
2011-05-31 21:41:43 +00:00
Anders Broman
4c93ff1b8a REmove the check for HAVE_AIRPDCAP
svn path=/trunk/; revision=37494
2011-05-31 21:34:23 +00:00
Alexis La Goutte
aa966d3186 Enhance Vendor Specific IE (227)
Specifically WPA/WME sub dissector 
* Rework from scratch VS WPA/WME dissector
* Replace proto_tree_add_text/string (ugly hf_ieee80211_tag_interpretation header field...) by proto_tree_add_item
* Make item filterable
* and other stuff...

Based on WMM_Specification_1-1

svn path=/trunk/; revision=37486
2011-05-31 19:30:53 +00:00
Anders Broman
ccd2833ad8 From Michael Mann:
UATification of 802.11 decryption keys.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1123

svn path=/trunk/; revision=37468
2011-05-30 06:10:25 +00:00
Alexis La Goutte
144a684bd4 Add some comments about RSN IE
Fix some Clang Warnings

svn path=/trunk/; revision=37460
2011-05-29 13:04:06 +00:00
Alexis La Goutte
cf3a4ec432 Don't return offset when it is the end of Extended Capability IE (Only use break)
svn path=/trunk/; revision=37459
2011-05-29 12:51:10 +00:00
Alexis La Goutte
b89d2d8f42 Fix a wrong length when there is unknown Atheros IE Data
svn path=/trunk/; revision=37458
2011-05-29 12:16:53 +00:00
Alexis La Goutte
0524b9f8d6 From tschardt via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5949
802.11 IE tag number 61/62 still decoded to "Unknown"/Reserved tag Number

Remove inadvertently by me in rev36120

svn path=/trunk/; revision=37389
2011-05-25 07:15:05 +00:00
Jörg Mayer
5f28f55229 7.3.2.25 or 802.11-2007 gives an example of length 20, so it is unclear where the 24 came from (unintentionally fixes bug 5942)
svn path=/trunk/; revision=37355
2011-05-23 08:54:47 +00:00
Bill Meier
a2b58f051d Add #include <stdlib.h> to files which reference fcns declared in stdlib.h;
(In many cases I previously incorrectly removed the #include <stdlib.h>).

svn path=/trunk/; revision=37334
2011-05-20 19:00:09 +00:00
Jeff Morriss
da8ec2c2d6 Use proto_tree_add_item() instead of proto_tree_add_xxx() with a pointer into
the TVB.

Introduce and start using tvb_get_manuf_name() and tvb_get_manuf_name_if_known()
which do the same as the non-tvb versions but take a tvb and an offset instead
of (commonly) a pointer into a TVB.

svn path=/trunk/; revision=37317
2011-05-20 02:42:14 +00:00
Chris Maynard
50af6e0ab2 Per destination flags is a 1-byte field. Grab it with tvb_get_guint8(), not
with tvb_get_letohs().  (Bug surfaced while trying out MESH_OVERRIDES.)

svn path=/trunk/; revision=37241
2011-05-18 15:56:46 +00:00
Jeff Morriss
cdedb31e94 As suggested by Chris: use val_to_str_const() instead of match_strval() plus a
NULL-return check.

Use val_to_str_const instead of val_to_str() in a couple places where the string
is constant.

Use val_to_str() instead of blindly passing the return value from match_strval()
into a format routine (to ensure a non-NULL string pointer).  A couple of these
were cases where it could not actually return NULL, but I changed it for
consistency.

Store the return value of match_strval() rather than calling it repeatedly.

svn path=/trunk/; revision=37204
2011-05-17 18:58:40 +00:00
Anders Broman
2ad1c8df66 VALS(& -> VALS(
svn path=/trunk/; revision=37009
2011-05-06 12:28:11 +00:00
Guy Harris
59dc3f3141 It appears that, in NetMon 802.11 captures, management frames have an
FCS and data frames don't have an FCS; I don't know about control
frames.

svn path=/trunk/; revision=36973
2011-05-03 08:22:25 +00:00
Bill Meier
b2cf892dea Remove some uneeded #includes;
Minor indentation & whitespace cleanup.

svn path=/trunk/; revision=36780
2011-04-21 21:50:35 +00:00
Alexis La Goutte
df3293c9d4 Add QoS Capability element (46) and Extended Supported Rates element (50)
Enhance RSN Info (48), Extended Capabilities information element (127)

* Replace proto_tree_add_uint*/boolean/text by proto_tree_add_item
* use ENC_* macro for encoding

svn path=/trunk/; revision=36680
2011-04-17 17:20:58 +00:00
Alexis La Goutte
f163f3fd8c Add Tag Quiet (40) and IBSS DFS (41)
Enhance Tag ERP Information (42), TS Delay (43), TCLAS Processing (44)

* Replace proto_tree_add_uint*/boolean/text by proto_tree_add_item
* use ENC_* macro for encoding


svn path=/trunk/; revision=36625
2011-04-13 15:59:22 +00:00
Jörg Mayer
0c484c8cf9 + Fix bug listed in CID 1182:
Move test out of switch statement.
 Remove unused variable.

Remove trailing whitespace.

Whitespace in that file is a mess.

svn path=/trunk/; revision=36621
2011-04-13 15:16:41 +00:00
Alexis La Goutte
fbe119c3c5 Enhance Vendor Specific Atheros IE
* Replace proto_tree_add_ether/boolean by proto_tree_add_item
* use BASE_CUSTOM for XR beacon interval 
* use ENC_* macro for encoding
* replace if(...) by switch(...) for type and subtype (more extensible if new (sub)type)
* add expert info when tag_len is incorrect

Fix also a minor issue with tag_end...


svn path=/trunk/; revision=36523
2011-04-08 19:52:04 +00:00
Alexis La Goutte
99ff83cffc Enhance Tag Measurement Request & Report
* Replace proto_tree_add_uint*/boolean/text by proto_tree_add_item
* use ENC_* macro for encoding
* ...

My first commit !

svn path=/trunk/; revision=36506
2011-04-07 16:16:47 +00:00
Stephen Fisher
59a5ab8788 Enhancement bug #5796: Add Atheros vendor specific 802.11 IE parsing
svn path=/trunk/; revision=36502
2011-04-06 19:57:39 +00:00
Ronnie Sahlberg
5f502a5bfb remove a conditional that can never be true
coverity 247


svn path=/trunk/; revision=36301
2011-03-23 21:17:29 +00:00
Anders Broman
aac7fca686 From Alexis La Goutte:
enhance tag Power Constraint/Capability, TPC Request/Report, Supported Channel, csa 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5660

svn path=/trunk/; revision=36158
2011-03-07 17:46:30 +00:00
Anders Broman
9a7ad380af From Alexis La Goutte:
Enhance tag fh_hopping_.., tclas, tspec, challenge_text...

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

svn path=/trunk/; revision=36141
2011-03-04 17:40:32 +00:00
Anders Broman
6db5c9387b Fix Error: Found non-ASCII characters in packet-ieee80211.c
svn path=/trunk/; revision=36121
2011-03-02 16:25:33 +00:00
Anders Broman
3ccb1950a4 From Alexis La Goutte:
* Add 802.11 Standard Reference
* Reorder IE (Information Element) and define in decimal (the standard use
decimal...) 

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

svn path=/trunk/; revision=36120
2011-03-02 15:23:38 +00:00
Anders Broman
84a712d07a From Alexis La Goutte:
Patch 3 : 

Enhance "Header" Tag Element (replace value_string tag_num_vals[] by
range_string tag_num_vals[]...)
Enhance TIM, IBSS, Country Info, (Q)BSS Load, FH Hopping Parameter...



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

svn path=/trunk/; revision=36016
2011-02-20 18:51:59 +00:00
Stephen Fisher
64666812e9 Change protocol column from "IEEE 802.11" to "802.11" so it fits in
the default column width.


svn path=/trunk/; revision=35969
2011-02-16 21:56:28 +00:00
Anders Broman
61515ab830 From Alexis La Goutte:
Cleanup 802.11 Dissector :Enhance SSID, Supported Rates, DS, FH, CFP.. Information Element sub dissector 

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

svn path=/trunk/; revision=35903
2011-02-10 21:45:36 +00:00
Jeff Morriss
50e1634f4c Modify proto_tree_add_bytes_format() and proto_tree_add_bytes_format_value()
so that if the start_ptr is NULL the bytes are extracted from the given TVB
using the given offset and length.

Replace a bunch of:

proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, tvb_get_ptr(tvb, offset, length), [...])

with:

proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, NULL, [...])

svn path=/trunk/; revision=35896
2011-02-10 16:31:00 +00:00
Anders Broman
1d7c05c898 From Alexis La Goutte:
Cleanup 802.11 Dissector : Enhance add_tagged_field (and sub tagged field dissector)

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

svn path=/trunk/; revision=35863
2011-02-07 20:50:13 +00:00
Anders Broman
e373d9b454 From Alexis La Goutte:
A patch to enhance add_fixed_field dissector 
* Replace proto_tree_add_uint/boolean/... by proto_tree_add_item
* Replace some macro by bitmask (TSI..)
* Other stuff...

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

svn path=/trunk/; revision=35836
2011-02-06 14:15:12 +00:00
Anders Broman
80b18d0a15 Get rid of check_col().
svn path=/trunk/; revision=35829
2011-02-04 16:28:26 +00:00
Anders Broman
eb9f184991 From Alexis La Goutte:
Cleanup 802.11 Dissector : Start Header Field by hf_80211_*

Part 16(Final)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5647

svn path=/trunk/; revision=35824
2011-02-04 16:21:58 +00:00
Anders Broman
3431f32a38 From Alexis La Goutte:
Cleanup 802.11 Dissector : Start Header Field by hf_80211_*

Part 10 - 15
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5647

svn path=/trunk/; revision=35810
2011-02-04 10:04:50 +00:00
Anders Broman
f0a410b170 From Alexis La Goutte:
Cleanup 802.11 Dissector : Start Header Field by hf_80211_*

Part 6 - 9
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5647

svn path=/trunk/; revision=35783
2011-02-03 17:35:16 +00:00
Anders Broman
ac057f8445 From Alexis La Goutte:
A series of patch to enhance 802.11 Dissector : Start all Header field by hf_80211_*
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5647

svn path=/trunk/; revision=35772
2011-02-02 23:09:41 +00:00
Anders Broman
9f45ee9883 From Alexis La Goutte:
Cleanup renaming hf 80211 Part7.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5609

svn path=/trunk/; revision=35768
2011-02-02 20:21:18 +00:00
Anders Broman
3d32921095 From Alexis La Goutte:
Cleanup renaming hf 80211 Part 8 and 9.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5609

svn path=/trunk/; revision=35767
2011-02-02 20:19:02 +00:00
Anders Broman
16f1460763 From Alexis La Goutte:
Fix checkhf error (hf_ieee80211_ff_mesh_mgt_ie_id) and enhance dissect Mesh ID 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5636

svn path=/trunk/; revision=35764
2011-02-02 19:54:14 +00:00
Anders Broman
52b465bf10 From Alexis La Goutte:
Fix and enhance WSIE
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5636

svn path=/trunk/; revision=35751
2011-02-02 06:04:19 +00:00
Anders Broman
5e05ed6632 Change a bunch of value and tfs strings to not be prefixed by hf_ but ieee8021. Based on Alexis La Gouttes patch.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5636

svn path=/trunk/; revision=35727
2011-01-31 20:37:17 +00:00
Stig Bjørlykke
84bc28bd6a Introduce "Fragment count" filter element for all protocols doing reassembly.
svn path=/trunk/; revision=35705
2011-01-30 21:01:07 +00:00
Anders Broman
d848a90815 From Alexis La Goutte:
Cleanup 802.11 Dissector : Make checkhf Happy
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5636
Pach #1,#2;#3

svn path=/trunk/; revision=35703
2011-01-30 18:44:53 +00:00
Anders Broman
e4822bb43b From Alexis La Goutte:
Cleanup 802.11 Dissector : Rework Prism Header
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5631

svn path=/trunk/; revision=35698
2011-01-29 23:51:06 +00:00
Anders Broman
cf1bb44105 From Alexis La Goutte:
Cleanup 802.11 Dissector : Header Field begin by hf_...
Patch 4 - 6
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5609

svn path=/trunk/; revision=35654
2011-01-26 07:47:31 +00:00
Jaap Keuter
7d9f2f9b43 From Jouni Malinen:
Allow TDLS Setup Response/Confirm to not include optional fields

Verifying whether non-zero status code is used and use explicit validation of
the remaining length and an expert info instead of implicit failure by an
exception.

svn path=/trunk/; revision=35642
2011-01-24 22:04:43 +00:00
Bill Meier
dd3a1a2280 From Alexis La Goutte:
Some patch to cleanup the 802.11 Dissector.
 Part 3:  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5609

svn path=/trunk/; revision=35641
2011-01-24 20:54:20 +00:00