Changeset 6289

Timestamp:

10/12/10 07:43:46 (3 years ago)

Author:

jow

Message:

libiwinfo: reuse existing temporary interface for scanning

Files:

• luci/trunk/contrib/package/iwinfo/src/iwinfo_nl80211.c (modified) (2 diffs)

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

@@ -1139 +1139 @@
 int nl80211_get_scanlist(const char *ifname, char *buf, int *len)
 {
-    int freq, rssi, qmax, count;
+    int freq, rssi, qmax, count, is_tmp = 0;
     char *res;
     char cmd[256];
@@ -1246 +1246 @@
         if( (res = nl80211_ifname2phy(ifname)) != NULL )
         {
-            /*
-             * This is a big ugly hack, just look away.
-             */
-
-            sprintf(cmd, "ifconfig %s down 2>/dev/null", ifname);
-            if( WEXITSTATUS(system(cmd)) )
-                goto out;
-
-            sprintf(cmd, "iw phy %s interface add scan.%s "
-                "type station 2>/dev/null", res, ifname);
-            if( WEXITSTATUS(system(cmd)) )
-                goto out;
-
-            sprintf(cmd, "ifconfig scan.%s up 2>/dev/null", ifname);
-            if( WEXITSTATUS(system(cmd)) )
-                goto out;
-
-            sprintf(cmd, "scan.%s", ifname);
-            wext_get_scanlist(cmd, buf, len);
-
-    out:
-            sprintf(cmd, "ifconfig scan.%s down 2>/dev/null", ifname);
-            (void) WEXITSTATUS(system(cmd));
-
-            sprintf(cmd, "iw dev scan.%s del 2>/dev/null", ifname);
-            (void) WEXITSTATUS(system(cmd));
-
-            sprintf(cmd, "ifconfig %s up 2>/dev/null", ifname);
-            (void) WEXITSTATUS(system(cmd));
-
-            sprintf(cmd, "killall -HUP hostapd 2>/dev/null");
-            (void) WEXITSTATUS(system(cmd));
-
-            return 0;
+            /* Got a temp interface, don't create yet another one */
+            if( !strncmp(ifname, "tmp.", 4) )
+            {
+                sprintf(cmd, "ifconfig %s up 2>/dev/null", ifname);
+                if( WEXITSTATUS(system(cmd)) )
+                    return -1;
+
+                wext_get_scanlist(ifname, buf, len);
+
+                sprintf(cmd, "ifconfig %s down 2>/dev/null", ifname);
+                (void) WEXITSTATUS(system(cmd));
+
+                return 0;
+            }
+
+            /* Spawn a new scan interface */
+            else
+            {
+                sprintf(cmd, "ifconfig %s down 2>/dev/null", ifname);
+                if( WEXITSTATUS(system(cmd)) )
+                    goto out;
+
+                sprintf(cmd, "iw phy %s interface add scan.%s "
+                    "type station 2>/dev/null", res, ifname);
+                if( WEXITSTATUS(system(cmd)) )
+                    goto out;
+
+                sprintf(cmd, "ifconfig scan.%s up 2>/dev/null", ifname);
+                if( WEXITSTATUS(system(cmd)) )
+                    goto out;
+
+                sprintf(cmd, "scan.%s", ifname);
+                wext_get_scanlist(cmd, buf, len);
+
+            out:
+                sprintf(cmd, "ifconfig scan.%s down 2>/dev/null", ifname);
+                (void) WEXITSTATUS(system(cmd));
+
+                sprintf(cmd, "iw dev scan.%s del 2>/dev/null", ifname);
+                (void) WEXITSTATUS(system(cmd));
+
+                sprintf(cmd, "ifconfig %s up 2>/dev/null", ifname);
+                (void) WEXITSTATUS(system(cmd));
+
+                sprintf(cmd, "killall -HUP hostapd 2>/dev/null");
+                (void) WEXITSTATUS(system(cmd));
+
+                return 0;
+            }
         }
     }