libiwinfo: correctly map BSS vars when parsing hostapd config
[project/luci.git] / contrib / package / iwinfo / src / iwinfo_nl80211.c
index 6b980235ec187717ba84196c666c3bebbfe67294..21797c13de9b76ee8bc4c28377d20bea88e4f929 100644 (file)
@@ -236,13 +236,16 @@ static int nl80211_freq2channel(int freq)
     return (freq / 5) - 1000;
 }
 
-static char * nl80211_getval(const char *buf, const char *key)
+static char * nl80211_getval(const char *ifname, const char *buf, const char *key)
 {
        int i, len;
        char lkey[64] = { 0 };
        const char *ln = buf;
        static char lval[256] = { 0 };
 
+       int matched_if = ifname ? 0 : 1;
+
+
        for( i = 0, len = strlen(buf); i < len; i++ )
        {
                if( !lkey[0] && (buf[i] == ' ' || buf[i] == '\t') )
@@ -256,12 +259,20 @@ static char * nl80211_getval(const char *buf, const char *key)
                }
                else if( buf[i] == '\n' )
                {
-                       if( lkey[0] && !strcmp(lkey, key) )
+                       if( lkey[0] )
                        {
                                memcpy(lval, ln + strlen(lkey) + 1,
                                        min(sizeof(lval) - 1, &buf[i] - ln - strlen(lkey) - 1));
 
-                               return lval;
+                               if( (ifname != NULL ) &&
+                                   (!strcmp(lkey, "interface") || !strcmp(lkey, "bss")) )
+                               {
+                                       matched_if = !strcmp(lval, ifname);
+                               }
+                               else if( matched_if && !strcmp(lkey, key) )
+                               {
+                                       return lval;
+                               }
                        }
 
                        ln = &buf[i+1];
@@ -507,7 +518,7 @@ int nl80211_get_ssid(const char *ifname, char *buf)
                return 0;
        }
        else if( (ssid = nl80211_hostapd_info(ifname)) &&
-                (ssid = nl80211_getval(ssid, "ssid")) )
+                (ssid = nl80211_getval(ifname, ssid, "ssid")) )
        {
                memcpy(buf, ssid, strlen(ssid));
                return 0;
@@ -526,7 +537,7 @@ int nl80211_get_bssid(const char *ifname, char *buf)
                return 0;
        }
        else if( (bssid = nl80211_hostapd_info(ifname)) &&
-                (bssid = nl80211_getval(bssid, "bssid")) )
+                (bssid = nl80211_getval(ifname, bssid, "bssid")) )
        {
                mac[0] = strtol(&bssid[0],  NULL, 16);
                mac[1] = strtol(&bssid[3],  NULL, 16);
@@ -768,10 +779,9 @@ int nl80211_get_encryption(const char *ifname, char *buf)
        struct iwinfo_crypto_entry *c = (struct iwinfo_crypto_entry *)buf;
 
        /* Hostapd */
-       if( (res = nl80211_hostapd_info(ifname)) &&
-           nl80211_getval(res, "interface") )
+       if( (res = nl80211_hostapd_info(ifname)) )
        {
-               if( (val = nl80211_getval(res, "auth_algs")) && (val > 0) )
+               if( (val = nl80211_getval(ifname, res, "auth_algs")) && (val > 0) )
                {
                        c->auth_suites |= IWINFO_KMGMT_NONE;
 
@@ -797,7 +807,7 @@ int nl80211_get_encryption(const char *ifname, char *buf)
                        {
                                snprintf(k, sizeof(k), "wep_key%d", i);
 
-                               if( (val = nl80211_getval(res, k)) )
+                               if( (val = nl80211_getval(ifname, res, k)) )
                                {
                                        if( (strlen(val) == 5) || (strlen(val) == 10) )
                                                c->pair_ciphers |= IWINFO_CIPHER_WEP40;
@@ -813,11 +823,11 @@ int nl80211_get_encryption(const char *ifname, char *buf)
                }
 
 
-               if( (val = nl80211_getval(res, "wpa")) != NULL )
+               if( (val = nl80211_getval(ifname, res, "wpa")) != NULL )
                        c->wpa_version = atoi(val);
 
 
-               val = nl80211_getval(res, "wpa_key_mgmt");
+               val = nl80211_getval(ifname, res, "wpa_key_mgmt");
 
                if( !val || strstr(val, "PSK") )
                        c->auth_suites |= IWINFO_KMGMT_PSK;
@@ -829,7 +839,7 @@ int nl80211_get_encryption(const char *ifname, char *buf)
                        c->auth_suites |= IWINFO_KMGMT_NONE;
 
 
-               if( (val = nl80211_getval(res, "wpa_pairwise")) != NULL )
+               if( (val = nl80211_getval(ifname, res, "wpa_pairwise")) != NULL )
                {
                        if( strstr(val, "TKIP") )
                                c->pair_ciphers |= IWINFO_CIPHER_TKIP;
@@ -850,7 +860,7 @@ int nl80211_get_encryption(const char *ifname, char *buf)
 
        /* WPA supplicant */
        else if( (res = nl80211_wpasupp_info(ifname, "STATUS")) &&
-                (val = nl80211_getval(res, "pairwise_cipher")) )
+                (val = nl80211_getval(NULL, res, "pairwise_cipher")) )
        {
                /* WEP */
                if( strstr(val, "WEP") )
@@ -887,7 +897,7 @@ int nl80211_get_encryption(const char *ifname, char *buf)
                                c->pair_ciphers |= IWINFO_CIPHER_WEP104;
 
 
-                       if( (val = nl80211_getval(res, "group_cipher")) )
+                       if( (val = nl80211_getval(NULL, res, "group_cipher")) )
                        {
                                if( strstr(val, "TKIP") )
                                        c->group_ciphers |= IWINFO_CIPHER_TKIP;
@@ -906,7 +916,7 @@ int nl80211_get_encryption(const char *ifname, char *buf)
                        }
 
 
-                       if( (val = nl80211_getval(res, "key_mgmt")) )
+                       if( (val = nl80211_getval(NULL, res, "key_mgmt")) )
                        {
                                if( strstr(val, "WPA2") )
                                        c->wpa_version = 2;
@@ -1302,7 +1312,6 @@ int nl80211_get_scanlist(const char *ifname, char *buf, int *len)
 
 int nl80211_get_freqlist(const char *ifname, char *buf, int *len)
 {
-       char *phy;
        int count = 0, bands_remain, freqs_remain;
        struct nl80211_msg_conveyor *req, *res;
        struct nlattr *bands[NL80211_BAND_ATTR_MAX + 1];
@@ -1310,15 +1319,6 @@ int nl80211_get_freqlist(const char *ifname, char *buf, int *len)
        struct nlattr *band, *freq;
        struct iwinfo_freqlist_entry *e = (struct iwinfo_freqlist_entry *)buf;
 
-       static struct nla_policy freq_policy[NL80211_FREQUENCY_ATTR_MAX + 1] = {
-               [NL80211_FREQUENCY_ATTR_FREQ]         = { .type = NLA_U32  },
-               [NL80211_FREQUENCY_ATTR_DISABLED]     = { .type = NLA_FLAG },
-               [NL80211_FREQUENCY_ATTR_PASSIVE_SCAN] = { .type = NLA_FLAG },
-               [NL80211_FREQUENCY_ATTR_NO_IBSS]      = { .type = NLA_FLAG },
-               [NL80211_FREQUENCY_ATTR_RADAR]        = { .type = NLA_FLAG },
-               [NL80211_FREQUENCY_ATTR_MAX_TX_POWER] = { .type = NLA_U32  },
-       };
-
        req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0);
        if( req )
        {
@@ -1335,9 +1335,10 @@ int nl80211_get_freqlist(const char *ifname, char *buf, int *len)
                                        bands[NL80211_BAND_ATTR_FREQS], freqs_remain)
                                {
                                        nla_parse(freqs, NL80211_FREQUENCY_ATTR_MAX,
-                                               nla_data(freq), nla_len(freq), freq_policy);
+                                               nla_data(freq), nla_len(freq), NULL);
 
-                                       if( freqs[NL80211_FREQUENCY_ATTR_DISABLED] )
+                                       if( !freqs[NL80211_FREQUENCY_ATTR_FREQ] ||
+                                           freqs[NL80211_FREQUENCY_ATTR_DISABLED] )
                                                continue;
 
                                        e->mhz = nla_get_u32(freqs[NL80211_FREQUENCY_ATTR_FREQ]);
@@ -1408,6 +1409,62 @@ int nl80211_get_countrylist(const char *ifname, char *buf, int *len)
        return 0;
 }
 
+int nl80211_get_hwmodelist(const char *ifname, int *buf)
+{
+       int bands_remain, freqs_remain;
+       struct nl80211_msg_conveyor *req, *res;
+       struct nlattr *bands[NL80211_BAND_ATTR_MAX + 1];
+       struct nlattr *freqs[NL80211_FREQUENCY_ATTR_MAX + 1];
+       struct nlattr *band, *freq;
+       uint16_t caps = 0;
+
+       req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0);
+       if( req )
+       {
+               res = nl80211_send(req);
+               if( res )
+               {
+                       nla_for_each_nested(band,
+                               res->attr[NL80211_ATTR_WIPHY_BANDS], bands_remain)
+                       {
+                               nla_parse(bands, NL80211_BAND_ATTR_MAX, 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 HT20/HT40 as 11n */
+                               if( caps & (1 << 1) )
+                                       *buf |= IWINFO_80211_N;
+
+                               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 )
+                                       {
+                                               *buf |= IWINFO_80211_B;
+                                               *buf |= IWINFO_80211_G;
+                                       }
+                                       else
+                                       {
+                                               *buf |= IWINFO_80211_A;
+                                       }
+                               }
+                       }
+                       nl80211_free(res);
+               }
+               nl80211_free(req);
+       }
+
+       return *buf ? 0 : -1;
+}
+
 int nl80211_get_mbssid_support(const char *ifname, int *buf)
 {
        /* We assume that multi bssid is always possible */