diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-08-20 18:41:35 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-08-20 21:50:59 +0000 |
| commit | ad085e567e97a65ec8c4d402014374b3022e85f4 (patch) | |
| tree | fdfb547640853423fcf87e09c25e4e92864d8a33 /epan | |
| parent | edc63f5ef7d0655093bb01b0accb130fd4de8dd8 (diff) | |
802.11: Add always Data of Subelement (on Neighbor Report)
Fix also typo on Neighbor Report Subelement length filter display name
Ping-Bug: 13985
Change-Id: I924cadddb0d5f060d8af08cf0f27cab40f3bd6bd
Reviewed-on: https://code.wireshark.org/review/23146
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 3d9ff03bf2..e7fd7916fd 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -4036,6 +4036,7 @@ static int hf_ieee80211_tag_neighbor_report_channel_number = -1; 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_supported_ope_classes_current = -1; static int hf_ieee80211_tag_supported_ope_classes_alternate = -1; @@ -14089,6 +14090,8 @@ dissect_neighbor_report(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi offset += 1; sub_tag_tvb = tvb_new_subset_length(tvb, offset, sub_tag_length); + proto_tree_add_item(tree, hf_ieee80211_tag_neighbor_report_subelement_data, tvb, offset, sub_tag_length, ENC_NA); + switch (sub_tag_id) { case NR_SUB_ID_TSF_INFO: /* TODO */ @@ -26143,10 +26146,15 @@ proto_register_ieee80211(void) NULL, HFILL }}, {&hf_ieee80211_tag_neighbor_report_subelement_length, - {"Length", "wlan.nreport.phytype.subelement_length", + {"Length", "wlan.nreport.subelement_length", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, + {&hf_ieee80211_tag_neighbor_report_subelement_data, + {"Subelement Data", "wlan.nreport.subelement_data", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, + {&hf_ieee80211_tag_supported_ope_classes_current, {"Current Operating Class", "wlan.supopeclass.current", FT_UINT8, BASE_DEC, NULL, 0, |