diff options
| author | Andreas Schultz <aschultz@warp10.net> | 2015-11-16 14:44:51 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-17 13:15:24 +0000 |
| commit | 7da8b65568966b23dad729e0ea4cbfc1b2332bb2 (patch) | |
| tree | c96d13a26a1eed275c7c45ada2e04aebb633d2b6 /epan/dissectors | |
| parent | 9ba4c95b5590c5fa3d22f6089e216b79a5c00079 (diff) | |
decode Hotspot 2.0 Indication in 802.11 beacons
HS20 Release 1 and Release have added some new fields. Decode them
properly.
Change-Id: Ia9bdaa3422d3f10119d42ec53ad6c9e4915578b8
Reviewed-on: https://code.wireshark.org/review/11870
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 081f5e34c2..60be87e221 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -4615,6 +4615,9 @@ static int hf_ieee80211_anqp_wfa_subtype = -1; /* Hotspot 2.0 */ static int hf_hs20_indication_dgaf_disabled = -1; +static int hf_hs20_indication_pps_mo_id_present = -1; +static int hf_hs20_indication_anqp_domain_id_present = -1; +static int hf_hs20_indication_release_number = -1; static int hf_hs20_anqp_subtype = -1; static int hf_hs20_anqp_reserved = -1; @@ -10174,11 +10177,23 @@ dissect_vendor_ie_wpawme(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, in return offset; } +static const value_string hs20_indication_release_number_vals[] = { + { 0, "Release 1" }, + { 1, "Release 2" }, + { 0, NULL } +}; + static void dissect_hs20_indication(proto_tree *tree, tvbuff_t *tvb, int offset) { proto_tree_add_item(tree, hf_hs20_indication_dgaf_disabled, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_hs20_indication_pps_mo_id_present, tvb, offset, 1, + ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_hs20_indication_anqp_domain_id_present, tvb, offset, 1, + ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_hs20_indication_release_number, tvb, offset, 1, + ENC_LITTLE_ENDIAN); } static void @@ -22336,6 +22351,18 @@ proto_register_ieee80211 (void) {"DGAF Disabled", "wlan_mgt.hs20.indication.dgaf_disabled", FT_UINT8, BASE_DEC, NULL, 0x01, NULL, HFILL }}, + {&hf_hs20_indication_pps_mo_id_present, + {"PPS MO ID Present", "wlan_mgt.hs20.indication.pps_mo_id_present", + FT_UINT8, BASE_DEC, NULL, 0x02, NULL, HFILL }}, + + {&hf_hs20_indication_anqp_domain_id_present, + {"ANQP Domain ID Present", "wlan_mgt.hs20.indication.anqp_domain_id_present", + FT_UINT8, BASE_DEC, NULL, 0x04, NULL, HFILL }}, + + {&hf_hs20_indication_release_number, + {"Release Number", "wlan_mgt.hs20.indication.release_number", + FT_UINT8, BASE_DEC, VALS(hs20_indication_release_number_vals), 0xF0, NULL, HFILL }}, + {&hf_hs20_anqp_subtype, {"Subtype", "wlan_mgt.hs20.anqp.subtype", FT_UINT8, BASE_DEC, VALS(hs20_anqp_subtype_vals), 0, |