Changeset 5304

Timestamp:

08/24/09 06:54:38 (4 years ago)

Author:

jow

Message:

libs/iwinfo: implement wifi scans

Location:

luci/trunk/libs/iwinfo

Files:

• Makefile (modified) (1 diff)
• src/iwinfo.h (modified) (1 diff)
• src/iwinfo_lualib.c (modified) (7 diffs)
• src/iwinfo_lualib.h (modified) (1 diff)
• src/iwinfo_madwifi.c (modified) (1 diff)
• src/iwinfo_madwifi.h (modified) (1 diff)
• src/iwinfo_wext.c (modified) (2 diffs)
• src/iwinfo_wext.h (modified) (2 diffs)
• src/iwinfo_wext_scan.c (added)
• src/iwinfo_wext_scan.h (added)
• src/iwinfo_wl.c (modified) (1 diff)
• src/iwinfo_wl.h (modified) (1 diff)

luci/trunk/libs/iwinfo/Makefile

@@ -11 +11 @@
 IWINFO_SO         = iwinfo.so
 IWINFO_LUA        = iwinfo.lua
-IWINFO_OBJ        = src/iwinfo_wl.o src/iwinfo_madwifi.o src/iwinfo_wext.o src/iwinfo_lualib.o
+IWINFO_OBJ        = src/iwinfo_wl.o src/iwinfo_madwifi.o \
+    src/iwinfo_wext.o src/iwinfo_wext_scan.o src/iwinfo_lualib.o
 
 %.o: %.c

luci/trunk/libs/iwinfo/src/iwinfo.h

@@ -35 +35 @@
 };
 
+struct iwinfo_crypto_entry {
+    uint8_t enabled;
+    uint8_t wpa_version;
+    uint8_t group_ciphers[8];
+    uint8_t pair_ciphers[8];
+    uint8_t auth_suites[8];
+};
+
+struct iwinfo_scanlist_entry {
+    uint8_t mac[6];
+    uint8_t ssid[IW_ESSID_MAX_SIZE+1];
+    uint8_t mode[8];
+    uint8_t channel;
+    struct iwinfo_crypto_entry crypto;
+};
+
 #endif
 

luci/trunk/libs/iwinfo/src/iwinfo_lualib.c

@@ -108 +108 @@
 }
 
+/* Wrapper for scan list */
+static int iwinfo_L_scanlist(lua_State *L, int (*func)(const char *, char *, int *))
+{
+    int i, j, x, y, len;
+    char rv[IWINFO_BUFSIZE];
+    char macstr[18];
+    const char *ifname = luaL_checkstring(L, 1);
+    struct iwinfo_scanlist_entry *e;
+
+    lua_newtable(L);
+    memset(rv, 0, sizeof(rv));
+
+    if( !(*func)(ifname, rv, &len) )
+    {
+        for( i = 0, x = 1; i < len; i += sizeof(struct iwinfo_scanlist_entry), x++ )
+        {
+            e = (struct iwinfo_scanlist_entry *) &rv[i];
+
+            lua_newtable(L);
+
+            /* BSSID */
+            sprintf(macstr, "%02X:%02X:%02X:%02X:%02X:%02X",
+                e->mac[0], e->mac[1], e->mac[2],
+                e->mac[3], e->mac[4], e->mac[5]);
+
+            lua_pushstring(L, macstr);
+            lua_setfield(L, -2, "mac");
+
+            /* ESSID */
+            if( e->ssid[0] )
+            {
+                lua_pushstring(L, (char *) e->ssid);
+                lua_setfield(L, -2, "ssid");
+            }
+
+            /* Channel */
+            lua_pushinteger(L, e->channel);
+            lua_setfield(L, -2, "channel");
+
+            /* Mode */
+            lua_pushstring(L, (char *) e->mode);
+            lua_setfield(L, -2, "mode");
+
+            /* Crypto */
+            lua_pushinteger(L, e->crypto.wpa_version);
+            lua_setfield(L, -2, "wpa_version");
+
+            lua_newtable(L);
+            for( j = 0, y = 1; j < sizeof(e->crypto.group_ciphers); j++ )
+            {
+                if( e->crypto.group_ciphers[j] )
+                {
+                    lua_pushstring(L, (j < IW_IE_CYPHER_NUM)
+                        ? iw_ie_cypher_name[j] : "Proprietary");
+
+                    lua_rawseti(L, -2, y++);
+                }
+            }
+            lua_setfield(L, -2, "group_ciphers");
+
+            lua_newtable(L);
+            for( j = 0, y = 1; j < sizeof(e->crypto.pair_ciphers); j++ )
+            {
+                if( e->crypto.pair_ciphers[j] )
+                {
+                    lua_pushstring(L, (j < IW_IE_CYPHER_NUM)
+                        ? iw_ie_cypher_name[j] : "Proprietary");
+
+                    lua_rawseti(L, -2, y++);
+                }
+            }
+            lua_setfield(L, -2, "pair_ciphers");
+
+            lua_newtable(L);
+            for( j = 0, y = 1; j < sizeof(e->crypto.auth_suites); j++ )
+            {
+                if( e->crypto.auth_suites[j] )
+                {
+                    lua_pushstring(L, (j < IW_IE_KEY_MGMT_NUM)
+                        ? iw_ie_key_mgmt_name[j] : "Proprietary");
+
+                    lua_rawseti(L, -2, y++);
+                }
+            }
+            lua_setfield(L, -2, "auth_suites");
+
+            lua_rawseti(L, -2, x);
+        }
+    }
+
+    return 1;
+}
+
+
 /* Broadcom */
 LUA_WRAP_INT(wl,channel)
@@ -123 +217 @@
 LUA_WRAP_LIST(wl,assoclist)
 LUA_WRAP_LIST(wl,txpwrlist)
+LUA_WRAP_LIST(wl,scanlist)
 
 /* Madwifi */
@@ -139 +234 @@
 LUA_WRAP_LIST(madwifi,assoclist)
 LUA_WRAP_LIST(madwifi,txpwrlist)
+LUA_WRAP_LIST(madwifi,scanlist)
 
 /* Wext */
@@ -155 +251 @@
 LUA_WRAP_LIST(wext,assoclist)
 LUA_WRAP_LIST(wext,txpwrlist)
+LUA_WRAP_LIST(wext,scanlist)
 
 /* Broadcom table */
@@ -171 +268 @@
     LUA_REG(wl,assoclist),
     LUA_REG(wl,txpwrlist),
+    LUA_REG(wl,scanlist),
     LUA_REG(wl,mbssid_support),
     { NULL, NULL }
@@ -190 +288 @@
     LUA_REG(madwifi,assoclist),
     LUA_REG(madwifi,txpwrlist),
+    LUA_REG(madwifi,scanlist),
     LUA_REG(madwifi,mbssid_support),
     { NULL, NULL }
@@ -209 +308 @@
     LUA_REG(wext,assoclist),
     LUA_REG(wext,txpwrlist),
+    LUA_REG(wext,scanlist),
     LUA_REG(wext,mbssid_support),
     { NULL, NULL }

luci/trunk/libs/iwinfo/src/iwinfo_lualib.h

@@ -25 +25 @@
 
 #include "iwinfo.h"
+#include "iwinfo_wext_scan.h"
 
 

luci/trunk/libs/iwinfo/src/iwinfo_madwifi.c

@@ -404 +404 @@
 }
 
+int madwifi_get_scanlist(const char *ifname, char *buf, int *len)
+{
+    return wext_get_scanlist(ifname, buf, len);
+}
+
 int madwifi_get_mbssid_support(const char *ifname, int *buf)
 {

luci/trunk/libs/iwinfo/src/iwinfo_madwifi.h

@@ -37 +37 @@
 int madwifi_get_assoclist(const char *ifname, char *buf, int *len);
 int madwifi_get_txpwrlist(const char *ifname, char *buf, int *len);
+int madwifi_get_scanlist(const char *ifname, char *buf, int *len);
 int madwifi_get_mbssid_support(const char *ifname, int *buf);
 

luci/trunk/libs/iwinfo/src/iwinfo_wext.c

@@ -190 +190 @@
     if(wext_ioctl(ifname, SIOCGIWRATE, &wrq) >= 0)
     {
-        *buf = wrq.u.bitrate.value;
+        *buf = (wrq.u.bitrate.value / 1000000);
         return 0;
     }
@@ -200 +200 @@
 {
     struct iwreq wrq;
+    struct iw_range range;
+    double freq;
+    int i;
 
     if(wext_ioctl(ifname, SIOCGIWFREQ, &wrq) >= 0)
     {
-        /* FIXME: iwlib has some strange workarounds here, maybe we need them as well... */
-        *buf = (int) wext_freq2float(&wrq.u.freq);
-        return 0;
+        if( wrq.u.freq.m >= 1000 )
+        {
+            freq = wext_freq2float(&wrq.u.freq);
+            wrq.u.data.pointer = (caddr_t) ⦥
+            wrq.u.data.length  = sizeof(struct iw_range);
+            wrq.u.data.flags   = 0;
+
+            if(wext_ioctl(ifname, SIOCGIWRANGE, &wrq) >= 0)
+            {
+                for(i = 0; i < range.num_frequency; i++)
+                {
+                    if( wext_freq2float(&range.freq[i]) == freq )
+                    {
+                        *buf = range.freq[i].i;
+                        return 0;
+                    }
+                }
+            }
+        }
+        else
+        {
+            *buf = wrq.u.freq.m;
+            return 0;
+        }
     }
 

luci/trunk/libs/iwinfo/src/iwinfo_wext.h

@@ -23 +23 @@
 #include "include/wext.h"
 
+
 int wext_probe(const char *ifname);
 int wext_get_mode(const char *ifname, char *buf);
@@ -37 +38 @@
 int wext_get_assoclist(const char *ifname, char *buf, int *len);
 int wext_get_txpwrlist(const char *ifname, char *buf, int *len);
+int wext_get_scanlist(const char *ifname, char *buf, int *len);
 int wext_get_mbssid_support(const char *ifname, int *buf);
 

luci/trunk/libs/iwinfo/src/iwinfo_wl.c

@@ -385 +385 @@
 }
 
+int wl_get_scanlist(const char *ifname, char *buf, int *len)
+{
+    return wext_get_scanlist(ifname, buf, len);
+}
+
 int wl_get_mbssid_support(const char *ifname, int *buf)
 {

luci/trunk/libs/iwinfo/src/iwinfo_wl.h

@@ -37 +37 @@
 int wl_get_assoclist(const char *ifname, char *buf, int *len);
 int wl_get_txpwrlist(const char *ifname, char *buf, int *len);
+int wl_get_scanlist(const char *ifname, char *buf, int *len);
 int wl_get_mbssid_support(const char *ifname, int *buf);