lib: use common IWINFO_CIPHER_NAMES strings

[project/iwinfo.git] / iwinfo_lib.c

diff --git a/iwinfo_lib.c b/iwinfo_lib.c
index 118fe58d16b5d06f0ed3f831920b60da912370a2..7fbf8112d88dec50132bb9fb2aa27bc1ce2c44c0 100644 (file)
--- a/iwinfo_lib.c
+++ b/iwinfo_lib.c
@@ -22,18 +22,21 @@
 /*
  * name constants
  */
-const char *IWINFO_CIPHER_NAMES[] = {
+const char * const IWINFO_CIPHER_NAMES[IWINFO_CIPHER_COUNT] = {
        "NONE",
-       "WEP40",
+       "WEP-40",
        "TKIP",
        "WRAP",
        "CCMP",
-       "WEP104",
+       "WEP-104",
        "AES-OCB",
        "CKIP",
+       "GCMP",
+       "CCMP-256",
+       "GCMP-256",
 };
 
-const char *IWINFO_KMGMT_NAMES[] = {
+const char * const IWINFO_KMGMT_NAMES[IWINFO_KMGMT_COUNT] = {
        "NONE",
        "802.1X",
        "PSK",
@@ -41,12 +44,12 @@ const char *IWINFO_KMGMT_NAMES[] = {
        "OWE",
 };
 
-const char *IWINFO_AUTH_NAMES[] = {
+const char * const IWINFO_AUTH_NAMES[IWINFO_AUTH_COUNT] = {
        "OPEN",
        "SHARED",
 };
 
-const char *IWINFO_OPMODE_NAMES[] = {
+const char * const IWINFO_OPMODE_NAMES[IWINFO_OPMODE_COUNT] = {
        "Unknown",
        "Master",
        "Ad-Hoc",
@@ -59,7 +62,7 @@ const char *IWINFO_OPMODE_NAMES[] = {
        "P2P Go",
 };
 
-const char *IWINFO_HTMODE_NAMES[] = {
+const char * const IWINFO_HTMODE_NAMES[IWINFO_HTMODE_COUNT] = {
        "HT20",
        "HT40",
        "VHT20",
@@ -75,6 +78,24 @@ const char *IWINFO_HTMODE_NAMES[] = {
        "HE160"
 };
 
+const char * const ht_secondary_offset[4] = {
+       "no secondary",
+       "above",
+       "[reserved!]",
+       "below",
+};
+
+const uint16_t ht_chan_width[2] = {
+       20,
+       2040,
+};
+
+const uint16_t vht_chan_width[4] = {
+       40, /* 40 MHz or lower (refer to ht to a more precise width) */
+       80, /* 80 MHz */
+       160, /* 160 MHz */
+       8080, /* 80+80 MHz */
+};
 
 /*
  * ISO3166 country labels
@@ -341,7 +362,9 @@ static const struct iwinfo_ops *backends[] = {
 #ifdef USE_WL
        &wl_ops,
 #endif
+#ifdef USE_WEXT
        &wext_ops,
+#endif
 };
 
 const char * iwinfo_type(const char *ifname)