aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ieee80211.c
diff options
context:
space:
mode:
authormsweant <msweant@gmail.com>2022-09-29 17:37:40 -0700
committerJaap Keuter <jaap.keuter@xs4all.nl>2022-09-30 05:48:45 +0000
commit312efbd48384a82e91845a4a763a91f9a7d52d3f (patch)
tree672a1f67e0af55d515110baeedaad67a3d6a154c /epan/dissectors/packet-ieee80211.c
parent67b4650559fb309aaec4e1696f084e7c536cc54b (diff)
IEEE 802.11: Add Operating Class Indication Lookup
packet-ieee80211.c has the IEEE 802.11w-2009 class indication lookup table included already but it's only used to resolve the WFA HS2.0 OCI attribute when it could also be used to resolve beacon/probe response tag 59. Adding that resolution and renaming the RVAL struct from hs20_oper_class_rvals to simply oper_class_rvals. Closes #18389
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
-rw-r--r--epan/dissectors/packet-ieee80211.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index c00a99b41f..fda0a1d32f 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -9398,7 +9398,7 @@ static const value_string nai_realm_encoding_vals[] = {
{ 0, NULL }
};
-static const range_string hs20_oper_class_rvals[] = {
+static const range_string oper_class_rvals[] = {
{ 0, 0, "Unknown" }, /* 0 should not be used */
{ 1, 80, "Reserved" },
{ 81, 81, "2.407 GHz, Channels 1-13, 25 MHz Spacing" },
@@ -41283,7 +41283,7 @@ proto_register_ieee80211(void)
{&hf_ieee80211_hs20_anqp_oper_class_indic,
{"Operating Class", "wlan.hs20.anqp.oper_class_indic.oper_class",
- FT_UINT8, BASE_DEC | BASE_RANGE_STRING, RVALS(hs20_oper_class_rvals),
+ FT_UINT8, BASE_DEC | BASE_RANGE_STRING, RVALS(oper_class_rvals),
0, NULL, HFILL }},
{&hf_ieee80211_hs20_osu_friendly_names_len,
@@ -46600,7 +46600,7 @@ proto_register_ieee80211(void)
{&hf_ieee80211_tag_supported_ope_classes_current,
{"Current Operating Class", "wlan.supopeclass.current",
- FT_UINT8, BASE_DEC, NULL, 0,
+ FT_UINT8, BASE_DEC | BASE_RANGE_STRING, RVALS(oper_class_rvals), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_supported_ope_classes_alternate,