Changeset 6332

Timestamp:

10/23/10 02:37:05 (3 years ago)

Author:

jow

Message:

libiwinfo: probe for vap availability in mbssid_support(), fix return type, fix description string for no crypto

Location:

luci/trunk/contrib/package/iwinfo/src

Files:

• iwinfo.lua (modified) (2 diffs)
• iwinfo_lualib.c (modified) (11 diffs)
• iwinfo_nl80211.c (modified) (6 diffs)

luci/trunk/contrib/package/iwinfo/src/iwinfo.lua

@@ -63 +63 @@
 
     printf("          Encryption: %s",
-        s(enc and enc.description))
+        s(enc and enc.description or "None"))
+
+    printf("          Supports VAPs: %s",
+        iw.mbssid_support(dev) and "yes" or "no")
 
     print("")
@@ -86 +89 @@
 
             printf("          Encryption: %s",
-                s(se.encryption.description))
+                s(se.encryption.description or "None"))
 
             print("")

luci/trunk/contrib/package/iwinfo/src/iwinfo_lualib.c

@@ -433 +433 @@
                 }
             }
+            else
+            {
+                sprintf(desc, "None");
+            }
         }
         else
@@ -695 +699 @@
     }
 
-    return 0;
+    lua_pushnil(L);
+    return 1;
 }
 
 /* Wrapper for hwmode list */
-static int iwinfo_L_hwmodelist(lua_State *L, int (*func)(const char*, int *))
+static int iwinfo_L_hwmodelist(lua_State *L, int (*func)(const char *, int *))
 {
     const char *ifname = luaL_checkstring(L, 1);
@@ -723 +728 @@
     }
 
-    return 0;
+    lua_pushnil(L);
+    return 1;
+}
+
+/* Wrapper for mbbsid_support */
+static int iwinfo_L_mbssid_support(lua_State *L, int (*func)(const char *, int *))
+{
+    const char *ifname = luaL_checkstring(L, 1);
+    int support = 0;
+
+    if( !(*func)(ifname, &support) )
+    {
+        lua_pushboolean(L, support);
+        return 1;
+    }
+
+    lua_pushnil(L);
+    return 1;
 }
 
@@ -793 +815 @@
 LUA_WRAP_INT(wl,quality)
 LUA_WRAP_INT(wl,quality_max)
-LUA_WRAP_INT(wl,mbssid_support)
 LUA_WRAP_STRING(wl,mode)
 LUA_WRAP_STRING(wl,ssid)
@@ -805 +826 @@
 LUA_WRAP_LIST(wl,hwmodelist)
 LUA_WRAP_LIST(wl,encryption)
+LUA_WRAP_LIST(wl,mbssid_support)
 #endif
 
@@ -817 +839 @@
 LUA_WRAP_INT(madwifi,quality)
 LUA_WRAP_INT(madwifi,quality_max)
-LUA_WRAP_INT(madwifi,mbssid_support)
 LUA_WRAP_STRING(madwifi,mode)
 LUA_WRAP_STRING(madwifi,ssid)
@@ -829 +850 @@
 LUA_WRAP_LIST(madwifi,hwmodelist)
 LUA_WRAP_LIST(madwifi,encryption)
+LUA_WRAP_LIST(madwifi,mbssid_support)
 #endif
 
@@ -841 +863 @@
 LUA_WRAP_INT(nl80211,quality)
 LUA_WRAP_INT(nl80211,quality_max)
-LUA_WRAP_INT(nl80211,mbssid_support)
 LUA_WRAP_STRING(nl80211,mode)
 LUA_WRAP_STRING(nl80211,ssid)
@@ -853 +874 @@
 LUA_WRAP_LIST(nl80211,hwmodelist)
 LUA_WRAP_LIST(nl80211,encryption)
+LUA_WRAP_LIST(nl80211,mbssid_support)
 #endif
 
@@ -864 +886 @@
 LUA_WRAP_INT(wext,quality)
 LUA_WRAP_INT(wext,quality_max)
-LUA_WRAP_INT(wext,mbssid_support)
 LUA_WRAP_STRING(wext,mode)
 LUA_WRAP_STRING(wext,ssid)
@@ -876 +897 @@
 LUA_WRAP_LIST(wext,hwmodelist)
 LUA_WRAP_LIST(wext,encryption)
+LUA_WRAP_LIST(wext,mbssid_support)
 
 #ifdef USE_WL

luci/trunk/contrib/package/iwinfo/src/iwinfo_nl80211.c

@@ -160 +160 @@
         goto err;
 
-    if( !strncmp(ifname, "radio", 5) )
+    if( !strncmp(ifname, "phy", 3) )
+        phyidx = atoi(&ifname[3]);
+    else if( !strncmp(ifname, "radio", 5) )
         phyidx = atoi(&ifname[5]);
     else if( !strncmp(ifname, "mon.", 4) )
@@ -415 +417 @@
 static char * nl80211_phy2ifname(const char *ifname)
 {
-    int fd, phyidx = 0;
+    int fd, phyidx = -1;
     char buffer[64];
     static char nif[IFNAMSIZ] = { 0 };
@@ -422 +424 @@
     struct dirent *e;
 
-    if( !strncmp(ifname, "radio", 5) )
-    {
+    if( !strncmp(ifname, "phy", 3) )
+        phyidx = atoi(&ifname[3]);
+    else if( !strncmp(ifname, "radio", 5) )
         phyidx = atoi(&ifname[5]);
 
+    if( phyidx > -1 )
+    {
         if( (d = opendir("/sys/class/net")) != NULL )
         {
@@ -547 +552 @@
     int fd, pid = 0;
     char buf[32];
-    char *phy = strncmp(ifname, "phy", 3) ? nl80211_ifname2phy(ifname) : ifname;
+    char *phy = nl80211_ifname2phy(ifname);
 
     if( phy )
@@ -1509 +1514 @@
                     caps = nla_get_u16(bands[NL80211_BAND_ATTR_HT_CAPA]);
 
-                /* Treat HT20/HT40 as 11n */
-                if( caps & (1 << 1) )
+                /* Treat any nonzero capability as 11n */
+                if( caps > 0 )
                     *buf |= IWINFO_80211_N;
 
@@ -1543 +1548 @@
 int nl80211_get_mbssid_support(const char *ifname, int *buf)
 {
-    /* We assume that multi bssid is always possible */
-    *buf = 1;
-    return 0;
-}
+    /* test whether we can create another interface */
+    char *nif = nl80211_ifadd(ifname);
+
+    if( nif )
+    {
+        *buf = (nl80211_ifmac(nif) && nl80211_ifup(nif));
+
+        nl80211_ifdown(nif);
+        nl80211_ifdel(nif);
+
+        return 0;
+    }
+
+    return -1;
+}