osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

ieee80211: Bring HT Info into conformance with IEEE802.11-2016. 

The HT Information element has changed since IEEE802.11n. This updates
that element to bring it in conformance with IEEE802.11-2016.

Change-Id: Ifa380b9a4dee00e0b2f07f5aabb6a18579aa8f71
Reviewed-on: https://code.wireshark.org/review/27371
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Richard Sharpe 2018-05-05 12:33:13 -07:00 committed by Anders Broman
parent b1e0cb01b3
commit fce04c23ef
1 changed files with 46 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
epan/dissectors/packet-ieee80211.c
View File

@ -2628,7 +2628,7 @@ static const value_string ht_info_secondary_channel_offset_flags[] = {
{0x00, NULL} {0x00, NULL}
}; };
static const true_false_string ht_info_channel_width_flag = { static const true_false_string ht_info_channel_sta_width_flag = {
"Channel of any width supported", "Channel of any width supported",
"20 MHz channel width only" "20 MHz channel width only"
}; };
@ -2638,11 +2638,6 @@ static const true_false_string ht_info_rifs_mode_flag = {
"Prohibited" "Prohibited"
}; };
static const true_false_string ht_info_psmp_stas_only_flag = {
"Association requests are accepted from only PSMP capable STA",
"Association requests are accepted regardless of PSMP capability"
};
static const value_string ht_info_service_interval_granularity_flags[] = { static const value_string ht_info_service_interval_granularity_flags[] = {
{0x00, "5 ms"}, {0x00, "5 ms"},
{0x01, "10 ms"}, {0x01, "10 ms"},
@ -2655,11 +2650,11 @@ static const value_string ht_info_service_interval_granularity_flags[] = {
{0x00, NULL} {0x00, NULL}
}; };
static const value_string ht_info_operating_mode_flags[] = { static const value_string ht_info_operating_protection_mode_flags[] = {
{0x00, "All STAs are - 20/40 MHz HT or in a 20/40 MHz BSS or are 20 MHz HT in a 20 MHz BSS"}, {0x00, "No protection mode"},
{0x01, "HT non-member protection mode"}, {0x01, "HT non-member protection mode"},
{0x02, "Only HT STAs in the BSS, however, there exists at least one 20 MHz STA"}, {0x02, "20 MHz protection mode"},
{0x03, "HT mixed mode"}, {0x03, "non-HT mixed mode"},
{0x00, NULL} {0x00, NULL}
}; };
@ -2668,11 +2663,6 @@ static const true_false_string ht_info_non_greenfield_sta_present_flag = {
"All associated STAs are greenfield capable" "All associated STAs are greenfield capable"
}; };
static const true_false_string ht_info_transmit_burst_limit_flag = {
"2.4 GHz - 6.16 ms | All other bands - 3.08 ms",
"No limit"
};
static const true_false_string ht_info_obss_non_ht_stas_present_flag = { static const true_false_string ht_info_obss_non_ht_stas_present_flag = {
"Use of protection for non-HT STAs by overlapping BSSs is needed", "Use of protection for non-HT STAs by overlapping BSSs is needed",
"Use of protection for non-HT STAs by overlapping BSSs is not needed" "Use of protection for non-HT STAs by overlapping BSSs is not needed"
@ -2683,13 +2673,8 @@ static const true_false_string ht_info_dual_beacon_flag = {
"No second beacon is transmitted" "No second beacon is transmitted"
}; };
static const true_false_string ht_info_dual_cts_protection_flag = {
"Required",
"Not required"
};
static const true_false_string ht_info_secondary_beacon_flag = { static const true_false_string ht_info_secondary_beacon_flag = {
"Secondary beacon", "STBC beacon",
"Primary beacon" "Primary beacon"
}; };
@ -3796,27 +3781,27 @@ static int hf_ieee80211_ht_info_primary_channel = -1;
static int hf_ieee80211_ht_info_delimiter1 = -1; static int hf_ieee80211_ht_info_delimiter1 = -1;
static int hf_ieee80211_ht_info_secondary_channel_offset = -1; static int hf_ieee80211_ht_info_secondary_channel_offset = -1;
static int hf_ieee80211_ht_info_channel_width = -1; static int hf_ieee80211_ht_info_sta_channel_width = -1;
static int hf_ieee80211_ht_info_rifs_mode = -1; static int hf_ieee80211_ht_info_rifs_mode = -1;
static int hf_ieee80211_ht_info_psmp_stas_only = -1; static int hf_ieee80211_ht_info_reserved_b4_b7 = -1;
static int hf_ieee80211_ht_info_service_interval_granularity = -1;
static int hf_ieee80211_ht_info_delimiter2 = -1; static int hf_ieee80211_ht_info_delimiter2 = -1;
static int hf_ieee80211_ht_info_operating_mode = -1; static int hf_ieee80211_ht_info_protection = -1;
static int hf_ieee80211_ht_info_non_greenfield_sta_present = -1; static int hf_ieee80211_ht_info_non_greenfield_sta_present = -1;
static int hf_ieee80211_ht_info_transmit_burst_limit = -1; static int hf_ieee80211_ht_info_reserved_b11 = -1;
static int hf_ieee80211_ht_info_obss_non_ht_stas_present = -1; static int hf_ieee80211_ht_info_obss_non_ht_stas_present = -1;
static int hf_ieee80211_ht_info_reserved_1 = -1; static int hf_ieee80211_ht_info_channel_center_freq_seg_2 = -1;
static int hf_ieee80211_ht_info_reserved_b21_b23 = -1;
static int hf_ieee80211_ht_info_delimiter3 = -1; static int hf_ieee80211_ht_info_delimiter3 = -1;
static int hf_ieee80211_ht_info_reserved_2 = -1; static int hf_ieee80211_ht_info_reserved_b24_b29 = -1;
static int hf_ieee80211_ht_info_dual_beacon = -1; static int hf_ieee80211_ht_info_dual_beacon = -1;
static int hf_ieee80211_ht_info_dual_cts_protection = -1; static int hf_ieee80211_ht_info_dual_cts_protection = -1;
static int hf_ieee80211_ht_info_secondary_beacon = -1; static int hf_ieee80211_ht_info_secondary_beacon = -1;
static int hf_ieee80211_ht_info_lsig_txop_protection_full_support = -1; static int hf_ieee80211_ht_info_lsig_txop_protection_full_support = -1;
static int hf_ieee80211_ht_info_pco_active = -1; static int hf_ieee80211_ht_info_pco_active = -1;
static int hf_ieee80211_ht_info_pco_phase = -1; static int hf_ieee80211_ht_info_pco_phase = -1;
static int hf_ieee80211_ht_info_reserved_3 = -1; static int hf_ieee80211_ht_info_reserved_b36_b39 = -1;
/*** End: 802.11n D1.10 - HT Information IE ***/ /*** End: 802.11n D1.10 - HT Information IE ***/
static int hf_ieee80211_tag_ap_channel_report_operating_class = -1; static int hf_ieee80211_tag_ap_channel_report_operating_class = -1;
@ -14198,31 +14183,31 @@ dissect_ht_info_ie_1_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
int offset = 0; int offset = 0;
static const int *ieee80211_ht_info1_field[] = { static const int *ieee80211_ht_info1_field[] = {
&hf_ieee80211_ht_info_secondary_channel_offset, &hf_ieee80211_ht_info_secondary_channel_offset,
&hf_ieee80211_ht_info_channel_width, &hf_ieee80211_ht_info_sta_channel_width,
&hf_ieee80211_ht_info_rifs_mode, &hf_ieee80211_ht_info_rifs_mode,
&hf_ieee80211_ht_info_psmp_stas_only, &hf_ieee80211_ht_info_reserved_b4_b7,
&hf_ieee80211_ht_info_service_interval_granularity,
NULL NULL
}; };
static const int *ieee80211_ht_info2_field[] = { static const int *ieee80211_ht_info2_field[] = {
&hf_ieee80211_ht_info_operating_mode, &hf_ieee80211_ht_info_protection,
&hf_ieee80211_ht_info_non_greenfield_sta_present, &hf_ieee80211_ht_info_non_greenfield_sta_present,
&hf_ieee80211_ht_info_transmit_burst_limit, &hf_ieee80211_ht_info_reserved_b11,
&hf_ieee80211_ht_info_obss_non_ht_stas_present, &hf_ieee80211_ht_info_obss_non_ht_stas_present,
&hf_ieee80211_ht_info_reserved_1, &hf_ieee80211_ht_info_channel_center_freq_seg_2,
&hf_ieee80211_ht_info_reserved_b21_b23,
NULL NULL
}; };
static const int *ieee80211_ht_info3_field[] = { static const int *ieee80211_ht_info3_field[] = {
&hf_ieee80211_ht_info_reserved_2, &hf_ieee80211_ht_info_reserved_b24_b29,
&hf_ieee80211_ht_info_dual_beacon, &hf_ieee80211_ht_info_dual_beacon,
&hf_ieee80211_ht_info_dual_cts_protection, &hf_ieee80211_ht_info_dual_cts_protection,
&hf_ieee80211_ht_info_secondary_beacon, &hf_ieee80211_ht_info_secondary_beacon,
&hf_ieee80211_ht_info_lsig_txop_protection_full_support, &hf_ieee80211_ht_info_lsig_txop_protection_full_support,
&hf_ieee80211_ht_info_pco_active, &hf_ieee80211_ht_info_pco_active,
&hf_ieee80211_ht_info_pco_phase, &hf_ieee80211_ht_info_pco_phase,
&hf_ieee80211_ht_info_reserved_3, &hf_ieee80211_ht_info_reserved_b36_b39,
NULL NULL
}; };
@ -28385,9 +28370,9 @@ proto_register_ieee80211(void)
FT_UINT8, BASE_HEX, VALS(ht_info_secondary_channel_offset_flags), 0x03, FT_UINT8, BASE_HEX, VALS(ht_info_secondary_channel_offset_flags), 0x03,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_ht_info_channel_width, {&hf_ieee80211_ht_info_sta_channel_width,
{"Supported channel width", "wlan.ht.info.chanwidth", {"Supported channel width", "wlan.ht.info.chanwidth",
FT_BOOLEAN, 8, TFS(&ht_info_channel_width_flag), 0x04, FT_BOOLEAN, 8, TFS(&ht_info_channel_sta_width_flag), 0x04,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_ht_info_rifs_mode, {&hf_ieee80211_ht_info_rifs_mode,
@ -28395,24 +28380,18 @@ proto_register_ieee80211(void)
FT_BOOLEAN, 8, TFS(&ht_info_rifs_mode_flag), 0x08, FT_BOOLEAN, 8, TFS(&ht_info_rifs_mode_flag), 0x08,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_ht_info_psmp_stas_only, {&hf_ieee80211_ht_info_reserved_b4_b7,
{"Power Save Multi-Poll (PSMP) stations only", "wlan.ht.info.psmponly", {"Reserved", "wlan.ht.info.reserved_b4_b7",
FT_BOOLEAN, 8, TFS(&ht_info_psmp_stas_only_flag), 0x10, FT_UINT8, BASE_HEX, NULL, 0xf0, NULL, HFILL }},
NULL, HFILL }},
{&hf_ieee80211_ht_info_service_interval_granularity,
{"Shortest service interval", "wlan.ht.info",
FT_UINT8, BASE_HEX, VALS(ht_info_service_interval_granularity_flags), 0xe0,
NULL, HFILL }},
{&hf_ieee80211_ht_info_delimiter2, {&hf_ieee80211_ht_info_delimiter2,
{"HT Information Subset (2 of 3)", "wlan.ht.info.delim2", {"HT Information Subset (2 of 3)", "wlan.ht.info.delim2",
FT_UINT16, BASE_HEX, NULL, 0, FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_ht_info_operating_mode, {&hf_ieee80211_ht_info_protection,
{"Operating mode of BSS", "wlan.ht.info.operatingmode", {"HT Protection", "wlan.ht.info.ht_protection",
FT_UINT16, BASE_HEX, VALS(ht_info_operating_mode_flags), 0x0003, FT_UINT16, BASE_HEX, VALS(ht_info_operating_protection_mode_flags), 0x0003,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_ht_info_non_greenfield_sta_present, {&hf_ieee80211_ht_info_non_greenfield_sta_present,
@ -28420,19 +28399,22 @@ proto_register_ieee80211(void)
FT_BOOLEAN, 16, TFS(&ht_info_non_greenfield_sta_present_flag), 0x0004, FT_BOOLEAN, 16, TFS(&ht_info_non_greenfield_sta_present_flag), 0x0004,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_ht_info_transmit_burst_limit, {&hf_ieee80211_ht_info_reserved_b11,
{"Transmit burst limit", "wlan.ht.info.burstlim", {"Reserved", "wlan.ht.info.reserved_b11",
FT_BOOLEAN, 16, TFS(&ht_info_transmit_burst_limit_flag), 0x0008, FT_UINT16, BASE_HEX, NULL, 0x0008, NULL, HFILL }},
NULL, HFILL }},
{&hf_ieee80211_ht_info_obss_non_ht_stas_present, {&hf_ieee80211_ht_info_obss_non_ht_stas_present,
{"OBSS non-HT STAs present", "wlan.ht.info.obssnonht", {"OBSS non-HT STAs present", "wlan.ht.info.obssnonht",
FT_BOOLEAN, 16, TFS(&ht_info_obss_non_ht_stas_present_flag), 0x0010, FT_BOOLEAN, 16, TFS(&ht_info_obss_non_ht_stas_present_flag), 0x0010,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_ht_info_reserved_1, {&hf_ieee80211_ht_info_channel_center_freq_seg_2,
{"Reserved", "wlan.ht.info.reserved1", {"Channel Center Frequency Segment 2", "wlan.ht.info.chan_center_freq_seg_2",
FT_UINT16, BASE_HEX, NULL, 0xffe0, FT_UINT16, BASE_DEC, NULL, 0x1fe0, NULL, HFILL }},
{&hf_ieee80211_ht_info_reserved_b21_b23,
{"Reserved", "wlan.ht.info.reserved_b21_b23",
FT_UINT16, BASE_HEX, NULL, 0xe000,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_ht_info_delimiter3, {&hf_ieee80211_ht_info_delimiter3,
@ -28440,10 +28422,9 @@ proto_register_ieee80211(void)
FT_UINT16, BASE_HEX, NULL, 0, FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_ht_info_reserved_2, {&hf_ieee80211_ht_info_reserved_b24_b29,
{"Reserved", "wlan.ht.info.reserved2", {"Reserved", "wlan.ht.info.reserved_b24_b29",
FT_UINT16, BASE_HEX, NULL, 0x003f, FT_UINT16, BASE_HEX, NULL, 0x003f, NULL, HFILL }},
NULL, HFILL }},
{&hf_ieee80211_ht_info_dual_beacon, {&hf_ieee80211_ht_info_dual_beacon,
{"Dual beacon", "wlan.ht.info.dualbeacon", {"Dual beacon", "wlan.ht.info.dualbeacon",
@ -28452,7 +28433,7 @@ proto_register_ieee80211(void)
{&hf_ieee80211_ht_info_dual_cts_protection, {&hf_ieee80211_ht_info_dual_cts_protection,
{"Dual Clear To Send (CTS) protection", "wlan.ht.info.dualcts", {"Dual Clear To Send (CTS) protection", "wlan.ht.info.dualcts",
FT_BOOLEAN, 16, TFS(&ht_info_dual_cts_protection_flag), 0x0080, FT_BOOLEAN, 16, TFS(&tfs_required_not_required), 0x0080,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_ht_info_secondary_beacon, {&hf_ieee80211_ht_info_secondary_beacon,
@ -28475,8 +28456,8 @@ proto_register_ieee80211(void)
FT_BOOLEAN, 16, TFS(&ht_info_pco_phase_flag), 0x0800, FT_BOOLEAN, 16, TFS(&ht_info_pco_phase_flag), 0x0800,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_ht_info_reserved_3, {&hf_ieee80211_ht_info_reserved_b36_b39,
{"Reserved", "wlan.ht.info.reserved3", {"Reserved", "wlan.ht.info.reserved_b36_b39",
FT_UINT16, BASE_HEX, NULL, 0xf000, FT_UINT16, BASE_HEX, NULL, 0xf000,
NULL, HFILL }}, NULL, HFILL }},