From 78e55dbea012e317cbe387ef39c3608366f0536b Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Thu, 15 Jul 2021 13:33:13 +0200 Subject: [PATCH] Added toString method for cipher --- src/espwifiutils.cpp | 23 ++++++++++++++++++++--- src/espwifiutils.h | 3 ++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/espwifiutils.cpp b/src/espwifiutils.cpp index 0ceca93..f2c807a 100644 --- a/src/espwifiutils.cpp +++ b/src/espwifiutils.cpp @@ -45,9 +45,9 @@ bool goe_wifi_sta_config_equal(const wifi_sta_config_t& lhs, const wifi_sta_conf bool(lhs.btm_enabled) == bool(rhs.btm_enabled); } -std::string toString(wifi_auth_mode_t encryptionType) +std::string toString(wifi_auth_mode_t authMode) { - switch (encryptionType) + switch (authMode) { case WIFI_AUTH_OPEN: return "WIFI_AUTH_OPEN"; case WIFI_AUTH_WEP: return "WIFI_AUTH_WEP"; @@ -61,7 +61,24 @@ std::string toString(wifi_auth_mode_t encryptionType) case WIFI_AUTH_MAX: return "WIFI_AUTH_MAX"; } - return std::string{"Unknown wifi_auth_mode_t("} + std::to_string(int(encryptionType)) + ')'; + return std::string{"Unknown wifi_auth_mode_t("} + std::to_string(int(authMode)) + ')'; +} + +std::string toString(wifi_cipher_type_t cipherType) +{ + switch (cipherType) { + case WIFI_CIPHER_TYPE_NONE: return "WIFI_CIPHER_TYPE_NONE"; + case WIFI_CIPHER_TYPE_WEP40: return "WIFI_CIPHER_TYPE_WEP40"; + case WIFI_CIPHER_TYPE_WEP104: return "WIFI_CIPHER_TYPE_WEP104"; + case WIFI_CIPHER_TYPE_TKIP: return "WIFI_CIPHER_TYPE_TKIP"; + case WIFI_CIPHER_TYPE_CCMP: return "WIFI_CIPHER_TYPE_CCMP"; + case WIFI_CIPHER_TYPE_TKIP_CCMP: return "WIFI_CIPHER_TYPE_TKIP_CCMP"; + case WIFI_CIPHER_TYPE_AES_CMAC128: return "WIFI_CIPHER_TYPE_AES_CMAC128"; + case WIFI_CIPHER_TYPE_SMS4: return "WIFI_CIPHER_TYPE_SMS4"; + case WIFI_CIPHER_TYPE_UNKNOWN: return "WIFI_CIPHER_TYPE_UNKNOWN"; + } + + return std::string{"Unknown wifi_cipher_type_t("} + std::to_string(int(cipherType)) + ')'; } std::string toString(const mac_t &mac) diff --git a/src/espwifiutils.h b/src/espwifiutils.h index ca74c5f..3c68591 100644 --- a/src/espwifiutils.h +++ b/src/espwifiutils.h @@ -15,7 +15,8 @@ namespace wifi_stack { bool goe_wifi_ap_config_equal(const wifi_ap_config_t& lhs, const wifi_ap_config_t& rhs); bool goe_wifi_sta_config_equal(const wifi_sta_config_t& lhs, const wifi_sta_config_t& rhs); -std::string toString(wifi_auth_mode_t encryptionType); +std::string toString(wifi_auth_mode_t authMode); +std::string toString(wifi_cipher_type_t cipherType); // A class to make it easier to handle and pass around mac addresses / bssids