[package] iwinfo: add per-station rate and mcs info to assoclist op

[openwrt.git] / package / iwinfo / src / iwinfo_cli.c

diff --git a/package/iwinfo/src/iwinfo_cli.c b/package/iwinfo/src/iwinfo_cli.c
index 4229b19..dc8ed8b 100644 (file)
--- a/package/iwinfo/src/iwinfo_cli.c
+++ b/package/iwinfo/src/iwinfo_cli.c
@@ -275,6 +275,34 @@ static char * format_hwmodes(int modes)
        return buf;
 }
 
+static char * format_assocrate(struct iwinfo_rate_entry *r)
+{
+       static char buf[40];
+       char *p = buf;
+       int l = sizeof(buf);
+
+       if (r->rate <= 0)
+       {
+               snprintf(buf, sizeof(buf), "unknown");
+       }
+       else
+       {
+               p += snprintf(p, l, "%s", format_rate(r->rate));
+               l = sizeof(buf) - (p - buf);
+
+               if (r->mcs >= 0)
+               {
+                       p += snprintf(p, l, ", MCS %d, %dMHz", r->mcs, 20 + r->is_40mhz*20);
+                       l = sizeof(buf) - (p - buf);
+
+                       if (r->is_short_gi)
+                               p += snprintf(p, l, ", short GI");
+               }
+       }
+
+       return buf;
+}
+
 
 static const char * print_type(const struct iwinfo_ops *iw, const char *ifname)
 {
@@ -282,6 +310,65 @@ static const char * print_type(const struct iwinfo_ops *iw, const char *ifname)
        return type ? type : "unknown";
 }
 
+static char * print_hardware_id(const struct iwinfo_ops *iw, const char *ifname)
+{
+       static char buf[20];
+       struct iwinfo_hardware_id ids;
+
+       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);
+       }
+       else
+       {
+               snprintf(buf, sizeof(buf), "unknown");
+       }
+
+       return buf;
+}
+
+static char * print_hardware_name(const struct iwinfo_ops *iw, const char *ifname)
+{
+       static char buf[128];
+
+       if (iw->hardware_name(ifname, buf))
+               snprintf(buf, sizeof(buf), "unknown");
+
+       return buf;
+}
+
+static char * print_txpower_offset(const struct iwinfo_ops *iw, const char *ifname)
+{
+       int off;
+       static char buf[12];
+
+       if (iw->txpower_offset(ifname, &off))
+               snprintf(buf, sizeof(buf), "unknown");
+       else if (off != 0)
+               snprintf(buf, sizeof(buf), "%d dB", off);
+       else
+               snprintf(buf, sizeof(buf), "none");
+
+       return buf;
+}
+
+static char * print_frequency_offset(const struct iwinfo_ops *iw, const char *ifname)
+{
+       int off;
+       static char buf[12];
+
+       if (iw->frequency_offset(ifname, &off))
+               snprintf(buf, sizeof(buf), "unknown");
+       else if (off != 0)
+               snprintf(buf, sizeof(buf), "%.3f GHz", ((float)off / 1000.0));
+       else
+               snprintf(buf, sizeof(buf), "none");
+
+       return buf;
+}
+
 static char * print_ssid(const struct iwinfo_ops *iw, const char *ifname)
 {
        char buf[IWINFO_ESSID_MAX_SIZE+1] = { 0 };
@@ -332,9 +419,14 @@ static char * print_frequency(const struct iwinfo_ops *iw, const char *ifname)
 
 static char * print_txpower(const struct iwinfo_ops *iw, const char *ifname)
 {
-       int pwr;
+       int pwr, off;
+       if (iw->txpower_offset(ifname, &off))
+               off = 0;
+
        if (iw->txpower(ifname, &pwr))
                pwr = -1;
+       else
+               pwr += off;
 
        return format_txpower(pwr);
 }
@@ -423,9 +515,6 @@ 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("          Type: %s  HW Mode(s): %s\n",
-               print_type(iw, ifname),
-               print_hwmodes(iw, ifname));
        printf("          Mode: %s  Channel: %s (%s)\n",
                print_mode(iw, ifname),
                print_channel(iw, ifname),
@@ -441,6 +530,16 @@ static void print_info(const struct iwinfo_ops *iw, const char *ifname)
                print_rate(iw, ifname));
        printf("          Encryption: %s\n",
                print_encryption(iw, ifname));
+       printf("          Type: %s  HW Mode(s): %s\n",
+               print_type(iw, ifname),
+               print_hwmodes(iw, ifname));
+       printf("          Hardware: %s [%s]\n",
+               print_hardware_id(iw, ifname),
+               print_hardware_name(iw, ifname));
+       printf("          TX power offset: %s\n",
+               print_txpower_offset(iw, ifname));
+       printf("          Frequency offset: %s\n",
+               print_frequency_offset(iw, ifname));
        printf("          Supports VAPs: %s\n",
                print_mbssid_supp(iw, ifname));
 }
@@ -487,7 +586,7 @@ static void print_scanlist(const struct iwinfo_ops *iw, const char *ifname)
 
 static void print_txpwrlist(const struct iwinfo_ops *iw, const char *ifname)
 {
-       int len, pwr, i;
+       int len, pwr, off, i;
        char buf[IWINFO_BUFSIZE];
        struct iwinfo_txpwrlist_entry *e;
 
@@ -500,14 +599,17 @@ static void print_txpwrlist(const struct iwinfo_ops *iw, const char *ifname)
        if (iw->txpower(ifname, &pwr))
                pwr = -1;
 
+       if (iw->txpower_offset(ifname, &off))
+               off = 0;
+
        for (i = 0; i < len; i += sizeof(struct iwinfo_txpwrlist_entry))
        {
                e = (struct iwinfo_txpwrlist_entry *) &buf[i];
 
                printf("%s%3d dBm (%4d mW)\n",
                        (pwr == e->dbm) ? "*" : " ",
-                       e->dbm,
-                       e->mw);
+                       e->dbm + off,
+                       iwinfo_dbm2mw(e->dbm + off));
        }
 }
 
@@ -561,11 +663,22 @@ static void print_assoclist(const struct iwinfo_ops *iw, const char *ifname)
        {
                e = (struct iwinfo_assoclist_entry *) &buf[i];
 
-               printf("%s  %s / %s (SNR %d)\n",
+               printf("%s  %s / %s (SNR %d)  %d ms ago\n",
                        format_bssid(e->mac),
                        format_signal(e->signal),
                        format_noise(e->noise),
-                       (e->signal - e->noise));
+                       (e->signal - e->noise),
+                       e->inactive);
+
+               printf("        RX: %-38s  %8d Pkts.\n",
+                       format_assocrate(&e->rx_rate),
+                       e->rx_packets
+               );
+
+               printf("        TX: %-38s  %8d Pkts.\n\n",
+                       format_assocrate(&e->tx_rate),
+                       e->tx_packets
+               );
        }
 }