doc: document AKMSuite diagnostic value
PATCH v2 1/4 doc: document AKMSuite diagnostic value
--- doc/station-diagnostic-api.txt | 2 ++ 1 file changed, 2 insertions(+)
doc/station-diagnostic-api.txt +2 -0
@@ -23,6 +23,8 @@ Methods dict GetDiagnostics() Frequency - Frequency of currently connected BSS. + AKMSuite - The chosen AKM for the current connection. + RSSI [optional] - The RSSI of the currently connected BSS. AverageRSSI [optional] - Average RSSI of currently connected BSS.
Signature · 1 line
2.26.2
PATCH v2 2/4 ie: add ie_akm_suite_to_string
Converts ie_rsn_akm_suite values into strings
--- src/ie.c | 33 +++++++++++++++++++++++++++++++++ src/ie.h | 2 ++ 2 files changed, 35 insertions(+)
src/ie.c +33 -0
@@ -2636,3 +2636,36 @@ int ie_build_hs20_indication(uint8_t version, uint8_t *to)return 0 ; } + +const char *ie_akm_suite_to_string (enum ie_rsn_akm_suite akm) +{ +switch (akm) { +case IE_RSN_AKM_SUITE_8021X : +case IE_RSN_AKM_SUITE_8021X_SHA256 : +return "WPA2-Enterprise" ; +case IE_RSN_AKM_SUITE_PSK : +case IE_RSN_AKM_SUITE_PSK_SHA256 : +return "WPA2-Personal" ; +case IE_RSN_AKM_SUITE_FT_OVER_8021X : +case IE_RSN_AKM_SUITE_FT_OVER_8021X_SHA384 : +return "WPA2-Enterprise + FT" ; +case IE_RSN_AKM_SUITE_FT_USING_PSK : +return "WPA2-Personal + FT" ; +case IE_RSN_AKM_SUITE_SAE_SHA256 : +return "WPA3-Personal" ; +case IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256 : +return "WPA3-Personal + FT" ; +case IE_RSN_AKM_SUITE_OWE : +return "OWE" ; +case IE_RSN_AKM_SUITE_FILS_SHA256 : +case IE_RSN_AKM_SUITE_FILS_SHA384 : +return "FILS" ; +case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256 : +case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384 : +return "FILS + FT" ; +case IE_RSN_AKM_SUITE_OSEN : +return "OSEN" ; +default : +return NULL ; + } +}
src/ie.h +2 -0
@@ -528,3 +528,5 @@ int ie_parse_hs20_indication_from_data(const uint8_t *data, size_t len, uint8_t *version, uint16_t *pps_mo_id, uint8_t *domain_id);int ie_build_hs20_indication (uint8_t version,uint8_t *to); + +const char *ie_akm_suite_to_string (enum ie_rsn_akm_suite suite);
Signature · 1 line
2.26.2
Re: [PATCH v2 2/4] ie: add ie_akm_suite_to_string
Hi James,
Quoted 11 lines · James Prestwood
Converts
ie_rsn_akm_suitevalues into strings--- src/ie.c | 33 +++++++++++++++++++++++++++++++++ src/ie.h | 2 ++ 2 files changed, 35 insertions(+)src/ie.c +0
-0
src/ie.c int ie_build_hs20_indication(uint8_t version, uint8_t *to) · line 2643
Quoted 8 lines
src/ie.c +5
-0@@ -2636,3 +2636,36 @@ int ie_build_hs20_indication(uint8_t version, uint8_t *to)return 0 ; } + +const char *ie_akm_suite_to_string (enum ie_rsn_akm_suite akm) +{ +switch (akm) { +case IE_RSN_AKM_SUITE_8021X :
How are you distinguishing between WPA1 and WPA2?
Quoted 18 lines
src/ie.c +18
-0+case IE_RSN_AKM_SUITE_8021X_SHA256 : +return "WPA2-Enterprise" ; +case IE_RSN_AKM_SUITE_PSK : +case IE_RSN_AKM_SUITE_PSK_SHA256 : +return "WPA2-Personal" ; +case IE_RSN_AKM_SUITE_FT_OVER_8021X : +case IE_RSN_AKM_SUITE_FT_OVER_8021X_SHA384 : +return "WPA2-Enterprise + FT" ; +case IE_RSN_AKM_SUITE_FT_USING_PSK : +return "WPA2-Personal + FT" ; +case IE_RSN_AKM_SUITE_SAE_SHA256 : +return "WPA3-Personal" ; +case IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256 : +return "WPA3-Personal + FT" ; +case IE_RSN_AKM_SUITE_OWE : +return "OWE" ; +case IE_RSN_AKM_SUITE_FILS_SHA256 : +case IE_RSN_AKM_SUITE_FILS_SHA384 :
src/ie.c int ie_build_hs20_indication(uint8_t version, uint8_t *to) · line 2671
Quoted 10 lines
src/ie.c +10
-0+return "FILS" ; +case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256 : +case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384 : +return "FILS + FT" ; +case IE_RSN_AKM_SUITE_OSEN : +return "OSEN" ; +default : +return NULL ; + } +}
Also, for reasons mentioned in patch 1, I'd rather keep this specific to the diagnostics interface. So this probably belongs in diagnostics.c ?
Regards,
-Denis
PATCH v2 3/4 station: add AKMSuite to GetDiagnostics
In reply to James Prestwood--- src/station.c | 3 +++ 1 file changed, 3 insertions(+)
src/station.c +3 -0
@@ -3629,6 +3629,7 @@ static void station_get_diagnostic_cb(struct station *station = user_data;struct l_dbus_message *reply;struct l_dbus_message_builder *builder; +struct handshake_state *hs =netdev_get_handshake (station->netdev);if (!info) { reply =dbus_error_aborted (station->get_station_pending);
@@ -3645,6 +3646,8 @@ static void station_get_diagnostic_cb( util_address_to_string(info->addr));dbus_append_dict_basic (builder,"Frequency" ,'u' , &station->connected_bss->frequency); +dbus_append_dict_basic (builder,"AKMSuite" ,'s' , +ie_akm_suite_to_string (hs->akm_suite));diagnostic_info_to_dict (info, builder);
Signature · 1 line
2.26.2
PATCH v2 4/4 client: add AKMSuite to diagnostics
In reply to James Prestwood--- client/diagnostic.c | 1 + 1 file changed, 1 insertion(+)
client/diagnostic.c +1 -0
@@ -92,6 +92,7 @@ static const struct diagnostic_dict_mapping diagnostic_mapping[] = { { "RxMCS", 'y' }, { "TxMCS", 'y' }, { "Frequency", 'u' }, + { "AKMSuite", 's' }, { NULL } };
Signature · 1 line
2.26.2
Hi James,
Quoted 9 lines · James Prestwood
--- doc/station-diagnostic-api.txt | 2 ++ 1 file changed, 2 insertions(+)doc/station-diagnostic-api.txt +0
-0
doc/station-diagnostic-api.txt Methods dict GetDiagnostics() · line 27
Quoted 5 lines
doc/station-diagnostic-api.txt +2
-0@@ -23,6 +23,8 @@ Methods dict GetDiagnostics() Frequency - Frequency of currently connected BSS. + AKMSuite - The chosen AKM for the current connection. +
This doesn't feel right somehow. I would expect AKMSuite to be something like:
'00-0F0AC:9 FT over SAE' or something to that effect. Similar to how iwmon does it.
Since we're going for something more human-palatable, how about just naming this 'Security' instead. With possible values being:
WPA-Personal, WPA2-Personal, WPA3-Personal, WPA2-Enterprise, OWE. With maybe '+ FT', '+ FILS' or 'FT/FILS' suffixes and whatever others we feel are important.
doc/station-diagnostic-api.txt Methods dict GetDiagnostics() · line 30
Quoted 4 lines
doc/station-diagnostic-api.txt +0
-0RSSI [optional] - The RSSI of the currently connected BSS. AverageRSSI [optional] - Average RSSI of currently connected BSS.
Regards,
-Denis