projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
bcm63xx: add initial support for bcm6368 boards
[openwrt.git] / package / iwinfo / src / iwinfo_wl.c
diff --git a/package/iwinfo/src/iwinfo_wl.c b/package/iwinfo/src/iwinfo_wl.c
index 7b39a9b..3d15fc9 100644 (file)
--- a/package/iwinfo/src/iwinfo_wl.c
+++ b/package/iwinfo/src/iwinfo_wl.c
@@ -37,17 +37,30 @@ static int wl_ioctl(const char *name, int cmd, void *buf, int len)
        return iwinfo_ioctl(SIOCDEVPRIVATE, &ifr);
 }
 
        return iwinfo_ioctl(SIOCDEVPRIVATE, &ifr);
 }
 
+static int wl_iovar(const char *name, const char *cmd, const char *arg,
+                                       int arglen, void *buf, int buflen)
+{
+       int cmdlen = strlen(cmd) + 1;
+
+       memcpy(buf, cmd, cmdlen);
+
+       if (arg && arglen > 0)
+               memcpy(buf + cmdlen, arg, arglen);
+
+       return wl_ioctl(name, WLC_GET_VAR, buf, buflen);
+}
+
 static struct wl_maclist * wl_read_assoclist(const char *ifname)
 {
        struct wl_maclist *macs;
        int maclen = 4 + WL_MAX_STA_COUNT * 6;
 
 static struct wl_maclist * wl_read_assoclist(const char *ifname)
 {
        struct wl_maclist *macs;
        int maclen = 4 + WL_MAX_STA_COUNT * 6;
 
-       if( (macs = (struct wl_maclist *) malloc(maclen)) != NULL )
+       if ((macs = (struct wl_maclist *) malloc(maclen)) != NULL)
        {
                memset(macs, 0, maclen);
                macs->count = WL_MAX_STA_COUNT;
 
        {
                memset(macs, 0, maclen);
                macs->count = WL_MAX_STA_COUNT;
 
-               if( !wl_ioctl(ifname, WLC_GET_ASSOCLIST, macs, maclen) )
+               if (!wl_ioctl(ifname, WLC_GET_ASSOCLIST, macs, maclen))
                        return macs;
 
                free(macs);
                        return macs;
 
                free(macs);
@@ -60,11 +73,8 @@ static struct wl_maclist * wl_read_assoclist(const char *ifname)
 int wl_probe(const char *ifname)
 {
        int magic;
 int wl_probe(const char *ifname)
 {
        int magic;
-
-       if( !wl_ioctl(ifname, WLC_GET_MAGIC, &magic, sizeof(magic)) && (magic == WLC_IOCTL_MAGIC))
-               return 1;
-
-       return 0;
+       return (!wl_ioctl(ifname, WLC_GET_MAGIC, &magic, sizeof(magic)) &&
+                       (magic == WLC_IOCTL_MAGIC));
 }
 
 void wl_close(void)
 }
 
 void wl_close(void)
@@ -72,28 +82,28 @@ void wl_close(void)
        /* Nop */
 }
 
        /* Nop */
 }
 
-int wl_get_mode(const char *ifname, char *buf)
+int wl_get_mode(const char *ifname, int *buf)
 {
        int ret = -1;
        int ap, infra, passive;
 
 {
        int ret = -1;
        int ap, infra, passive;
 
-       if( (ret = wl_ioctl(ifname, WLC_GET_AP, &ap, sizeof(ap))) )
+       if ((ret = wl_ioctl(ifname, WLC_GET_AP, &ap, sizeof(ap))))
                return ret;
 
                return ret;
 
-       if( (ret = wl_ioctl(ifname, WLC_GET_INFRA, &infra, sizeof(infra))) )
+       if ((ret = wl_ioctl(ifname, WLC_GET_INFRA, &infra, sizeof(infra))))
                return ret;
 
                return ret;
 
-       if( (ret = wl_ioctl(ifname, WLC_GET_PASSIVE, &passive, sizeof(passive))) )
+       if ((ret = wl_ioctl(ifname, WLC_GET_PASSIVE, &passive, sizeof(passive))))
                return ret;
 
                return ret;
 
-       if( passive )
-               sprintf(buf, "Monitor");
-       else if( !infra )
-               sprintf(buf, "Ad-Hoc");
-       else if( ap )
-               sprintf(buf, "Master");
+       if (passive)
+               *buf = IWINFO_OPMODE_MONITOR;
+       else if (!infra)
+               *buf = IWINFO_OPMODE_ADHOC;
+       else if (ap)
+               *buf = IWINFO_OPMODE_MASTER;
        else
        else
-               sprintf(buf, "Client");
+               *buf = IWINFO_OPMODE_CLIENT;
 
        return 0;
 }
 
        return 0;
 }
@@ -103,7 +113,7 @@ int wl_get_ssid(const char *ifname, char *buf)
        int ret = -1;
        wlc_ssid_t ssid;
 
        int ret = -1;
        wlc_ssid_t ssid;
 
-       if( !(ret = wl_ioctl(ifname, WLC_GET_SSID, &ssid, sizeof(ssid))) )
+       if (!(ret = wl_ioctl(ifname, WLC_GET_SSID, &ssid, sizeof(ssid))))
                memcpy(buf, ssid.ssid, ssid.ssid_len);
 
        return ret;
                memcpy(buf, ssid.ssid, ssid.ssid_len);
 
        return ret;
@@ -114,7 +124,7 @@ int wl_get_bssid(const char *ifname, char *buf)
        int ret = -1;
        char bssid[6];
 
        int ret = -1;
        char bssid[6];
 
-       if( !(ret = wl_ioctl(ifname, WLC_GET_BSSID, bssid, 6)) )
+       if (!(ret = wl_ioctl(ifname, WLC_GET_BSSID, bssid, 6)))
                sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X",
                        (uint8_t)bssid[0], (uint8_t)bssid[1], (uint8_t)bssid[2],
                        (uint8_t)bssid[3], (uint8_t)bssid[4], (uint8_t)bssid[5]
                sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X",
                        (uint8_t)bssid[0], (uint8_t)bssid[1], (uint8_t)bssid[2],
                        (uint8_t)bssid[3], (uint8_t)bssid[4], (uint8_t)bssid[5]
@@ -163,7 +173,7 @@ int wl_get_signal(const char *ifname, int *buf)
 
        wl_ioctl(ifname, WLC_GET_BSS_INFO, tmp, WLC_IOCTL_MAXLEN);
 
 
        wl_ioctl(ifname, WLC_GET_BSS_INFO, tmp, WLC_IOCTL_MAXLEN);
 
-       if( !wl_ioctl(ifname, WLC_GET_AP, &ap, sizeof(ap)) && !ap )
+       if (!wl_ioctl(ifname, WLC_GET_AP, &ap, sizeof(ap)) && !ap)
        {
                *buf = tmp[WL_BSS_RSSI_OFFSET];
        }
        {
                *buf = tmp[WL_BSS_RSSI_OFFSET];
        }
@@ -172,13 +182,13 @@ int wl_get_signal(const char *ifname, int *buf)
                rssi = rssi_count = 0;
 
                /* Calculate average rssi from conntected stations */
                rssi = rssi_count = 0;
 
                /* Calculate average rssi from conntected stations */
-               if( (macs = wl_read_assoclist(ifname)) != NULL )
+               if ((macs = wl_read_assoclist(ifname)) != NULL)
                {
                {
-                       for( i = 0; i < macs->count; i++ )
+                       for (i = 0; i < macs->count; i++)
                        {
                                memcpy(starssi.mac, &macs->ea[i], 6);
 
                        {
                                memcpy(starssi.mac, &macs->ea[i], 6);
 
-                               if( !wl_ioctl(ifname, WLC_GET_RSSI, &starssi, 12) )
+                               if (!wl_ioctl(ifname, WLC_GET_RSSI, &starssi, 12))
                                {
                                        rssi -= starssi.rssi;
                                        rssi_count++;
                                {
                                        rssi -= starssi.rssi;
                                        rssi_count++;
@@ -259,10 +269,10 @@ int wl_get_encryption(const char *ifname, char *buf)
        switch(wpa)
        {
                case 0:
        switch(wpa)
        {
                case 0:
-                       if( wsec && !wauth )
+                       if (wsec && !wauth)
                                c->auth_algs |= IWINFO_AUTH_OPEN;
 
                                c->auth_algs |= IWINFO_AUTH_OPEN;
 
-                       else if( wsec && wauth )
+                       else if (wsec && wauth)
                                c->auth_algs |= IWINFO_AUTH_SHARED;
 
                        /* ToDo: evaluate WEP key lengths */
                                c->auth_algs |= IWINFO_AUTH_SHARED;
 
                        /* ToDo: evaluate WEP key lengths */
@@ -376,6 +386,26 @@ int wl_get_enctype(const char *ifname, char *buf)
        return 0;
 }
 
        return 0;
 }
 
+static void wl_get_assoclist_cb(const char *ifname,
+                                                           struct iwinfo_assoclist_entry *e)
+{
+       wl_sta_info_t sta = { 0 };
+
+       if (!wl_iovar(ifname, "sta_info", e->mac, 6, &sta, sizeof(sta)) &&
+               (sta.ver >= 2))
+       {
+               e->inactive     = sta.idle * 1000;
+               e->rx_packets   = sta.rx_ucast_pkts;
+               e->tx_packets   = sta.tx_pkts;
+               e->rx_rate.rate = sta.rx_rate;
+               e->tx_rate.rate = sta.tx_rate;
+
+               /* ToDo: 11n */
+               e->rx_rate.mcs = -1;
+               e->tx_rate.mcs = -1;
+       }
+}
+
 int wl_get_assoclist(const char *ifname, char *buf, int *len)
 {
        int i, j, noise;
 int wl_get_assoclist(const char *ifname, char *buf, int *len)
 {
        int i, j, noise;
@@ -394,22 +424,25 @@ int wl_get_assoclist(const char *ifname, char *buf, int *len)
        wl_ioctl(ifname, WLC_GET_INFRA, &infra, sizeof(infra));
        wl_ioctl(ifname, WLC_GET_PASSIVE, &passive, sizeof(passive));
 
        wl_ioctl(ifname, WLC_GET_INFRA, &infra, sizeof(infra));
        wl_ioctl(ifname, WLC_GET_PASSIVE, &passive, sizeof(passive));
 
-       if( wl_get_noise(ifname, &noise) )
+       if (wl_get_noise(ifname, &noise))
                noise = 0;
 
                noise = 0;
 
-       if( (ap || infra || passive) && ((macs = wl_read_assoclist(ifname)) != NULL) )
+       if ((ap || infra || passive) && ((macs = wl_read_assoclist(ifname)) != NULL))
        {
        {
-               for( i = 0, j = 0; i < macs->count; i++, j += sizeof(struct iwinfo_assoclist_entry) )
+               for (i = 0, j = 0; i < macs->count; i++, j += sizeof(struct iwinfo_assoclist_entry))
                {
                {
+                       memset(&entry, 0, sizeof(entry));
                        memcpy(rssi.mac, &macs->ea[i], 6);
 
                        memcpy(rssi.mac, &macs->ea[i], 6);
 
-                       if( !wl_ioctl(ifname, WLC_GET_RSSI, &rssi, sizeof(struct wl_sta_rssi)) )
+                       if (!wl_ioctl(ifname, WLC_GET_RSSI, &rssi, sizeof(struct wl_sta_rssi)))
                                entry.signal = (rssi.rssi - 0x100);
                        else
                                entry.signal = 0;
 
                        entry.noise = noise;
                        memcpy(entry.mac, &macs->ea[i], 6);
                                entry.signal = (rssi.rssi - 0x100);
                        else
                                entry.signal = 0;
 
                        entry.noise = noise;
                        memcpy(entry.mac, &macs->ea[i], 6);
+                       wl_get_assoclist_cb(ifname, &entry);
+
                        memcpy(&buf[j], &entry, sizeof(entry));
                }
 
                        memcpy(&buf[j], &entry, sizeof(entry));
                }
 
@@ -417,13 +450,13 @@ int wl_get_assoclist(const char *ifname, char *buf, int *len)
                free(macs);
                return 0;
        }
                free(macs);
                return 0;
        }
-       else if( (arp = fopen("/proc/net/arp", "r")) != NULL )
+       else if ((arp = fopen("/proc/net/arp", "r")) != NULL)
        {
                j = 0;
 
        {
                j = 0;
 
-               while( fgets(line, sizeof(line), arp) != NULL )
+               while (fgets(line, sizeof(line), arp) != NULL)
                {
                {
-                       if( sscanf(line, "%*s 0x%*d 0x%*d %17s %*s %s", macstr, devstr) && !strcmp(devstr, ifname) )
+                       if (sscanf(line, "%*s 0x%*d 0x%*d %17s %*s %s", macstr, devstr) && !strcmp(devstr, ifname))
                        {
                                rssi.mac[0] = strtol(&macstr[0],  NULL, 16);
                                rssi.mac[1] = strtol(&macstr[3],  NULL, 16);
                        {
                                rssi.mac[0] = strtol(&macstr[0],  NULL, 16);
                                rssi.mac[1] = strtol(&macstr[3],  NULL, 16);
@@ -432,7 +465,7 @@ int wl_get_assoclist(const char *ifname, char *buf, int *len)
                                rssi.mac[4] = strtol(&macstr[12], NULL, 16);
                                rssi.mac[5] = strtol(&macstr[15], NULL, 16);
 
                                rssi.mac[4] = strtol(&macstr[12], NULL, 16);
                                rssi.mac[5] = strtol(&macstr[15], NULL, 16);
 
-                               if( !wl_ioctl(ifname, WLC_GET_RSSI, &rssi, sizeof(struct wl_sta_rssi)) )
+                               if (!wl_ioctl(ifname, WLC_GET_RSSI, &rssi, sizeof(struct wl_sta_rssi)))
                                        entry.signal = (rssi.rssi - 0x100);
                                else
                                        entry.signal = 0;
                                        entry.signal = (rssi.rssi - 0x100);
                                else
                                        entry.signal = 0;
@@ -456,18 +489,18 @@ int wl_get_assoclist(const char *ifname, char *buf, int *len)
 int wl_get_txpwrlist(const char *ifname, char *buf, int *len)
 {
        struct iwinfo_txpwrlist_entry entry;
 int wl_get_txpwrlist(const char *ifname, char *buf, int *len)
 {
        struct iwinfo_txpwrlist_entry entry;
-       uint8_t dbm[8] = { 0, 6, 8, 10, 12, 14, 16, 18 };
-       uint8_t mw[8]  = { 1, 3, 6, 10, 15, 25, 39, 63 };
+       uint8_t dbm[11] = { 0, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24 };
+       uint8_t mw[11]  = { 1, 3, 6, 10, 15, 25, 39, 63, 100, 158, 251 };
        int i;
 
        int i;
 
-       for( i = 0; i < 8; i++ )
+       for (i = 0; i < 11; i++)
        {
                entry.dbm = dbm[i];
                entry.mw  = mw[i];
                memcpy(&buf[i*sizeof(entry)], &entry, sizeof(entry));
        }
 
        {
                entry.dbm = dbm[i];
                entry.mw  = mw[i];
                memcpy(&buf[i*sizeof(entry)], &entry, sizeof(entry));
        }
 
-       *len = 8 * sizeof(entry);
+       *len = 11 * sizeof(entry);
        return 0;
 }
 
        return 0;
 }
 
@@ -485,14 +518,14 @@ int wl_get_country(const char *ifname, char *buf)
 {
        char ccode[WLC_CNTRY_BUF_SZ];
 
 {
        char ccode[WLC_CNTRY_BUF_SZ];
 
-       if( !wl_ioctl(ifname, WLC_GET_COUNTRY, ccode, WLC_CNTRY_BUF_SZ) )
+       if (!wl_ioctl(ifname, WLC_GET_COUNTRY, ccode, WLC_CNTRY_BUF_SZ))
        {
                /* IL0 -> World */
        {
                /* IL0 -> World */
-               if( !strcmp(ccode, "IL0") )
+               if (!strcmp(ccode, "IL0"))
                        sprintf(buf, "00");
 
                /* YU -> RS */
                        sprintf(buf, "00");
 
                /* YU -> RS */
-               else if( !strcmp(ccode, "YU") )
+               else if (!strcmp(ccode, "YU"))
                        sprintf(buf, "RS");
 
                else
                        sprintf(buf, "RS");
 
                else
@@ -513,19 +546,19 @@ int wl_get_countrylist(const char *ifname, char *buf, int *len)
 
        cl->buflen = sizeof(cdata);
 
 
        cl->buflen = sizeof(cdata);
 
-       if( !wl_ioctl(ifname, WLC_GET_COUNTRY_LIST, cl, cl->buflen) )
+       if (!wl_ioctl(ifname, WLC_GET_COUNTRY_LIST, cl, cl->buflen))
        {
        {
-               for( i = 0, count = 0; i < cl->count; i++, c++ )
+               for (i = 0, count = 0; i < cl->count; i++, c++)
                {
                        sprintf(c->ccode, &cl->country_abbrev[i * WLC_CNTRY_BUF_SZ]);
                        c->iso3166 = c->ccode[0] * 256 + c->ccode[1];
 
                        /* IL0 -> World */
                {
                        sprintf(c->ccode, &cl->country_abbrev[i * WLC_CNTRY_BUF_SZ]);
                        c->iso3166 = c->ccode[0] * 256 + c->ccode[1];
 
                        /* IL0 -> World */
-                       if( !strcmp(c->ccode, "IL0") )
+                       if (!strcmp(c->ccode, "IL0"))
                                c->iso3166 = 0x3030;
 
                        /* YU -> RS */
                                c->iso3166 = 0x3030;
 
                        /* YU -> RS */
-                       else if( !strcmp(c->ccode, "YU") )
+                       else if (!strcmp(c->ccode, "YU"))
                                c->iso3166 = 0x5253;
                }
 
                                c->iso3166 = 0x5253;
                }
 
@@ -546,9 +579,9 @@ int wl_get_mbssid_support(const char *ifname, int *buf)
        wlc_rev_info_t revinfo;
 
        /* Multi bssid support only works on corerev >= 9 */
        wlc_rev_info_t revinfo;
 
        /* Multi bssid support only works on corerev >= 9 */
-       if( !wl_ioctl(ifname, WLC_GET_REVINFO, &revinfo, sizeof(revinfo)) )
+       if (!wl_ioctl(ifname, WLC_GET_REVINFO, &revinfo, sizeof(revinfo)))
        {
        {
-               if( revinfo.corerev >= 9 )
+               if (revinfo.corerev >= 9)
                {
                        *buf = 1;
                        return 0;
                {
                        *buf = 1;
                        return 0;
Personal OpenWRT clone
This page took 0.034958 seconds and 4 git commands to generate.