diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-08-20 19:25:38 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-08-20 21:53:53 +0000 |
| commit | a26fb9072917d0c48a0dc9260018967eaf11c352 (patch) | |
| tree | 78e283c1a03c6d2d90d055362b0487a2a2dd0a66 /epan | |
| parent | a03e4ea191b0937fdfd5337cb9304392056723d0 (diff) | |
802.11: Add Neighbor Sublement ID dissection
BSS Transition Candidate Preference (Figure 9-299)
BSS Termination Duration (Figure 9-300)
From 802.11-2016
Bug: 13985
Change-Id: I352a41c46ff741070c51f4ddc661e26a40d21570
Reviewed-on: https://code.wireshark.org/review/23149
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index cdc8ca7f78..6a52afc06f 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -4047,7 +4047,9 @@ static int hf_ieee80211_tag_neighbor_report_phy_type = -1; static int hf_ieee80211_tag_neighbor_report_subelement_id = -1; static int hf_ieee80211_tag_neighbor_report_subelement_length = -1; static int hf_ieee80211_tag_neighbor_report_subelement_data = -1; - +static int hf_ieee80211_tag_neighbor_report_subelement_bss_trn_can_pref = -1; +static int hf_ieee80211_tag_neighbor_report_subelement_bss_ter_tsf = -1; +static int hf_ieee80211_tag_neighbor_report_subelement_bss_dur = -1; static int hf_ieee80211_tag_supported_ope_classes_current = -1; static int hf_ieee80211_tag_supported_ope_classes_alternate = -1; @@ -14111,6 +14113,14 @@ dissect_neighbor_report(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi case NR_SUB_ID_MEASUREMENT_PILOT_INFO: /* TODO */ break; + case NR_SUB_ID_BSS_TRN_CAN_PREF: + proto_tree_add_item(tree, hf_ieee80211_tag_neighbor_report_subelement_bss_trn_can_pref, tvb, offset, 1, ENC_NA); + break; + case NR_SUB_ID_BSS_TER_DUR: + proto_tree_add_item(tree, hf_ieee80211_tag_neighbor_report_subelement_bss_ter_tsf, tvb, offset, 8, ENC_NA); + + proto_tree_add_item(tree, hf_ieee80211_tag_neighbor_report_subelement_bss_dur, tvb, offset+8, 2, ENC_NA); + break; case NR_SUB_ID_HT_CAPABILITIES: sub_tag_tree = proto_tree_add_subtree(tree, tvb, offset, sub_tag_length, ett_tag_neighbor_report_sub_tag_tree, NULL, "HT Capabilities"); @@ -26177,6 +26187,21 @@ proto_register_ieee80211(void) FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, + {&hf_ieee80211_tag_neighbor_report_subelement_bss_trn_can_pref, + {"Preference", "wlan.nreport.subelement.bss_trn_can_pref", + FT_UINT8, BASE_DEC, NULL, 0, + NULL, HFILL }}, + + {&hf_ieee80211_tag_neighbor_report_subelement_bss_ter_tsf, + {"BSS Termination TSF", "wlan.nreport.subelement.bss_ter_tsf", + FT_UINT64, BASE_DEC, NULL, 0, + NULL, HFILL }}, + + {&hf_ieee80211_tag_neighbor_report_subelement_bss_dur, + {"Duration", "wlan.nreport.subelement.bss_dur", + FT_UINT16, BASE_DEC, NULL, 0, + NULL, HFILL }}, + {&hf_ieee80211_tag_supported_ope_classes_current, {"Current Operating Class", "wlan.supopeclass.current", FT_UINT8, BASE_DEC, NULL, 0, |