Changeset 15475

Timestamp:

10/19/10 16:01:40 (3 years ago)

Author:

eko

Message:

cleanup fix

File:

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

src/router/services/services/wpa.c

@@ -548 +548 @@
                             || !strcmp(auth_mode, "64")
                             || !strcmp(auth_mode, "66")) {
+                                if (nvram_nmatch("0", "%s_bridged", iface)) {
                                         char *argv[] = { "nas", "-P", pidfile,
                                                 "-H", "34954", "-i",
-                                                nvram_nmatch("0", "%s_bridged", iface) ? iface : getBridge(iface), mode,
+                                                iface, mode,
                                                 "-m",
                                                 auth_mode, "-r", key,
@@ -565 +566 @@
                                         };
                                         _evalpid(argv, NULL, 0, &pid);
+                                } else {
+                                        char *argv[] = { "nas", "-P", pidfile,
+                                                "-H", "34954", "-l",
+                                                getBridge(iface), "-i",
+                                                iface, mode, "-m",
+                                                auth_mode, "-r", key,
+                                                "-s",
+                                                nvram_safe_get(ssid),
+                                                "-w",
+                                                sec_mode, "-g",
+                                                nvram_safe_get(rekey), "-h",
+                                                nvram_safe_get(radius), "-p", nvram_safe_get(port),     // "-t", 
+                                                // //radius 
+                                                // rekey 
+                                                // time
+                                                NULL
+                                        };
+                                        _evalpid(argv, NULL, 0, &pid);
+                                }
                         } else if (!strcmp(auth_mode, "32")) {
                                 int idx = atoi(nvram_safe_get(index));
@@ -570 +590 @@
 
                                 sprintf(wepkey, "%s_key%d", prefix, idx);
+                                if (nvram_nmatch("0", "%s_bridged", iface)) {
                                         char *argv[] = { "nas", "-P", pidfile,
                                                 "-H", "34954", "-i",
-                                                nvram_nmatch("0", "%s_bridged", iface) ? iface : getBridge(iface), mode,
+                                                iface, mode,
                                                 "-m",
                                                 auth_mode, "-r", key,
@@ -589 +610 @@
                                         };
                                         _evalpid(argv, NULL, 0, &pid);
-
+                                } else {
+                                        char *argv[] = { "nas", "-P", pidfile,
+                                                "-H", "34954", "-l",
+                                                getBridge(iface), "-i",
+                                                iface, mode, "-m",
+                                                auth_mode, "-r", key,
+                                                "-s",
+                                                nvram_safe_get(ssid),
+                                                "-w",
+                                                sec_mode, "-I",
+                                                nvram_safe_get(index), "-k",
+                                                nvram_safe_get(wepkey),
+                                                "-h",
+                                                nvram_safe_get(radius), "-p", nvram_safe_get(port),     // "-t", 
+                                                // //radius 
+                                                // rekey 
+                                                // time
+                                                NULL
+                                        };
+
+                                        _evalpid(argv, NULL, 0, &pid);
+
+                                }
                         } else {
                                         char *argv[] = { "nas", "-P", pidfile,
                                                 "-H", "34954", "-i",
-                                                nvram_nmatch("0", "%s_bridged", iface) ? iface : getBridge(iface), mode,
+                                                iface, mode,
                                                 "-m",
                                                 auth_mode, "-k", key,
@@ -604 +647 @@
                                         };
                                         _evalpid(argv, NULL, 0, &pid);
+                                } else {
+                                        char *argv[] = { "nas", "-P", pidfile,
+                                                "-H", "34954", "-l",
+                                                getBridge(iface), "-i",
+                                                iface, mode, "-m",
+                                                auth_mode, "-k", key,
+                                                "-s",
+                                                nvram_safe_get(ssid),
+                                                "-w",
+                                                sec_mode, "-g",
+                                                nvram_safe_get(rekey),
+                                                NULL
+                                        };
+                                        _evalpid(argv, NULL, 0, &pid);
+                                }
                         }