cli: print the frequency and band on the scan list
[project/iwinfo.git] / iwinfo_cli.c
index ee5a0e2dde428481dedf9ca16cfb23598bc7819c..c1242bf9cd8566474c81322aa7f9025c0b34dea7 100644 (file)
@@ -44,9 +44,20 @@ static char * format_ssid(char *ssid)
        return buf;
 }
 
+static const char *format_band(int band)
+{
+       const char *name;
+
+       name = iwinfo_band_name(band);
+       if (name)
+               return name;
+
+       return "unknown";
+}
+
 static char * format_channel(int ch)
 {
-       static char buf[8];
+       static char buf[16];
 
        if (ch <= 0)
                snprintf(buf, sizeof(buf), "unknown");
@@ -70,7 +81,7 @@ static char * format_frequency(int freq)
 
 static char * format_txpower(int pwr)
 {
-       static char buf[10];
+       static char buf[16];
 
        if (pwr < 0)
                snprintf(buf, sizeof(buf), "unknown");
@@ -82,7 +93,7 @@ static char * format_txpower(int pwr)
 
 static char * format_quality(int qual)
 {
-       static char buf[8];
+       static char buf[16];
 
        if (qual < 0)
                snprintf(buf, sizeof(buf), "unknown");
@@ -94,7 +105,7 @@ static char * format_quality(int qual)
 
 static char * format_quality_max(int qmax)
 {
-       static char buf[8];
+       static char buf[16];
 
        if (qmax < 0)
                snprintf(buf, sizeof(buf), "unknown");
@@ -145,33 +156,11 @@ static char * format_enc_ciphers(int ciphers)
 {
        static char str[128] = { 0 };
        char *pos = str;
+       int i;
 
-       if (ciphers & IWINFO_CIPHER_WEP40)
-               pos += sprintf(pos, "WEP-40, ");
-
-       if (ciphers & IWINFO_CIPHER_WEP104)
-               pos += sprintf(pos, "WEP-104, ");
-
-       if (ciphers & IWINFO_CIPHER_TKIP)
-               pos += sprintf(pos, "TKIP, ");
-
-       if (ciphers & IWINFO_CIPHER_CCMP)
-               pos += sprintf(pos, "CCMP, ");
-
-       if (ciphers & IWINFO_CIPHER_GCMP)
-               pos += sprintf(pos, "GCMP, ");
-
-       if (ciphers & IWINFO_CIPHER_WRAP)
-               pos += sprintf(pos, "WRAP, ");
-
-       if (ciphers & IWINFO_CIPHER_AESOCB)
-               pos += sprintf(pos, "AES-OCB, ");
-
-       if (ciphers & IWINFO_CIPHER_CKIP)
-               pos += sprintf(pos, "CKIP, ");
-
-       if (!ciphers || (ciphers & IWINFO_CIPHER_NONE))
-               pos += sprintf(pos, "NONE, ");
+       for (i = 0; i < IWINFO_CIPHER_COUNT; i++)
+               if (ciphers & (1 << i))
+                       pos += sprintf(pos, "%s, ", IWINFO_CIPHER_NAMES[i]);
 
        *(pos - 2) = 0;
 
@@ -182,21 +171,11 @@ static char * format_enc_suites(int suites)
 {
        static char str[64] = { 0 };
        char *pos = str;
+       int i;
 
-       if (suites & IWINFO_KMGMT_PSK)
-               pos += sprintf(pos, "PSK/");
-
-       if (suites & IWINFO_KMGMT_8021x)
-               pos += sprintf(pos, "802.1X/");
-
-       if (suites & IWINFO_KMGMT_SAE)
-               pos += sprintf(pos, "SAE/");
-
-       if (suites & IWINFO_KMGMT_OWE)
-               pos += sprintf(pos, "OWE/");
-
-       if (!suites || (suites & IWINFO_KMGMT_NONE))
-               pos += sprintf(pos, "NONE/");
+       for (i = 0; i < IWINFO_KMGMT_COUNT; i++)
+               if (suites & (1 << i))
+                       pos += sprintf(pos, "%s/", IWINFO_KMGMT_NAMES[i]);
 
        *(pos - 1) = 0;
 
@@ -248,10 +227,12 @@ static char * format_encryption(struct iwinfo_crypto_entry *c)
 
                        for (i = 0; i < 3; i++)
                                if (c->wpa_version & (1 << i))
+                               {
                                        if (i)
                                                pos += sprintf(pos, "WPA%d/", i + 1);
                                        else
                                                pos += sprintf(pos, "WPA/");
+                               }
 
                        pos--;
 
@@ -274,19 +255,10 @@ static char * format_encryption(struct iwinfo_crypto_entry *c)
 
 static char * format_hwmodes(int modes)
 {
-       static char buf[15];
+       static char buf[32] = "802.11";
 
-       if (modes <= 0)
+       if (iwinfo_format_hwmodes(modes, buf + 6, sizeof(buf) - 6) < 1)
                snprintf(buf, sizeof(buf), "unknown");
-       else
-               snprintf(buf, sizeof(buf), "802.11%s%s%s%s%s%s",
-                       (modes & IWINFO_80211_A) ? "a" : "",
-                       (modes & IWINFO_80211_B) ? "b" : "",
-                       (modes & IWINFO_80211_G) ? "g" : "",
-                       (modes & IWINFO_80211_N) ? "n" : "",
-                       (modes & IWINFO_80211_AC) ? "ac" : "",
-                       (modes & IWINFO_80211_AD) ? "ad" : "",
-                       (modes & IWINFO_80211_AX) ? "ax" : "");
 
        return buf;
 }
@@ -322,21 +294,40 @@ static char * format_assocrate(struct iwinfo_rate_entry *r)
                                l = sizeof(buf) - (p - buf);
                        }
                }
+               else if (r->is_he)
+               {
+                       p += snprintf(p, l, ", HE-MCS %d, %dMHz", r->mcs, r->mhz);
+                       l = sizeof(buf) - (p - buf);
+
+                       p += snprintf(p, l, ", HE-NSS %d", r->nss);
+                       l = sizeof(buf) - (p - buf);
+
+                       p += snprintf(p, l, ", HE-GI %d", r->he_gi);
+                       l = sizeof(buf) - (p - buf);
+
+                       p += snprintf(p, l, ", HE-DCM %d", r->he_dcm);
+                       l = sizeof(buf) - (p - buf);
+               }
        }
 
        return buf;
 }
 
-static const char* format_chan_width(uint16_t width)
+static const char* format_chan_width(bool vht, uint8_t width)
 {
-       switch (width) {
-               case 20: return "20 MHz";
-               case 2040: return "40 MHz and upper or 20 MHz with intolerant bit";
-               case 40: return "40 MHz or lower";
-               case 80: return "80 MHz";
-               case 8080: return "80+80 MHz";
-               case 160: return "160 MHz";
-       }
+       if (!vht && width < ARRAY_SIZE(ht_chan_width))
+               switch (ht_chan_width[width]) {
+                       case 20: return "20 MHz";
+                       case 2040: return "40 MHz or higher";
+               }
+
+       if (vht && width < ARRAY_SIZE(vht_chan_width))
+               switch (vht_chan_width[width]) {
+                       case 40: return "20 or 40 MHz";
+                       case 80: return "80 MHz";
+                       case 8080: return "80+80 MHz";
+                       case 160: return "160 MHz";
+               }
 
        return "unknown";
 }
@@ -355,9 +346,16 @@ static char * print_hardware_id(const struct iwinfo_ops *iw, const char *ifname)
 
        if (!iw->hardware_id(ifname, (char *)&ids))
        {
-               snprintf(buf, sizeof(buf), "%04X:%04X %04X:%04X",
-                       ids.vendor_id, ids.device_id,
-                       ids.subsystem_vendor_id, ids.subsystem_device_id);
+               if (strlen(ids.compatible) > 0)
+                       snprintf(buf, sizeof(buf), "embedded");
+               else if (ids.vendor_id == 0 && ids.device_id == 0 &&
+                        ids.subsystem_vendor_id != 0 && ids.subsystem_device_id != 0)
+                       snprintf(buf, sizeof(buf), "USB %04X:%04X",
+                               ids.subsystem_vendor_id, ids.subsystem_device_id);
+               else
+                       snprintf(buf, sizeof(buf), "%04X:%04X %04X:%04X",
+                               ids.vendor_id, ids.device_id,
+                               ids.subsystem_vendor_id, ids.subsystem_device_id);
        }
        else
        {
@@ -553,6 +551,20 @@ static char * print_hwmodes(const struct iwinfo_ops *iw, const char *ifname)
        return format_hwmodes(modes);
 }
 
+static const char *print_htmode(const struct iwinfo_ops *iw, const char *ifname)
+{
+       int mode;
+       const char *name;
+       if (iw->htmode(ifname, &mode))
+               mode = -1;
+
+       name = iwinfo_htmode_name(mode);
+       if (name)
+               return name;
+
+       return "unknown";
+}
+
 static char * print_mbssid_supp(const struct iwinfo_ops *iw, const char *ifname)
 {
        int supp;
@@ -584,10 +596,11 @@ static void print_info(const struct iwinfo_ops *iw, const char *ifname)
                print_ssid(iw, ifname));
        printf("          Access Point: %s\n",
                print_bssid(iw, ifname));
-       printf("          Mode: %s  Channel: %s (%s)\n",
+       printf("          Mode: %s  Channel: %s (%s)  HT Mode: %s\n",
                print_mode(iw, ifname),
                print_channel(iw, ifname),
-               print_frequency(iw, ifname));
+               print_frequency(iw, ifname),
+               print_htmode(iw, ifname));
        if (iw->center_chan1 != NULL) {
                printf("          Center Channel 1: %s",
                        print_center_chan1(iw, ifname));
@@ -646,8 +659,10 @@ static void print_scanlist(const struct iwinfo_ops *iw, const char *ifname)
                        format_bssid(e->mac));
                printf("          ESSID: %s\n",
                        format_ssid(e->ssid));
-               printf("          Mode: %s  Channel: %s\n",
+               printf("          Mode: %s  Frequency: %s  Band: %s  Channel: %s\n",
                        IWINFO_OPMODE_NAMES[e->mode],
+                       format_frequency(e->mhz),
+                       format_band(e->band),
                        format_channel(e->channel));
                printf("          Signal: %s  Quality: %s/%s\n",
                        format_signal(e->signal - 0x100),
@@ -661,16 +676,16 @@ static void print_scanlist(const struct iwinfo_ops *iw, const char *ifname)
                printf("                    Secondary Channel Offset: %s\n",
                        ht_secondary_offset[e->ht_chan_info.secondary_chan_off]);
                printf("                    Channel Width: %s\n",
-                       format_chan_width(e->ht_chan_info.chan_width));
+                       format_chan_width(false, e->ht_chan_info.chan_width));
 
                if (e->vht_chan_info.center_chan_1) {
                        printf("          VHT Operation:\n");
-                       printf("                    Channel Width: %s\n",
-                               format_chan_width(e->vht_chan_info.chan_width));
                        printf("                    Center Frequency 1: %d\n",
                                 e->vht_chan_info.center_chan_1);
                        printf("                    Center Frequency 2: %d\n",
                                 e->vht_chan_info.center_chan_2);
+                       printf("                    Channel Width: %s\n",
+                               format_chan_width(true, e->vht_chan_info.chan_width));
                }
 
                printf("\n");
@@ -710,7 +725,7 @@ static void print_txpwrlist(const struct iwinfo_ops *iw, const char *ifname)
 
 static void print_freqlist(const struct iwinfo_ops *iw, const char *ifname)
 {
-       int i, len, ch;
+       int i, len, freq;
        char buf[IWINFO_BUFSIZE];
        struct iwinfo_freqlist_entry *e;
 
@@ -720,16 +735,17 @@ static void print_freqlist(const struct iwinfo_ops *iw, const char *ifname)
                return;
        }
 
-       if (iw->channel(ifname, &ch))
-               ch = -1;
+       if (iw->frequency(ifname, &freq))
+               freq = -1;
 
        for (i = 0; i < len; i += sizeof(struct iwinfo_freqlist_entry))
        {
                e = (struct iwinfo_freqlist_entry *) &buf[i];
 
-               printf("%s %s (Channel %s)%s\n",
-                       (ch == e->channel) ? "*" : " ",
+               printf("%s %s (Band: %s, Channel %s)%s\n",
+                       (freq == e->mhz) ? "*" : " ",
                        format_frequency(e->mhz),
+                       format_band(e->band),
                        format_channel(e->channel),
                        e->restricted ? " [restricted]" : "");
        }
@@ -834,7 +850,7 @@ static void print_htmodelist(const struct iwinfo_ops *iw, const char *ifname)
                return;
        }
 
-       for (i = 0; i < ARRAY_SIZE(IWINFO_HTMODE_NAMES); i++)
+       for (i = 0; i < IWINFO_HTMODE_COUNT; i++)
                if (htmodes & (1 << i))
                        printf("%s ", IWINFO_HTMODE_NAMES[i]);
 
@@ -861,6 +877,16 @@ static void lookup_phy(const struct iwinfo_ops *iw, const char *section)
 }
 
 
+static void lookup_path(const struct iwinfo_ops *iw, const char *phy)
+{
+       const char *path;
+
+       if (!iw->phy_path || iw->phy_path(phy, &path) || !path)
+               return;
+
+       printf("%s\n", path);
+}
+
 int main(int argc, char **argv)
 {
        int i, rv = 0;
@@ -920,6 +946,10 @@ int main(int argc, char **argv)
                }
                else
                {
+                       if (!strcmp(argv[2], "path")) {
+                               lookup_path(iw, argv[3]);
+                               return 0;
+                       }
                        switch (argv[2][0])
                        {
                        case 'p':