Changeset 10305

Timestamp:

09/11/08 12:24:16 (5 years ago)

Author:

eko

Message:

WDS-WPA: less code, faster

File:

• src/router/services/services/wpa.c (modified) (3 diffs)

src/router/services/services/wpa.c

@@ -47 +47 @@
     };
     char *str = NULL;
-    int retries = 10;
-    char tmp[100], prefix[] = "wlXXXXXXXXXX_";
+    char tmp[100], prefix[] = "wlXXXXXXXXXX_", pidfile[] = "/tmp/nas.wlXXXXXXXlan.pid";
     int unit;
     char remote[ETHER_ADDR_LEN];
@@ -59 +58 @@
     wl_ioctl( ifname, WLC_GET_INSTANCE, &unit, sizeof( unit ) );
     snprintf( prefix, sizeof( prefix ), "wl%d_", unit );
-    if( nvram_match( strcat_r( prefix, "akm", tmp ), "" ) &&
-        nvram_match( strcat_r( prefix, "auth_mode", tmp ), "none" ) )
-        return 0;
-
-    while( retries-- > 0 && !( str = file2str( "/tmp/nas.wl0lan.pid" ) ) )
-        sleep( 1 );
-    if( !str )
+    snprintf( pidfile, sizeof( pidfile ), "/tmp/nas.wl%dlan.pid", unit );
+
+    if( !( str = file2str( pidfile)) ) // no pidfile means no nas was run (required)
     {
         return -1;
@@ -420 +415 @@
                 
             dev = nvram_nget( "wl%d_wds%d_if", c, s );
-            
-                sleep (1); 
+
         start_nas_notify (dev);
         }