iwinfo: nl80211: use new path lookup function for nl80211_phy_idx_from_uci_path
[project/iwinfo.git] / iwinfo_nl80211.c
index 27765317d071dc2e9173a4fa4e2f2da4782fdaca..8decdb0ad9be06d528650d76bbcb5e3cef6f9d1c 100644 (file)
@@ -26,6 +26,7 @@
 #include <glob.h>
 #include <fnmatch.h>
 #include <stdarg.h>
+#include <stdlib.h>
 
 #include "iwinfo_nl80211.h"
 
@@ -232,28 +233,98 @@ static struct nl80211_msg_conveyor * nl80211_ctl(int cmd, int flags)
        return nl80211_new(nls->nlctrl, cmd, flags);
 }
 
+static const char *nl80211_phy_path_str(const char *phyname)
+{
+       static char path[PATH_MAX];
+       const char *prefix = "/sys/devices/";
+       int prefix_len = strlen(prefix);
+       int buf_len, offset;
+       struct dirent *e;
+       char buf[128], *link;
+       int phy_id;
+       int seq = 0;
+       DIR *d;
+
+       if (strncmp(phyname, "phy", 3) != 0)
+               return NULL;
+
+       phy_id = atoi(phyname + 3);
+       buf_len = snprintf(buf, sizeof(buf), "/sys/class/ieee80211/%s/device", phyname);
+       link = realpath(buf, path);
+       if (!link)
+               return NULL;
+
+       if (strncmp(link, prefix, prefix_len) != 0)
+               return NULL;
+
+       link += prefix_len;
+
+       prefix = "platform/";
+       prefix_len = strlen(prefix);
+       if (!strncmp(link, prefix, prefix_len) && strstr(link, "/pci"))
+               link += prefix_len;
+
+       snprintf(buf + buf_len, sizeof(buf) - buf_len, "/ieee80211");
+       d = opendir(buf);
+       if (!d)
+               return link;
+
+       while ((e = readdir(d)) != NULL) {
+               int cur_id;
+
+               if (strncmp(e->d_name, "phy", 3) != 0)
+                       continue;
+
+               cur_id = atoi(e->d_name + 3);
+               if (cur_id >= phy_id)
+                       continue;
+
+               seq++;
+       }
+
+       closedir(d);
+
+       if (!seq)
+               return link;
+
+       offset = link - path + strlen(link);
+       snprintf(path + offset, sizeof(path) - offset, "+%d", seq);
+
+       return link;
+}
+
 static int nl80211_phy_idx_from_uci_path(struct uci_section *s)
 {
-       const char *opt;
        char buf[128];
+       struct dirent *e;
+       const char *path, *cur_path;
        int idx = -1;
-       glob_t gl;
+       DIR *d;
 
-       opt = uci_lookup_option_string(uci_ctx, s, "path");
-       if (!opt)
+       path = uci_lookup_option_string(uci_ctx, s, "path");
+       if (!path)
                return -1;
 
-       snprintf(buf, sizeof(buf), "/sys/devices/%s/ieee80211/*/index", opt);  /**/
-       if (glob(buf, 0, NULL, &gl))
-               snprintf(buf, sizeof(buf), "/sys/devices/platform/%s/ieee80211/*/index", opt);  /**/
-
-       if (glob(buf, 0, NULL, &gl))
+       d = opendir("/sys/class/ieee80211");
+       if (!d)
                return -1;
 
-       if (gl.gl_pathc > 0)
-               idx = nl80211_readint(gl.gl_pathv[0]);
+       while ((e = readdir(d)) != NULL) {
+               cur_path = nl80211_phy_path_str(e->d_name);
+               if (!cur_path)
+                       continue;
 
-       globfree(&gl);
+               if (strcmp(cur_path, path) != 0)
+                       continue;
+
+               snprintf(buf, sizeof(buf), "/sys/class/ieee80211/%s/index", e->d_name);
+               idx = nl80211_readint(buf);
+
+               if (idx >= 0)
+                       break;
+       }
+
+       closedir(d);
 
        return idx;
 }
@@ -343,7 +414,8 @@ static struct nl80211_msg_conveyor * nl80211_msg(const char *ifname,
                phyidx = atoi(&ifname[3]);
        else if (!strncmp(ifname, "radio", 5))
                phyidx = nl80211_phy_idx_from_uci(ifname);
-       else if (!strncmp(ifname, "mon.", 4))
+
+       if (!strncmp(ifname, "mon.", 4))
                ifidx = if_nametoindex(&ifname[4]);
        else
                ifidx = if_nametoindex(ifname);
@@ -356,10 +428,9 @@ static struct nl80211_msg_conveyor * nl80211_msg(const char *ifname,
        if (!cv)
                return NULL;
 
-       if (ifidx > -1)
+       if (ifidx > 0)
                NLA_PUT_U32(cv->msg, NL80211_ATTR_IFINDEX, ifidx);
-
-       if (phyidx > -1)
+       else if (phyidx > -1)
                NLA_PUT_U32(cv->msg, NL80211_ATTR_WIPHY, phyidx);
 
        return cv;
@@ -510,7 +581,7 @@ static int nl80211_wait_cb(struct nl_msg *msg, void *arg)
        struct nl80211_event_conveyor *cv = arg;
        struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
 
-       if (gnlh->cmd == cv->wait)
+       if (cv->wait[gnlh->cmd / 32] & (1 << (gnlh->cmd % 32)))
                cv->recv = gnlh->cmd;
 
        return NL_SKIP;
@@ -521,11 +592,13 @@ static int nl80211_wait_seq_check(struct nl_msg *msg, void *arg)
        return NL_OK;
 }
 
-static int nl80211_wait(const char *family, const char *group, int cmd)
+static int __nl80211_wait(const char *family, const char *group, ...)
 {
-       struct nl80211_event_conveyor cv = { .wait = cmd };
+       struct nl80211_event_conveyor cv = { };
        struct nl_cb *cb;
        int err = 0;
+       int cmd;
+       va_list ap;
 
        if (nl80211_subscribe(family, group))
                return -ENOENT;
@@ -539,6 +612,13 @@ static int nl80211_wait(const char *family, const char *group, int cmd)
        nl_cb_set(cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM, nl80211_wait_seq_check, NULL);
        nl_cb_set(cb, NL_CB_VALID,     NL_CB_CUSTOM, nl80211_wait_cb,        &cv );
 
+       va_start(ap, group);
+
+       for (cmd = va_arg(ap, int); cmd != 0; cmd = va_arg(ap, int))
+               cv.wait[cmd / 32] |= (1 << (cmd % 32));
+
+       va_end(ap);
+
        while (!cv.recv && !err)
                nl_recvmsgs(nls->nl_sock, cb);
 
@@ -547,6 +627,9 @@ static int nl80211_wait(const char *family, const char *group, int cmd)
        return err;
 }
 
+#define nl80211_wait(family, group, ...) \
+       __nl80211_wait(family, group, __VA_ARGS__, 0)
+
 
 static int nl80211_freq2channel(int freq)
 {
@@ -556,6 +639,8 @@ static int nl80211_freq2channel(int freq)
                return (freq - 2407) / 5;
        else if (freq >= 4910 && freq <= 4980)
                return (freq - 4000) / 5;
+       else if(freq >= 56160 + 2160 * 1 && freq <= 56160 + 2160 * 6)
+               return (freq - 56160) / 2160;
        else
                return (freq - 5000) / 5;
 }
@@ -569,6 +654,10 @@ static int nl80211_channel2freq(int channel, const char *band)
                else if (channel < 14)
                        return (channel * 5) + 2407;
        }
+       else if ( strcmp(band, "ad") == 0)
+       {
+               return 56160 + 2160 * channel;
+       }
        else
        {
                if (channel >= 182 && channel <= 196)
@@ -852,7 +941,9 @@ static int __nl80211_wpactl_query(const char *ifname, ...)
        if (nl80211_get_mode(ifname, &mode))
                return 0;
 
-       if (mode != IWINFO_OPMODE_CLIENT && mode != IWINFO_OPMODE_ADHOC)
+       if (mode != IWINFO_OPMODE_CLIENT &&
+           mode != IWINFO_OPMODE_ADHOC &&
+           mode != IWINFO_OPMODE_MESHPOINT)
                return 0;
 
        sock = nl80211_wpactl_connect(ifname, &local);
@@ -1014,6 +1105,20 @@ struct nl80211_ssid_bssid {
        unsigned char bssid[7];
 };
 
+static int nl80211_get_macaddr_cb(struct nl_msg *msg, void *arg)
+{
+       struct nl80211_ssid_bssid *sb = arg;
+       struct nlattr **tb = nl80211_parse(msg);
+
+       if (tb[NL80211_ATTR_MAC]) {
+               sb->bssid[0] = 1;
+               memcpy(sb->bssid + 1, nla_data(tb[NL80211_ATTR_MAC]),
+                      sizeof(sb->bssid) - 1);
+       }
+
+       return NL_SKIP;
+}
+
 static int nl80211_get_ssid_bssid_cb(struct nl_msg *msg, void *arg)
 {
        int ielen;
@@ -1089,6 +1194,11 @@ static int nl80211_get_ssid(const char *ifname, char *buf)
                nl80211_hostapd_query(ifname, "ssid", sb.ssid,
                                      IWINFO_ESSID_MAX_SIZE + 1);
 
+       /* failed, try to obtain Mesh ID */
+       if (sb.ssid[0] == 0)
+               iwinfo_ubus_query(res ? res : ifname, "mesh_id",
+                                 sb.ssid, IWINFO_ESSID_MAX_SIZE + 1);
+
        return (sb.ssid[0] == 0) ? -1 : 0;
 }
 
@@ -1097,11 +1207,17 @@ static int nl80211_get_bssid(const char *ifname, char *buf)
        char *res, bssid[sizeof("FF:FF:FF:FF:FF:FF\0")];
        struct nl80211_ssid_bssid sb = { };
 
-       /* try to find bssid from scan dump results */
        res = nl80211_phy2ifname(ifname);
 
-       nl80211_request(res ? res : ifname, NL80211_CMD_GET_SCAN, NLM_F_DUMP,
-                       nl80211_get_ssid_bssid_cb, &sb);
+       /* try to obtain mac address via NL80211_CMD_GET_INTERFACE */
+       nl80211_request(res ? res : ifname, NL80211_CMD_GET_INTERFACE, 0,
+                       nl80211_get_macaddr_cb, &sb);
+
+       /* failed, try to find bssid from scan dump results */
+       if (sb.bssid[0] == 0)
+               nl80211_request(res ? res : ifname,
+                               NL80211_CMD_GET_SCAN, NLM_F_DUMP,
+                               nl80211_get_ssid_bssid_cb, &sb);
 
        /* failed, try to find mac from hostapd info */
        if ((sb.bssid[0] == 0) &&
@@ -1164,7 +1280,7 @@ static int nl80211_get_frequency_info_cb(struct nl_msg *msg, void *arg)
 
 static int nl80211_get_frequency(const char *ifname, int *buf)
 {
-       char *res, channel[4], hwmode[2];
+       char *res, channel[4], hwmode[3];
 
        /* try to find frequency from interface info */
        res = nl80211_phy2ifname(ifname);
@@ -1193,6 +1309,56 @@ static int nl80211_get_frequency(const char *ifname, int *buf)
        return (*buf == 0) ? -1 : 0;
 }
 
+static int nl80211_get_center_freq1_cb(struct nl_msg *msg, void *arg)
+{
+       int *freq = arg;
+       struct nlattr **tb = nl80211_parse(msg);
+
+       if (tb[NL80211_ATTR_CENTER_FREQ1])
+               *freq = nla_get_u32(tb[NL80211_ATTR_CENTER_FREQ1]);
+
+       return NL_SKIP;
+}
+
+static int nl80211_get_center_freq1(const char *ifname, int *buf)
+{
+       char *res;
+
+       /* try to find frequency from interface info */
+       res = nl80211_phy2ifname(ifname);
+       *buf = 0;
+
+       nl80211_request(res ? res : ifname, NL80211_CMD_GET_INTERFACE, 0,
+                       nl80211_get_center_freq1_cb, buf);
+
+       return (*buf == 0) ? -1 : 0;
+}
+
+static int nl80211_get_center_freq2_cb(struct nl_msg *msg, void *arg)
+{
+       int *freq = arg;
+       struct nlattr **tb = nl80211_parse(msg);
+
+       if (tb[NL80211_ATTR_CENTER_FREQ2])
+               *freq = nla_get_u32(tb[NL80211_ATTR_CENTER_FREQ2]);
+
+       return NL_SKIP;
+}
+
+static int nl80211_get_center_freq2(const char *ifname, int *buf)
+{
+       char *res;
+
+       /* try to find frequency from interface info */
+       res = nl80211_phy2ifname(ifname);
+       *buf = 0;
+
+       nl80211_request(res ? res : ifname, NL80211_CMD_GET_INTERFACE, 0,
+                       nl80211_get_center_freq2_cb, buf);
+
+       return (*buf == 0) ? -1 : 0;
+}
+
 static int nl80211_get_channel(const char *ifname, int *buf)
 {
        if (!nl80211_get_frequency(ifname, buf))
@@ -1204,6 +1370,28 @@ static int nl80211_get_channel(const char *ifname, int *buf)
        return -1;
 }
 
+static int nl80211_get_center_chan1(const char *ifname, int *buf)
+{
+       if (!nl80211_get_center_freq1(ifname, buf))
+       {
+               *buf = nl80211_freq2channel(*buf);
+               return 0;
+       }
+
+       return -1;
+}
+
+static int nl80211_get_center_chan2(const char *ifname, int *buf)
+{
+       if (!nl80211_get_center_freq2(ifname, buf))
+       {
+               *buf = nl80211_freq2channel(*buf);
+               return 0;
+       }
+
+       return -1;
+}
+
 static int nl80211_get_txpower_cb(struct nl_msg *msg, void *arg)
 {
        int *buf = arg;
@@ -1267,7 +1455,8 @@ static int nl80211_fill_signal_cb(struct nl_msg *msg, void *arg)
                        if (sinfo[NL80211_STA_INFO_SIGNAL])
                        {
                                dbm = nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL]);
-                               rr->rssi = rr->rssi ? (int8_t)((rr->rssi + dbm) / 2) : dbm;
+                               rr->rssi = (rr->rssi * rr->rssi_samples + dbm) / (rr->rssi_samples + 1);
+                               rr->rssi_samples++;
                        }
 
                        if (sinfo[NL80211_STA_INFO_TX_BITRATE])
@@ -1279,8 +1468,8 @@ static int nl80211_fill_signal_cb(struct nl_msg *msg, void *arg)
                                        if (rinfo[NL80211_RATE_INFO_BITRATE])
                                        {
                                                mbit = nla_get_u16(rinfo[NL80211_RATE_INFO_BITRATE]);
-                                               rr->rate = rr->rate
-                                                       ? (int16_t)((rr->rate + mbit) / 2) : mbit;
+                                               rr->rate = (rr->rate * rr->rate_samples + mbit) / (rr->rate_samples + 1);
+                                               rr->rate_samples++;
                                        }
                                }
                        }
@@ -1295,8 +1484,7 @@ static void nl80211_fill_signal(const char *ifname, struct nl80211_rssi_rate *r)
        DIR *d;
        struct dirent *de;
 
-       r->rssi = 0;
-       r->rate = 0;
+       memset(r, 0, sizeof(*r));
 
        if ((d = opendir("/sys/class/net")) != NULL)
        {
@@ -1321,7 +1509,7 @@ static int nl80211_get_bitrate(const char *ifname, int *buf)
 
        nl80211_fill_signal(ifname, &rr);
 
-       if (rr.rate)
+       if (rr.rate_samples)
        {
                *buf = (rr.rate * 100);
                return 0;
@@ -1336,7 +1524,7 @@ static int nl80211_get_signal(const char *ifname, int *buf)
 
        nl80211_fill_signal(ifname, &rr);
 
-       if (rr.rssi)
+       if (rr.rssi_samples)
        {
                *buf = rr.rssi;
                return 0;
@@ -1449,10 +1637,113 @@ static int nl80211_check_wepkey(const char *key)
        return 0;
 }
 
+static struct {
+       const char *match;
+       int version;
+       int suite;
+} wpa_key_mgmt_strings[] = {
+       { "IEEE 802.1X/EAP", 0, IWINFO_KMGMT_8021x },
+       { "EAP-SUITE-B-192", 4, IWINFO_KMGMT_8021x },
+       { "EAP-SUITE-B",     4, IWINFO_KMGMT_8021x },
+       { "EAP-SHA256",      0, IWINFO_KMGMT_8021x },
+       { "PSK-SHA256",      0, IWINFO_KMGMT_PSK },
+       { "NONE",            0, IWINFO_KMGMT_NONE },
+       { "None",            0, IWINFO_KMGMT_NONE },
+       { "PSK",             0, IWINFO_KMGMT_PSK },
+       { "EAP",             0, IWINFO_KMGMT_8021x },
+       { "SAE",             4, IWINFO_KMGMT_SAE },
+       { "OWE",             4, IWINFO_KMGMT_OWE }
+};
+
+static void parse_wpa_suites(const char *str, int defversion,
+                             uint8_t *versions, uint8_t *suites)
+{
+       size_t l;
+       int i, version;
+       const char *p, *q, *m, *sep = " \t\n,-+/";
+
+       for (p = str; *p; )
+       {
+               q = p;
+
+               for (i = 0; i < ARRAY_SIZE(wpa_key_mgmt_strings); i++)
+               {
+                       m = wpa_key_mgmt_strings[i].match;
+                       l = strlen(m);
+
+                       if (!strncmp(q, m, l) && (!q[l] || strchr(sep, q[l])))
+                       {
+                               if (wpa_key_mgmt_strings[i].version != 0)
+                                       version = wpa_key_mgmt_strings[i].version;
+                               else
+                                       version = defversion;
+
+                               *versions |= version;
+                               *suites |= wpa_key_mgmt_strings[i].suite;
+
+                               q += l;
+                               break;
+                       }
+               }
+
+               if (q == p)
+                       q += strcspn(q, sep);
+
+               p = q + strspn(q, sep);
+       }
+}
+
+static struct {
+       const char *match;
+       int cipher;
+} wpa_cipher_strings[] = {
+       { "WEP-104", IWINFO_CIPHER_WEP104 },
+       { "WEP-40",  IWINFO_CIPHER_WEP40 },
+       { "NONE",    IWINFO_CIPHER_NONE },
+       { "TKIP",    IWINFO_CIPHER_TKIP },
+       { "CCMP",    IWINFO_CIPHER_CCMP },
+       { "GCMP",    IWINFO_CIPHER_GCMP }
+};
+
+static void parse_wpa_ciphers(const char *str, uint16_t *ciphers)
+{
+       int i;
+       size_t l;
+       const char *m, *p, *q, *sep = " \t\n,-+/";
+
+       for (p = str; *p; )
+       {
+               q = p;
+
+               for (i = 0; i < ARRAY_SIZE(wpa_cipher_strings); i++)
+               {
+                       m = wpa_cipher_strings[i].match;
+                       l = strlen(m);
+
+                       if (!strncmp(q, m, l) && (!q[l] || strchr(sep, q[l])))
+                       {
+                               *ciphers |= wpa_cipher_strings[i].cipher;
+
+                               q += l;
+                               break;
+                       }
+               }
+
+               if (q == p)
+                       q += strcspn(q, sep);
+
+               p = q + strspn(q, sep);
+       }
+}
+
 static int nl80211_get_encryption(const char *ifname, char *buf)
 {
-       char wpa[2], wpa_key_mgmt[16], wpa_pairwise[16], wpa_groupwise[16];
+       char *p;
+       int opmode;
+       uint8_t wpa_version = 0;
+       char wpa[2], wpa_key_mgmt[64], wpa_pairwise[16], wpa_groupwise[16];
        char auth_algs[2], wep_key0[27], wep_key1[27], wep_key2[27], wep_key3[27];
+       char mode[16];
 
        struct iwinfo_crypto_entry *c = (struct iwinfo_crypto_entry *)buf;
 
@@ -1460,63 +1751,56 @@ static int nl80211_get_encryption(const char *ifname, char *buf)
        if (nl80211_wpactl_query(ifname,
                        "pairwise_cipher", wpa_pairwise,  sizeof(wpa_pairwise),
                        "group_cipher",    wpa_groupwise, sizeof(wpa_groupwise),
-                       "key_mgmt",        wpa_key_mgmt,  sizeof(wpa_key_mgmt)))
+                       "key_mgmt",        wpa_key_mgmt,  sizeof(wpa_key_mgmt),
+                       "mode",            mode,          sizeof(mode)))
        {
-               /* WEP */
+               /* WEP or Open */
                if (!strcmp(wpa_key_mgmt, "NONE"))
                {
-                       if (strstr(wpa_pairwise, "WEP-40"))
-                               c->pair_ciphers |= IWINFO_CIPHER_WEP40;
-                       else if (strstr(wpa_pairwise, "WEP-104"))
-                               c->pair_ciphers |= IWINFO_CIPHER_WEP104;
-
-                       if (strstr(wpa_groupwise, "WEP-40"))
-                               c->group_ciphers |= IWINFO_CIPHER_WEP40;
-                       else if (strstr(wpa_groupwise, "WEP-104"))
-                               c->group_ciphers |= IWINFO_CIPHER_WEP104;
-
-                       c->enabled      = !!(c->pair_ciphers | c->group_ciphers);
-                       c->auth_suites |= IWINFO_KMGMT_NONE;
-                       c->auth_algs   |= IWINFO_AUTH_OPEN; /* XXX: assumption */
+                       parse_wpa_ciphers(wpa_pairwise, &c->pair_ciphers);
+                       parse_wpa_ciphers(wpa_groupwise, &c->group_ciphers);
+
+                       if (c->pair_ciphers != 0 && c->pair_ciphers != IWINFO_CIPHER_NONE) {
+                               c->enabled     = 1;
+                               c->auth_suites = IWINFO_KMGMT_NONE;
+                               c->auth_algs   = IWINFO_AUTH_OPEN | IWINFO_AUTH_SHARED;
+                       }
+                       else {
+                               c->pair_ciphers = 0;
+                               c->group_ciphers = 0;
+                       }
+               }
+
+               /* MESH with SAE */
+               else if (!strcmp(mode, "mesh") && !strcmp(wpa_key_mgmt, "UNKNOWN"))
+               {
+                       c->enabled = 1;
+                       c->wpa_version = 4;
+                       c->auth_suites = IWINFO_KMGMT_SAE;
+                       c->pair_ciphers = IWINFO_CIPHER_CCMP;
+                       c->group_ciphers = IWINFO_CIPHER_CCMP;
                }
 
                /* WPA */
-               else if (strstr(wpa_key_mgmt, "WPA"))
+               else
                {
-                       if (strstr(wpa_pairwise, "TKIP"))
-                               c->pair_ciphers |= IWINFO_CIPHER_TKIP;
-                       else if (strstr(wpa_pairwise, "CCMP"))
-                               c->pair_ciphers |= IWINFO_CIPHER_CCMP;
-                       else if (strstr(wpa_pairwise, "NONE"))
-                               c->pair_ciphers |= IWINFO_CIPHER_NONE;
-                       else if (strstr(wpa_pairwise, "WEP-40"))
-                               c->pair_ciphers |= IWINFO_CIPHER_WEP40;
-                       else if (strstr(wpa_pairwise, "WEP-104"))
-                               c->pair_ciphers |= IWINFO_CIPHER_WEP104;
-
-                       if (strstr(wpa_groupwise, "TKIP"))
-                               c->group_ciphers |= IWINFO_CIPHER_TKIP;
-                       else if (strstr(wpa_groupwise, "CCMP"))
-                               c->group_ciphers |= IWINFO_CIPHER_CCMP;
-                       else if (strstr(wpa_groupwise, "NONE"))
-                               c->group_ciphers |= IWINFO_CIPHER_NONE;
-                       else if (strstr(wpa_groupwise, "WEP-40"))
-                               c->group_ciphers |= IWINFO_CIPHER_WEP40;
-                       else if (strstr(wpa_groupwise, "WEP-104"))
-                               c->group_ciphers |= IWINFO_CIPHER_WEP104;
-
-                       if (strstr(wpa_key_mgmt, "WPA2"))
-                               c->wpa_version = 2;
-                       else if (strstr(wpa_key_mgmt, "WPA"))
-                               c->wpa_version = 1;
-
-                       if (strstr(wpa_key_mgmt, "PSK"))
-                               c->auth_suites |= IWINFO_KMGMT_PSK;
-                       else if (strstr(wpa_key_mgmt, "EAP") ||
-                                strstr(wpa_key_mgmt, "802.1X"))
-                               c->auth_suites |= IWINFO_KMGMT_8021x;
-                       else if (strstr(wpa_key_mgmt, "NONE"))
-                               c->auth_suites |= IWINFO_KMGMT_NONE;
+                       parse_wpa_ciphers(wpa_pairwise, &c->pair_ciphers);
+                       parse_wpa_ciphers(wpa_groupwise, &c->group_ciphers);
+
+                       p = wpa_key_mgmt;
+
+                       if (!strncmp(p, "WPA2-", 5) || !strncmp(p, "WPA2/", 5))
+                       {
+                               p += 5;
+                               wpa_version = 2;
+                       }
+                       else if (!strncmp(p, "WPA-", 4))
+                       {
+                               p += 4;
+                               wpa_version = 1;
+                       }
+
+                       parse_wpa_suites(p, wpa_version, &c->wpa_version, &c->auth_suites);
 
                        c->enabled = !!(c->wpa_version && c->auth_suites);
                }
@@ -1535,39 +1819,27 @@ static int nl80211_get_encryption(const char *ifname, char *buf)
                                "wep_key2",     wep_key2,     sizeof(wep_key2),
                                "wep_key3",     wep_key3,     sizeof(wep_key3)))
        {
-               c->wpa_version = wpa[0] ? atoi(wpa) : 0;
+               c->wpa_version = 0;
 
                if (wpa_key_mgmt[0])
                {
-                       if (strstr(wpa_key_mgmt, "PSK"))
-                               c->auth_suites |= IWINFO_KMGMT_PSK;
+                       for (p = strtok(wpa_key_mgmt, " \t"); p != NULL; p = strtok(NULL, " \t"))
+                       {
+                               if (!strncmp(p, "WPA-", 4))
+                                       p += 4;
 
-                       if (strstr(wpa_key_mgmt, "EAP"))
-                               c->auth_suites |= IWINFO_KMGMT_8021x;
+                               parse_wpa_suites(p, atoi(wpa), &c->wpa_version, &c->auth_suites);
+                       }
 
-                       if (strstr(wpa_key_mgmt, "NONE"))
-                               c->auth_suites |= IWINFO_KMGMT_NONE;
-               }
-               else
-               {
-                       c->auth_suites |= IWINFO_KMGMT_PSK;
+                       c->enabled = c->wpa_version ? 1 : 0;
                }
 
                if (wpa_pairwise[0])
-               {
-                       if (strstr(wpa_pairwise, "TKIP"))
-                               c->pair_ciphers |= IWINFO_CIPHER_TKIP;
-
-                       if (strstr(wpa_pairwise, "CCMP"))
-                               c->pair_ciphers |= IWINFO_CIPHER_CCMP;
-
-                       if (strstr(wpa_pairwise, "NONE"))
-                               c->pair_ciphers |= IWINFO_CIPHER_NONE;
-               }
+                       parse_wpa_ciphers(wpa_pairwise, &c->pair_ciphers);
 
                if (auth_algs[0])
                {
-                       switch(atoi(auth_algs))
+                       switch (atoi(auth_algs))
                        {
                        case 1:
                                c->auth_algs |= IWINFO_AUTH_OPEN;
@@ -1587,14 +1859,26 @@ static int nl80211_get_encryption(const char *ifname, char *buf)
                        c->pair_ciphers |= nl80211_check_wepkey(wep_key1);
                        c->pair_ciphers |= nl80211_check_wepkey(wep_key2);
                        c->pair_ciphers |= nl80211_check_wepkey(wep_key3);
+
+                       c->enabled = (c->auth_algs && c->pair_ciphers) ? 1 : 0;
                }
 
                c->group_ciphers = c->pair_ciphers;
-               c->enabled = (c->wpa_version || c->pair_ciphers) ? 1 : 0;
 
                return 0;
        }
 
+       /* Ad-Hoc or Mesh interfaces without wpa_supplicant are open */
+       else if (!nl80211_get_mode(ifname, &opmode) &&
+                (opmode == IWINFO_OPMODE_ADHOC ||
+                 opmode == IWINFO_OPMODE_MESHPOINT))
+       {
+               c->enabled = 0;
+
+               return 0;
+       }
+
+
        return -1;
 }
 
@@ -1632,7 +1916,19 @@ static void nl80211_parse_rateinfo(struct nlattr **ri,
        else if (ri[NL80211_RATE_INFO_BITRATE])
                re->rate = nla_get_u16(ri[NL80211_RATE_INFO_BITRATE]) * 100;
 
-       if (ri[NL80211_RATE_INFO_VHT_MCS])
+       if (ri[NL80211_RATE_INFO_HE_MCS])
+       {
+               re->is_he = 1;
+               re->mcs = nla_get_u8(ri[NL80211_RATE_INFO_HE_MCS]);
+
+               if (ri[NL80211_RATE_INFO_HE_NSS])
+                       re->nss = nla_get_u8(ri[NL80211_RATE_INFO_HE_NSS]);
+               if (ri[NL80211_RATE_INFO_HE_GI])
+                       re->he_gi = nla_get_u8(ri[NL80211_RATE_INFO_HE_GI]);
+               if (ri[NL80211_RATE_INFO_HE_DCM])
+                       re->he_dcm = nla_get_u8(ri[NL80211_RATE_INFO_HE_DCM]);
+       }
+       else if (ri[NL80211_RATE_INFO_VHT_MCS])
        {
                re->is_vht = 1;
                re->mcs = nla_get_u8(ri[NL80211_RATE_INFO_VHT_MCS]);
@@ -1666,6 +1962,110 @@ static void nl80211_parse_rateinfo(struct nlattr **ri,
        re->is_40mhz = (re->mhz == 40);
 }
 
+static int nl80211_get_survey_cb(struct nl_msg *msg, void *arg)
+{
+       struct nl80211_array_buf *arr = arg;
+       struct iwinfo_survey_entry *e = arr->buf;
+       struct nlattr **attr = nl80211_parse(msg);
+       struct nlattr *sinfo[NL80211_SURVEY_INFO_MAX + 1];
+       int rc;
+
+       static struct nla_policy survey_policy[NL80211_SURVEY_INFO_MAX + 1] = {
+               [NL80211_SURVEY_INFO_FREQUENCY] = { .type = NLA_U32 },
+               [NL80211_SURVEY_INFO_NOISE]  = { .type = NLA_U8     },
+               [NL80211_SURVEY_INFO_TIME] = { .type = NLA_U64   },
+               [NL80211_SURVEY_INFO_TIME_BUSY] = { .type = NLA_U64   },
+               [NL80211_SURVEY_INFO_TIME_EXT_BUSY] = { .type = NLA_U64   },
+               [NL80211_SURVEY_INFO_TIME_RX] = { .type = NLA_U64   },
+               [NL80211_SURVEY_INFO_TIME_TX] = { .type = NLA_U64   },
+       };
+
+       rc = nla_parse_nested(sinfo, NL80211_SURVEY_INFO_MAX,
+                               attr[NL80211_ATTR_SURVEY_INFO],
+                               survey_policy);
+       if (rc)
+               return NL_SKIP;
+
+       /* advance to end of array */
+       e += arr->count;
+       memset(e, 0, sizeof(*e));
+
+       if (sinfo[NL80211_SURVEY_INFO_FREQUENCY])
+               e->mhz = nla_get_u32(sinfo[NL80211_SURVEY_INFO_FREQUENCY]);
+
+       if (sinfo[NL80211_SURVEY_INFO_NOISE])
+               e->noise = nla_get_u8(sinfo[NL80211_SURVEY_INFO_NOISE]);
+
+       if (sinfo[NL80211_SURVEY_INFO_TIME])
+               e->active_time = nla_get_u64(sinfo[NL80211_SURVEY_INFO_TIME]);
+
+       if (sinfo[NL80211_SURVEY_INFO_TIME_BUSY])
+               e->busy_time = nla_get_u64(sinfo[NL80211_SURVEY_INFO_TIME_BUSY]);
+
+       if (sinfo[NL80211_SURVEY_INFO_TIME_EXT_BUSY])
+               e->busy_time_ext = nla_get_u64(sinfo[NL80211_SURVEY_INFO_TIME_EXT_BUSY]);
+
+       if (sinfo[NL80211_SURVEY_INFO_TIME_RX])
+               e->rxtime = nla_get_u64(sinfo[NL80211_SURVEY_INFO_TIME_RX]);
+
+       if (sinfo[NL80211_SURVEY_INFO_TIME_TX])
+               e->txtime = nla_get_u64(sinfo[NL80211_SURVEY_INFO_TIME_TX]);
+
+       arr->count++;
+       return NL_SKIP;
+}
+
+
+static void plink_state_to_str(char *dst, unsigned state)
+{
+       switch (state) {
+       case NL80211_PLINK_LISTEN:
+               strcpy(dst, "LISTEN");
+               break;
+       case NL80211_PLINK_OPN_SNT:
+               strcpy(dst, "OPN_SNT");
+               break;
+       case NL80211_PLINK_OPN_RCVD:
+               strcpy(dst, "OPN_RCVD");
+               break;
+       case NL80211_PLINK_CNF_RCVD:
+               strcpy(dst, "CNF_RCVD");
+               break;
+       case NL80211_PLINK_ESTAB:
+               strcpy(dst, "ESTAB");
+               break;
+       case NL80211_PLINK_HOLDING:
+               strcpy(dst, "HOLDING");
+               break;
+       case NL80211_PLINK_BLOCKED:
+               strcpy(dst, "BLOCKED");
+               break;
+       default:
+               strcpy(dst, "UNKNOWN");
+               break;
+       }
+}
+
+static void power_mode_to_str(char *dst, struct nlattr *a)
+{
+       enum nl80211_mesh_power_mode pm = nla_get_u32(a);
+
+       switch (pm) {
+       case NL80211_MESH_POWER_ACTIVE:
+               strcpy(dst, "ACTIVE");
+               break;
+       case NL80211_MESH_POWER_LIGHT_SLEEP:
+               strcpy(dst, "LIGHT SLEEP");
+               break;
+       case NL80211_MESH_POWER_DEEP_SLEEP:
+               strcpy(dst, "DEEP SLEEP");
+               break;
+       default:
+               strcpy(dst, "UNKNOWN");
+               break;
+       }
+}
+
 static int nl80211_get_assoclist_cb(struct nl_msg *msg, void *arg)
 {
        struct nl80211_array_buf *arr = arg;
@@ -1682,13 +2082,24 @@ static int nl80211_get_assoclist_cb(struct nl_msg *msg, void *arg)
                [NL80211_STA_INFO_RX_BITRATE]    = { .type = NLA_NESTED },
                [NL80211_STA_INFO_TX_BITRATE]    = { .type = NLA_NESTED },
                [NL80211_STA_INFO_SIGNAL]        = { .type = NLA_U8     },
+               [NL80211_STA_INFO_SIGNAL_AVG]    = { .type = NLA_U8     },
                [NL80211_STA_INFO_RX_BYTES]      = { .type = NLA_U32    },
                [NL80211_STA_INFO_TX_BYTES]      = { .type = NLA_U32    },
                [NL80211_STA_INFO_TX_RETRIES]    = { .type = NLA_U32    },
                [NL80211_STA_INFO_TX_FAILED]     = { .type = NLA_U32    },
+               [NL80211_STA_INFO_CONNECTED_TIME]= { .type = NLA_U32    },
+               [NL80211_STA_INFO_RX_DROP_MISC]  = { .type = NLA_U64    },
                [NL80211_STA_INFO_T_OFFSET]      = { .type = NLA_U64    },
                [NL80211_STA_INFO_STA_FLAGS] =
                        { .minlen = sizeof(struct nl80211_sta_flag_update) },
+               [NL80211_STA_INFO_EXPECTED_THROUGHPUT]   = { .type = NLA_U32    },
+               /* mesh */
+               [NL80211_STA_INFO_LLID]          = { .type = NLA_U16    },
+               [NL80211_STA_INFO_PLID]          = { .type = NLA_U16    },
+               [NL80211_STA_INFO_PLINK_STATE]   = { .type = NLA_U8     },
+               [NL80211_STA_INFO_LOCAL_PM]      = { .type = NLA_U32    },
+               [NL80211_STA_INFO_PEER_PM]       = { .type = NLA_U32    },
+               [NL80211_STA_INFO_NONPEER_PM]    = { .type = NLA_U32    },
        };
 
        static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = {
@@ -1712,9 +2123,15 @@ static int nl80211_get_assoclist_cb(struct nl_msg *msg, void *arg)
                if (sinfo[NL80211_STA_INFO_SIGNAL])
                        e->signal = nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL]);
 
+               if (sinfo[NL80211_STA_INFO_SIGNAL_AVG])
+                       e->signal_avg = nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL_AVG]);
+
                if (sinfo[NL80211_STA_INFO_INACTIVE_TIME])
                        e->inactive = nla_get_u32(sinfo[NL80211_STA_INFO_INACTIVE_TIME]);
 
+               if (sinfo[NL80211_STA_INFO_CONNECTED_TIME])
+                       e->connected_time = nla_get_u32(sinfo[NL80211_STA_INFO_CONNECTED_TIME]);
+
                if (sinfo[NL80211_STA_INFO_RX_PACKETS])
                        e->rx_packets = nla_get_u32(sinfo[NL80211_STA_INFO_RX_PACKETS]);
 
@@ -1746,6 +2163,30 @@ static int nl80211_get_assoclist_cb(struct nl_msg *msg, void *arg)
                if (sinfo[NL80211_STA_INFO_T_OFFSET])
                        e->t_offset = nla_get_u64(sinfo[NL80211_STA_INFO_T_OFFSET]);
 
+               if (sinfo[NL80211_STA_INFO_RX_DROP_MISC])
+                       e->rx_drop_misc = nla_get_u64(sinfo[NL80211_STA_INFO_RX_DROP_MISC]);
+
+               if (sinfo[NL80211_STA_INFO_EXPECTED_THROUGHPUT])
+                       e->thr = nla_get_u32(sinfo[NL80211_STA_INFO_EXPECTED_THROUGHPUT]);
+
+               /* mesh */
+               if (sinfo[NL80211_STA_INFO_LLID])
+                       e->llid = nla_get_u16(sinfo[NL80211_STA_INFO_LLID]);
+
+               if (sinfo[NL80211_STA_INFO_PLID])
+                       e->plid = nla_get_u16(sinfo[NL80211_STA_INFO_PLID]);
+
+               if (sinfo[NL80211_STA_INFO_PLINK_STATE])
+                       plink_state_to_str(e->plink_state,
+                               nla_get_u8(sinfo[NL80211_STA_INFO_PLINK_STATE]));
+
+               if (sinfo[NL80211_STA_INFO_LOCAL_PM])
+                       power_mode_to_str(e->local_ps, sinfo[NL80211_STA_INFO_LOCAL_PM]);
+               if (sinfo[NL80211_STA_INFO_PEER_PM])
+                       power_mode_to_str(e->peer_ps, sinfo[NL80211_STA_INFO_PEER_PM]);
+               if (sinfo[NL80211_STA_INFO_NONPEER_PM])
+                       power_mode_to_str(e->nonpeer_ps, sinfo[NL80211_STA_INFO_NONPEER_PM]);
+
                /* Station flags */
                if (sinfo[NL80211_STA_INFO_STA_FLAGS])
                {
@@ -1784,6 +2225,21 @@ static int nl80211_get_assoclist_cb(struct nl_msg *msg, void *arg)
        return NL_SKIP;
 }
 
+static int nl80211_get_survey(const char *ifname, char *buf, int *len)
+{
+       struct nl80211_array_buf arr = { .buf = buf, .count = 0 };
+       int rc;
+
+       rc = nl80211_request(ifname, NL80211_CMD_GET_SURVEY,
+                       NLM_F_DUMP, nl80211_get_survey_cb, &arr);
+       if (!rc)
+               *len = (arr.count * sizeof(struct iwinfo_survey_entry));
+       else
+               *len = 0;
+
+       return 0;
+}
+
 static int nl80211_get_assoclist(const char *ifname, char *buf, int *len)
 {
        DIR *d;
@@ -1908,53 +2364,39 @@ static int nl80211_get_txpwrlist(const char *ifname, char *buf, int *len)
        return -1;
 }
 
-static void nl80211_get_scancrypto(const char *spec,
-       struct iwinfo_crypto_entry *c)
+static void nl80211_get_scancrypto(char *spec, struct iwinfo_crypto_entry *c)
 {
-       if (strstr(spec, "WPA") || strstr(spec, "WEP"))
-       {
-               c->enabled = 1;
-
-               if (strstr(spec, "WPA2-") && strstr(spec, "WPA-"))
-                       c->wpa_version = 3;
-
-               else if (strstr(spec, "WPA2"))
-                       c->wpa_version = 2;
-
-               else if (strstr(spec, "WPA"))
-                       c->wpa_version = 1;
-
-               else if (strstr(spec, "WEP"))
-                       c->auth_algs = IWINFO_AUTH_OPEN | IWINFO_AUTH_SHARED;
-
-
-               if (strstr(spec, "PSK"))
-                       c->auth_suites |= IWINFO_KMGMT_PSK;
-
-               if (strstr(spec, "802.1X") || strstr(spec, "EAP"))
-                       c->auth_suites |= IWINFO_KMGMT_8021x;
+       int wpa_version = 0;
+       char *p, *q, *proto, *suites;
 
-               if (strstr(spec, "WPA-NONE"))
-                       c->auth_suites |= IWINFO_KMGMT_NONE;
+       c->enabled = 0;
 
+       for (p = strtok_r(spec, "[]", &q); p; p = strtok_r(NULL, "[]", &q)) {
+               if (!strcmp(p, "WEP")) {
+                       c->enabled      = 1;
+                       c->auth_suites  = IWINFO_KMGMT_NONE;
+                       c->auth_algs    = IWINFO_AUTH_OPEN | IWINFO_AUTH_SHARED;
+                       c->pair_ciphers = IWINFO_CIPHER_WEP40 | IWINFO_CIPHER_WEP104;
+                       break;
+               }
 
-               if (strstr(spec, "TKIP"))
-                       c->pair_ciphers |= IWINFO_CIPHER_TKIP;
+               proto = strtok(p, "-");
+               suites = strtok(NULL, "]");
 
-               if (strstr(spec, "CCMP"))
-                       c->pair_ciphers |= IWINFO_CIPHER_CCMP;
+               if (!proto || !suites)
+                       continue;
 
-               if (strstr(spec, "WEP-40"))
-                       c->pair_ciphers |= IWINFO_CIPHER_WEP40;
+               if (!strcmp(proto, "WPA2") || !strcmp(proto, "RSN"))
+                       wpa_version = 2;
+               else if (!strcmp(proto, "WPA"))
+                       wpa_version = 1;
+               else
+                       continue;
 
-               if (strstr(spec, "WEP-104"))
-                       c->pair_ciphers |= IWINFO_CIPHER_WEP104;
+               c->enabled = 1;
 
-               c->group_ciphers = c->pair_ciphers;
-       }
-       else
-       {
-               c->enabled = 0;
+               parse_wpa_suites(suites, wpa_version, &c->wpa_version, &c->auth_suites);
+               parse_wpa_ciphers(suites, &c->pair_ciphers);
        }
 }
 
@@ -1978,9 +2420,12 @@ static void nl80211_get_scanlist_ie(struct nlattr **bss,
                switch (ie[0])
                {
                case 0: /* SSID */
-                       len = min(ie[1], IWINFO_ESSID_MAX_SIZE);
-                       memcpy(e->ssid, ie + 2, len);
-                       e->ssid[len] = 0;
+               case 114: /* Mesh ID */
+                       if (e->ssid[0] == 0) {
+                               len = min(ie[1], IWINFO_ESSID_MAX_SIZE);
+                               memcpy(e->ssid, ie + 2, len);
+                               e->ssid[len] = 0;
+                       }
                        break;
 
                case 48: /* RSN */
@@ -1993,6 +2438,20 @@ static void nl80211_get_scanlist_ie(struct nlattr **bss,
                                iwinfo_parse_rsn(&e->crypto, ie + 6, ie[1] - 4,
                                                 IWINFO_CIPHER_TKIP, IWINFO_KMGMT_PSK);
                        break;
+               case 61: /* HT oeration */
+                       if (ie[1] >= 3) {
+                               e->ht_chan_info.primary_chan = ie[2];
+                               e->ht_chan_info.secondary_chan_off = ie[3] & 0x3;
+                               e->ht_chan_info.chan_width = (ie[4] & 0x4)>>2;
+                       }
+                       break;
+               case 192: /* VHT operation */
+                       if (ie[1] >= 3) {
+                               e->vht_chan_info.chan_width = ie[2];
+                               e->vht_chan_info.center_chan_1 = ie[3];
+                               e->vht_chan_info.center_chan_2 = ie[4];
+                       }
+                       break;
                }
 
                ielen -= ie[1] + 2;
@@ -2091,7 +2550,8 @@ static int nl80211_get_scanlist_nl(const char *ifname, char *buf, int *len)
        if (nl80211_request(ifname, NL80211_CMD_TRIGGER_SCAN, 0, NULL, NULL))
                goto out;
 
-       if (nl80211_wait("nl80211", "scan", NL80211_CMD_NEW_SCAN_RESULTS))
+       if (nl80211_wait("nl80211", "scan",
+                        NL80211_CMD_NEW_SCAN_RESULTS, NL80211_CMD_SCAN_ABORTED))
                goto out;
 
        if (nl80211_request(ifname, NL80211_CMD_GET_SCAN, NLM_F_DUMP,
@@ -2206,11 +2666,27 @@ static int nl80211_get_scanlist_wpactl(const char *ifname, char *buf, int *len)
                        /* is another unrelated event, retry */
                        tries--;
                }
+
+               /* scanning already in progress, keep awaiting results */
+               else if (!strcmp(reply, "FAIL-BUSY\n"))
+               {
+                       tries--;
+               }
+
+               /* another failure, abort */
+               else if (!strncmp(reply, "FAIL-", 5))
+               {
+                       break;
+               }
        }
 
        /* receive and parse scan results if the wait above didn't time out */
-       if (ready && nl80211_wpactl_recv(sock, reply, sizeof(reply)) > 0)
+       while (ready && nl80211_wpactl_recv(sock, reply, sizeof(reply)) > 0)
        {
+               /* received an event notification, receive again */
+               if (reply[0] == '<')
+                       continue;
+
                nl80211_get_quality_max(ifname, &qmax);
 
                for (line = strtok_r(reply, "\n", &pos);
@@ -2230,7 +2706,7 @@ static int nl80211_get_scanlist_wpactl(const char *ifname, char *buf, int *len)
                        flags  = strtok(NULL, "\t");
                        ssid   = strtok(NULL, "\n");
 
-                       if (!bssid || !freq || !signal || !flags || !ssid)
+                       if (!bssid || !freq || !signal || !flags)
                                continue;
 
                        /* BSSID */
@@ -2242,7 +2718,10 @@ static int nl80211_get_scanlist_wpactl(const char *ifname, char *buf, int *len)
                        e->mac[5] = strtol(&bssid[15], NULL, 16);
 
                        /* SSID */
-                       wpasupp_ssid_decode(ssid, e->ssid, sizeof(e->ssid));
+                       if (ssid)
+                               wpasupp_ssid_decode(ssid, e->ssid, sizeof(e->ssid));
+                       else
+                               e->ssid[0] = 0;
 
                        /* Mode */
                        if (strstr(flags, "[MESH]"))
@@ -2288,6 +2767,7 @@ static int nl80211_get_scanlist_wpactl(const char *ifname, char *buf, int *len)
                }
 
                *len = count * sizeof(struct iwinfo_scanlist_entry);
+               break;
        }
 
        close(sock);
@@ -2520,8 +3000,73 @@ struct nl80211_modes
        bool ok;
        uint32_t hw;
        uint32_t ht;
+
+       uint32_t nl_freq;
+       uint16_t nl_ht;
+       uint32_t nl_vht;
+       uint16_t he_phy_cap[6];
 };
 
+static int nl80211_eval_modelist(struct nl80211_modes *m)
+{
+       /* Treat any nonzero capability as 11n */
+       if (m->nl_ht > 0)
+       {
+               m->hw |= IWINFO_80211_N;
+               m->ht |= IWINFO_HTMODE_HT20;
+
+               if (m->nl_ht & (1 << 1))
+                       m->ht |= IWINFO_HTMODE_HT40;
+       }
+
+       if (m->he_phy_cap[0] != 0) {
+               m->hw |= IWINFO_80211_AX;
+               m->ht |= IWINFO_HTMODE_HE20;
+
+               if (m->he_phy_cap[0] & BIT(9))
+                       m->ht |= IWINFO_HTMODE_HE40;
+               if (m->he_phy_cap[0] & BIT(10))
+                       m->ht |= IWINFO_HTMODE_HE40 | IWINFO_HTMODE_HE80;
+               if (m->he_phy_cap[0] & BIT(11))
+                       m->ht |= IWINFO_HTMODE_HE160;
+               if (m->he_phy_cap[0] & BIT(12))
+                       m->ht |= IWINFO_HTMODE_HE160 | IWINFO_HTMODE_HE80_80;
+       }
+
+       if (m->nl_freq < 2485)
+       {
+               m->hw |= IWINFO_80211_B;
+               m->hw |= IWINFO_80211_G;
+       }
+       else if (m->nl_vht)
+       {
+               /* Treat any nonzero capability as 11ac */
+               if (m->nl_vht > 0)
+               {
+                       m->hw |= IWINFO_80211_AC;
+                       m->ht |= IWINFO_HTMODE_VHT20 | IWINFO_HTMODE_VHT40 | IWINFO_HTMODE_VHT80;
+
+                       switch ((m->nl_vht >> 2) & 3)
+                       {
+                       case 2:
+                               m->ht |= IWINFO_HTMODE_VHT80_80;
+                               /* fall through */
+
+                       case 1:
+                               m->ht |= IWINFO_HTMODE_VHT160;
+                       }
+               }
+       }
+       else if (m->nl_freq >= 56160)
+       {
+               m->hw |= IWINFO_80211_AD;
+       }
+       else if (!(m->hw & IWINFO_80211_AC))
+       {
+               m->hw |= IWINFO_80211_A;
+       }
+}
+
 static int nl80211_get_modelist_cb(struct nl_msg *msg, void *arg)
 {
        struct nl80211_modes *m = arg;
@@ -2541,56 +3086,43 @@ static int nl80211_get_modelist_cb(struct nl_msg *msg, void *arg)
                                  nla_data(band), nla_len(band), NULL);
 
                        if (bands[NL80211_BAND_ATTR_HT_CAPA])
-                               caps = nla_get_u16(bands[NL80211_BAND_ATTR_HT_CAPA]);
-
-                       /* Treat any nonzero capability as 11n */
-                       if (caps > 0)
-                       {
-                               m->hw |= IWINFO_80211_N;
-                               m->ht |= IWINFO_HTMODE_HT20;
-
-                               if (caps & (1 << 1))
-                                       m->ht |= IWINFO_HTMODE_HT40;
+                               m->nl_ht = nla_get_u16(bands[NL80211_BAND_ATTR_HT_CAPA]);
+
+                       if (bands[NL80211_BAND_ATTR_VHT_CAPA])
+                               m->nl_vht = nla_get_u32(bands[NL80211_BAND_ATTR_VHT_CAPA]);
+
+                       if (bands[NL80211_BAND_ATTR_IFTYPE_DATA]) {
+                               struct nlattr *tb[NL80211_BAND_IFTYPE_ATTR_MAX + 1];
+                               struct nlattr *nl_iftype;
+                               int rem_band;
+                               int len;
+
+                               nla_for_each_nested(nl_iftype, bands[NL80211_BAND_ATTR_IFTYPE_DATA], rem_band) {
+                                       nla_parse(tb, NL80211_BAND_IFTYPE_ATTR_MAX,
+                                                 nla_data(nl_iftype), nla_len(nl_iftype), NULL);
+                                       if (tb[NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY]) {
+                                               len = nla_len(tb[NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY]);
+
+                                               if (len > sizeof(m->he_phy_cap) - 1)
+                                                       len = sizeof(m->he_phy_cap) - 1;
+                                               memcpy(&((__u8 *)m->he_phy_cap)[1],
+                                                       nla_data(tb[NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY]),
+                                                       len);
+                                       }
+                               }
                        }
 
-                       nla_for_each_nested(freq, bands[NL80211_BAND_ATTR_FREQS],
-                                           freqs_remain)
-                       {
-                               nla_parse(freqs, NL80211_FREQUENCY_ATTR_MAX,
-                                         nla_data(freq), nla_len(freq), NULL);
-
-                               if (!freqs[NL80211_FREQUENCY_ATTR_FREQ])
-                                       continue;
-
-                               if (nla_get_u32(freqs[NL80211_FREQUENCY_ATTR_FREQ]) < 2485)
-                               {
-                                       m->hw |= IWINFO_80211_B;
-                                       m->hw |= IWINFO_80211_G;
-                               }
-                               else if (bands[NL80211_BAND_ATTR_VHT_CAPA])
+                       if (bands[NL80211_BAND_ATTR_FREQS]) {
+                               nla_for_each_nested(freq, bands[NL80211_BAND_ATTR_FREQS],
+                                                   freqs_remain)
                                {
-                                       vht_caps = nla_get_u32(bands[NL80211_BAND_ATTR_VHT_CAPA]);
+                                       nla_parse(freqs, NL80211_FREQUENCY_ATTR_MAX,
+                                               nla_data(freq), nla_len(freq), NULL);
 
-                                       /* Treat any nonzero capability as 11ac */
-                                       if (vht_caps > 0)
-                                       {
-                                               m->hw |= IWINFO_80211_AC;
-                                               m->ht |= IWINFO_HTMODE_VHT20 | IWINFO_HTMODE_VHT40 | IWINFO_HTMODE_VHT80;
-
-                                               switch ((vht_caps >> 2) & 3)
-                                               {
-                                               case 2:
-                                                       m->ht |= IWINFO_HTMODE_VHT80_80;
-                                                       /* fall through */
-
-                                               case 1:
-                                                       m->ht |= IWINFO_HTMODE_VHT160;
-                                               }
-                                       }
-                               }
-                               else if (!(m->hw & IWINFO_80211_AC))
-                               {
-                                       m->hw |= IWINFO_80211_A;
+                                       if (!freqs[NL80211_FREQUENCY_ATTR_FREQ])
+                                               continue;
+
+                                       m->nl_freq = nla_get_u32(freqs[NL80211_FREQUENCY_ATTR_FREQ]);
                                }
                        }
                }
@@ -2603,39 +3135,126 @@ static int nl80211_get_modelist_cb(struct nl_msg *msg, void *arg)
 
 static int nl80211_get_hwmodelist(const char *ifname, int *buf)
 {
-       struct nl80211_modes m = { 0 };
+       struct nl80211_msg_conveyor *cv;
+       struct nl80211_modes m = {};
+       uint32_t features = nl80211_get_protocol_features(ifname);
+       int flags;
 
-       if (nl80211_request(ifname, NL80211_CMD_GET_WIPHY, 0,
-                           nl80211_get_modelist_cb, &m))
+       flags = features & NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP ? NLM_F_DUMP : 0;
+       cv = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, flags);
+       if (!cv)
                goto out;
 
-       if (!m.ok)
-               goto out;
+       NLA_PUT_FLAG(cv->msg, NL80211_ATTR_SPLIT_WIPHY_DUMP);
+       if (nl80211_send(cv, nl80211_get_modelist_cb, &m))
+               goto nla_put_failure;
+
+       nl80211_eval_modelist(&m);
 
        *buf = m.hw;
+
        return 0;
 
+nla_put_failure:
+       nl80211_free(cv);
 out:
-       *buf = 0;
        return -1;
 }
 
+struct chan_info {
+       int width;
+       int mode;
+};
+
+static int nl80211_get_htmode_cb(struct nl_msg *msg, void *arg)
+{
+       struct nlattr **tb = nl80211_parse(msg);
+       struct nlattr *cur;
+       struct chan_info *chn = arg;
+
+       if ((cur = tb[NL80211_ATTR_CHANNEL_WIDTH]))
+               chn->width = nla_get_u32(cur);
+
+       if ((cur = tb[NL80211_ATTR_BSS_HT_OPMODE]))
+               chn->mode = nla_get_u32(cur);
+
+       return NL_SKIP;
+}
+
+static int nl80211_get_htmode(const char *ifname, int *buf)
+{
+       struct chan_info chn = { .width = 0, .mode = 0 };
+       char *res;
+       int err;
+
+       res = nl80211_phy2ifname(ifname);
+       *buf = 0;
+
+       err =  nl80211_request(res ? res : ifname,
+                               NL80211_CMD_GET_INTERFACE, 0,
+                               nl80211_get_htmode_cb, &chn);
+       if (err)
+               return -1;
+
+       switch (chn.width) {
+       case NL80211_CHAN_WIDTH_20:
+               if (chn.mode == -1)
+                       *buf = IWINFO_HTMODE_VHT20;
+               else
+                       *buf = IWINFO_HTMODE_HT20;
+               break;
+       case NL80211_CHAN_WIDTH_40:
+               if (chn.mode == -1)
+                       *buf = IWINFO_HTMODE_VHT40;
+               else
+                       *buf = IWINFO_HTMODE_HT40;
+               break;
+       case NL80211_CHAN_WIDTH_80:
+               *buf = IWINFO_HTMODE_VHT80;
+               break;
+       case NL80211_CHAN_WIDTH_80P80:
+               *buf = IWINFO_HTMODE_VHT80_80;
+               break;
+       case NL80211_CHAN_WIDTH_160:
+               *buf = IWINFO_HTMODE_VHT160;
+               break;
+       case NL80211_CHAN_WIDTH_5:
+       case NL80211_CHAN_WIDTH_10:
+       case NL80211_CHAN_WIDTH_20_NOHT:
+               *buf = IWINFO_HTMODE_NOHT;
+               break;
+       default:
+               return -1;
+       }
+
+       return 0;
+}
+
 static int nl80211_get_htmodelist(const char *ifname, int *buf)
 {
-       struct nl80211_modes m = { 0 };
+       struct nl80211_msg_conveyor *cv;
+       struct nl80211_modes m = {};
+       uint32_t features = nl80211_get_protocol_features(ifname);
+       int flags;
 
-       if (nl80211_request(ifname, NL80211_CMD_GET_WIPHY, 0,
-                           nl80211_get_modelist_cb, &m))
+       flags = features & NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP ? NLM_F_DUMP : 0;
+       cv = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, flags);
+       if (!cv)
                goto out;
 
-       if (!m.ok)
-               goto out;
+       NLA_PUT_FLAG(cv->msg, NL80211_ATTR_SPLIT_WIPHY_DUMP);
+       if (nl80211_send(cv, nl80211_get_modelist_cb, &m))
+               goto nla_put_failure;
+
+       nl80211_eval_modelist(&m);
 
        *buf = m.ht;
+
        return 0;
 
+nla_put_failure:
+       nl80211_free(cv);
 out:
-       *buf = 0;
        return -1;
 }
 
@@ -2702,39 +3321,103 @@ static int nl80211_get_mbssid_support(const char *ifname, int *buf)
        return 0;
 }
 
+static int nl80211_hardware_id_from_fdt(struct iwinfo_hardware_id *id, const char *ifname)
+{
+       char *phy, compat[64], path[PATH_MAX];
+       int i;
+
+       /* Try to determine the phy name from the given interface */
+       phy = nl80211_ifname2phy(ifname);
+
+       snprintf(path, sizeof(path), "/sys/class/%s/%s/device/of_node/compatible",
+                phy ? "ieee80211" : "net", phy ? phy : ifname);
+
+       if (nl80211_readstr(path, compat, sizeof(compat)) <= 0)
+               return -1;
+
+       if (!strcmp(compat, "qca,ar9130-wmac")) {
+               id->vendor_id = 0x168c;
+               id->device_id = 0x0029;
+               id->subsystem_vendor_id = 0x168c;
+               id->subsystem_device_id = 0x9130;
+       } else if (!strcmp(compat, "qca,ar9330-wmac")) {
+               id->vendor_id = 0x168c;
+               id->device_id = 0x0030;
+               id->subsystem_vendor_id = 0x168c;
+               id->subsystem_device_id = 0x9330;
+       } else if (!strcmp(compat, "qca,ar9340-wmac")) {
+               id->vendor_id = 0x168c;
+               id->device_id = 0x0030;
+               id->subsystem_vendor_id = 0x168c;
+               id->subsystem_device_id = 0x9340;
+       } else if (!strcmp(compat, "qca,qca9530-wmac")) {
+               id->vendor_id = 0x168c;
+               id->device_id = 0x0033;
+               id->subsystem_vendor_id = 0x168c;
+               id->subsystem_device_id = 0x9530;
+       } else if (!strcmp(compat, "qca,qca9550-wmac")) {
+               id->vendor_id = 0x168c;
+               id->device_id = 0x0033;
+               id->subsystem_vendor_id = 0x168c;
+               id->subsystem_device_id = 0x9550;
+       } else if (!strcmp(compat, "qca,qca9560-wmac")) {
+               id->vendor_id = 0x168c;
+               id->device_id = 0x0033;
+               id->subsystem_vendor_id = 0x168c;
+               id->subsystem_device_id = 0x9560;
+       } else if (!strcmp(compat, "qcom,ipq4019-wifi")) {
+               id->vendor_id = 0x168c;
+               id->device_id = 0x003c;
+               id->subsystem_vendor_id = 0x168c;
+               id->subsystem_device_id = 0x4019;
+       } else if (!strcmp(compat, "mediatek,mt7622-wmac")) {
+               id->vendor_id = 0x14c3;
+               id->device_id = 0x7622;
+               id->subsystem_vendor_id = 0x14c3;
+               id->subsystem_device_id = 0x7622;
+       }
+       return (id->vendor_id && id->device_id) ? 0 : -1;
+}
+
+
 static int nl80211_get_hardware_id(const char *ifname, char *buf)
 {
-       int rv = -1;
-       char *res;
+       struct iwinfo_hardware_id *id = (struct iwinfo_hardware_id *)buf;
+       char *phy, num[8], path[PATH_MAX];
+       int i;
 
-       /* Got a radioX pseudo interface, find some interface on it or create one */
-       if (!strncmp(ifname, "radio", 5))
-       {
-               /* Reuse existing interface */
-               if ((res = nl80211_phy2ifname(ifname)) != NULL)
-               {
-                       rv = wext_ops.hardware_id(res, buf);
-               }
+       struct { const char *path; uint16_t *dest; } lookup[] = {
+               { "vendor", &id->vendor_id },
+               { "device", &id->device_id },
+               { "subsystem_vendor", &id->subsystem_vendor_id },
+               { "subsystem_device", &id->subsystem_device_id }
+       };
 
-               /* Need to spawn a temporary iface for finding IDs */
-               else if ((res = nl80211_ifadd(ifname)) != NULL)
-               {
-                       rv = wext_ops.hardware_id(res, buf);
-                       nl80211_ifdel(res);
-               }
-       }
-       else
+       memset(id, 0, sizeof(*id));
+
+       /* Try to determine the phy name from the given interface */
+       phy = nl80211_ifname2phy(ifname);
+
+       for (i = 0; i < ARRAY_SIZE(lookup); i++)
        {
-               rv = wext_ops.hardware_id(ifname, buf);
+               snprintf(path, sizeof(path), "/sys/class/%s/%s/device/%s",
+                        phy ? "ieee80211" : "net",
+                        phy ? phy : ifname, lookup[i].path);
+
+               if (nl80211_readstr(path, num, sizeof(num)) > 0)
+                       *lookup[i].dest = strtoul(num, NULL, 16);
        }
 
+       /* Failed to obtain hardware IDs, try FDT */
+       if (id->vendor_id == 0 || id->device_id == 0)
+               if (!nl80211_hardware_id_from_fdt(id, ifname))
+                       return 0;
+
        /* Failed to obtain hardware IDs, search board config */
-       if (rv)
-       {
-               rv = iwinfo_hardware_id_from_mtd((struct iwinfo_hardware_id *)buf);
-       }
+       if (id->vendor_id == 0 || id->device_id == 0)
+               return iwinfo_hardware_id_from_mtd(id);
 
-       return rv;
+       return 0;
 }
 
 static const struct iwinfo_hardware_entry *
@@ -2793,10 +3476,27 @@ static int nl80211_lookup_phyname(const char *section, char *buf)
        return 0;
 }
 
+static int nl80211_phy_path(const char *phyname, const char **path)
+{
+       if (strncmp(phyname, "phy", 3) != 0)
+               return -1;
+
+       if (strchr(phyname, '/'))
+               return -1;
+
+       *path = nl80211_phy_path_str(phyname);
+       if (!*path)
+               return -1;
+
+       return 0;
+}
+
 const struct iwinfo_ops nl80211_ops = {
        .name             = "nl80211",
        .probe            = nl80211_probe,
        .channel          = nl80211_get_channel,
+       .center_chan1     = nl80211_get_center_chan1,
+       .center_chan2     = nl80211_get_center_chan2,
        .frequency        = nl80211_get_frequency,
        .frequency_offset = nl80211_get_frequency_offset,
        .txpower          = nl80211_get_txpower,
@@ -2809,6 +3509,7 @@ const struct iwinfo_ops nl80211_ops = {
        .mbssid_support   = nl80211_get_mbssid_support,
        .hwmodelist       = nl80211_get_hwmodelist,
        .htmodelist       = nl80211_get_htmodelist,
+       .htmode           = nl80211_get_htmode,
        .mode             = nl80211_get_mode,
        .ssid             = nl80211_get_ssid,
        .bssid            = nl80211_get_bssid,
@@ -2822,6 +3523,8 @@ const struct iwinfo_ops nl80211_ops = {
        .scanlist         = nl80211_get_scanlist,
        .freqlist         = nl80211_get_freqlist,
        .countrylist      = nl80211_get_countrylist,
+       .survey           = nl80211_get_survey,
        .lookup_phy       = nl80211_lookup_phyname,
+       .phy_path         = nl80211_phy_path,
        .close            = nl80211_close
 };