diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-10-30 14:48:46 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-10-30 14:48:46 +0000 |
| commit | a401f477d5d1ef3f4e10d3a1d8fe7c1fb8698069 (patch) | |
| tree | 4e0561ff6ffc3f88a261585a09ca99e44f1f439e | |
| parent | b883b87c4aa1414d2136be3dc9870fa3668867c7 (diff) | |
From Jouni Malinen:
Add an item for IEEE 802.11 vendor specific subtypes.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4971
svn path=/trunk/; revision=34715
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 415c04a419..2b9158347f 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -1719,6 +1719,8 @@ static int cf_aruba = -1; static int cf_aruba_hb_seq = -1; static int cf_aruba_mtu = -1; +static int hf_ieee80211_tag_vendor_oui_type = -1; + /* ************************************************************************* */ /* Protocol trees */ /* ************************************************************************* */ @@ -5901,6 +5903,10 @@ add_tagged_field (packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int of proto_tree_add_bytes_format (tree, tag_oui, tvb, offset + 2, 3, tag_data_ptr, "Vendor: %s", get_manuf_name(tag_data_ptr)); proto_item_append_text(ti, ": %s", get_manuf_name(tag_data_ptr)); + if (tag_len > 3) { + proto_tree_add_item(ti, hf_ieee80211_tag_vendor_oui_type, tag_tvb, + 3, 1, FALSE); + } #define WPAWME_OUI 0x0050F2 #define RSNOUI_VAL 0x000FAC @@ -11856,6 +11862,10 @@ proto_register_ieee80211 (void) FT_UINT8, BASE_DEC, NULL, 0, "DS Parameter Set - Current Channel", HFILL }}, + {&hf_ieee80211_tag_vendor_oui_type, + {"Vendor Specific OUI Type", "wlan_mgt.tag.oui.type", + FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, + {&tim_length, {"TIM length", "wlan_mgt.tim.length", FT_UINT8, BASE_DEC, NULL, 0, |