Changeset 5305

Timestamp:

08/24/09 14:31:20 (4 years ago)

Author:

jow

Message:

libs/iwinfo: fixes for wpa/wep detection in wifi scan

Location:

luci/trunk/libs/iwinfo/src

Files:

• iwinfo.h (modified) (1 diff)
• iwinfo_lualib.c (modified) (4 diffs)
• iwinfo_wext_scan.c (modified) (7 diffs)

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

@@ -38 +38 @@
     uint8_t enabled;
     uint8_t wpa_version;
-    uint8_t group_ciphers[8];
-    uint8_t pair_ciphers[8];
-    uint8_t auth_suites[8];
+    uint8_t group_ciphers;
+    uint8_t pair_ciphers;
+    uint8_t auth_suites;
 };
 

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

@@ -134 +134 @@
 
             lua_pushstring(L, macstr);
-            lua_setfield(L, -2, "mac");
+            lua_setfield(L, -2, "bssid");
 
             /* ESSID */
@@ -153 +153 @@
             /* 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++ )
+            lua_setfield(L, -2, "wpa");
+
+            lua_pushboolean(L, (!e->crypto.wpa_version && e->crypto.enabled));
+            lua_setfield(L, -2, "wep");
+
+            lua_newtable(L);
+            for( j = 0, y = 1; j < 8; j++ )
             {
-                if( e->crypto.group_ciphers[j] )
+                if( e->crypto.group_ciphers & (1<<j) )
                 {
                     lua_pushstring(L, (j < IW_IE_CYPHER_NUM)
@@ -169 +172 @@
 
             lua_newtable(L);
-            for( j = 0, y = 1; j < sizeof(e->crypto.pair_ciphers); j++ )
+            for( j = 0, y = 1; j < 8; j++ )
             {
-                if( e->crypto.pair_ciphers[j] )
+                if( e->crypto.pair_ciphers & (1<<j) )
                 {
                     lua_pushstring(L, (j < IW_IE_CYPHER_NUM)
@@ -182 +185 @@
 
             lua_newtable(L);
-            for( j = 0, y = 1; j < sizeof(e->crypto.auth_suites); j++ )
+            for( j = 0, y = 1; j < 8; j++ )
             {
-                if( e->crypto.auth_suites[j] )
+                if( e->crypto.auth_suites & (1<<j) )
                 {
                     lua_pushstring(L, (j < IW_IE_KEY_MGMT_NUM)

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

@@ -285 +285 @@
     if(ielen < (offset + 4))
     {
-        ce->group_ciphers[2] = 1; /* TKIP */
+        ce->group_ciphers |= (1<<2); /* TKIP */
+        ce->pair_ciphers  |= (1<<2); /* TKIP */
+        ce->auth_suites   |= (1<<2); /* PSK */
         return;
     }
 
     if(memcmp(&iebuf[offset], wpa_oui, 3) != 0)
-        ce->group_ciphers[7] = 1; /* Proprietary */
+        ce->group_ciphers |= (1<<7); /* Proprietary */
     else
-        ce->group_ciphers[iebuf[offset+3]] = 1;
+        ce->group_ciphers |= (1<<iebuf[offset+3]);
 
     offset += 4;
@@ -298 +300 @@
     if(ielen < (offset + 2))
     {
-        ce->pair_ciphers[2] = 1; /* TKIP */
+        ce->pair_ciphers |= (1<<2); /* TKIP */
+        ce->auth_suites  |= (1<<2); /* PSK */
         return;
     }
@@ -313 +316 @@
     {
         if(memcmp(&iebuf[offset], wpa_oui, 3) != 0)
-            ce->pair_ciphers[7] = 1; /* Proprietary */
+            ce->pair_ciphers |= (1<<7); /* Proprietary */
         else if(iebuf[offset+3] <= IW_IE_CYPHER_NUM)
-            ce->pair_ciphers[iebuf[offset+3]] = 1;
+            ce->pair_ciphers |= (1<<iebuf[offset+3]);
         //else
         //  ce->pair_ciphers[ce->pair_cipher_num++] = 255; /* Unknown */
@@ -337 +340 @@
     {
         if(memcmp(&iebuf[offset], wpa_oui, 3) != 0)
-            ce->auth_suites[7] = 1; /* Proprietary */
+            ce->auth_suites |= (1<<7); /* Proprietary */
         else if(iebuf[offset+3] <= IW_IE_KEY_MGMT_NUM)
-            ce->auth_suites[iebuf[offset+3]] = 1;
+            ce->auth_suites |= (1<<iebuf[offset+3]);
         //else
         //  ce->auth_suites[ce->auth_suite_num++] = 255; /* Unknown */
@@ -468 +471 @@
     int timeout = 15000000;     /* 15s */
 
-    int _len = 0;
+    int entrylen = 0;
     struct iwinfo_scanlist_entry e;
 
@@ -611 +614 @@
                                 first = 0;
                             }
-                            else if( (_len + sizeof(struct iwinfo_scanlist_entry)) <= IWINFO_BUFSIZE )
+                            else if( (entrylen + sizeof(struct iwinfo_scanlist_entry)) <= IWINFO_BUFSIZE )
                             {
-                                memcpy(&buf[_len], &e, sizeof(struct iwinfo_scanlist_entry));
-                                _len += sizeof(struct iwinfo_scanlist_entry);
+                                memcpy(&buf[entrylen], &e, sizeof(struct iwinfo_scanlist_entry));
+                                entrylen += sizeof(struct iwinfo_scanlist_entry);
                             }
                             else
@@ -631 +634 @@
 
                 free(buffer);
-                *len = _len;
+                *len = entrylen;
                 return 0;
             }