Changeset 734

Timestamp:

06/15/06 14:54:11 (7 years ago)

Author:

mglb1

Message:

Fixes related to backhaul configuration via the Wizard

• Create/Bring? up the backhaul interface on startup so we can scan
• Fix javascript to only resubmit Step 4 if there is at least one upstream node to connect to

Location:

ccsd/private

Files:

• modules/ccs_monitor_rurallink.py (modified) (1 diff)
• resources/rurallink.js (modified) (2 diffs)

ccsd/private/modules/ccs_monitor_rurallink.py

@@ -2568 +2568 @@
         checkDHCPServer()
         ap0_ifname = t
+        # Make sure the backhaul interface is up so we can scan
+        if log_command("/sbin/ip link set up dev %s 2>&1" % \
+                backhaul_ifname) != None:
+            if backhaul_vbase is not None:
+                log_command("/usr/bin/wlanconfig %s create nounit " \
+                        "wlandev %s wlanmode sta &>/dev/null"  % \
+                        (backhaul_ifname, backhaul_vbase))
+                log_command("/sbin/ip link set up dev %s 2>&1" % \
+                        backhaul_ifname)
+
     else:
         # Reload interfaces to pick up any new configuration

ccsd/private/resources/rurallink.js

@@ -103 +103 @@
         canProgress = false;
     } else if (wizardStep == 4) {
-        obj = $("wizard_essid");
-        if (obj) {
-            /* There are network objects */
-            canProgress = false;
-            return;
-        }
+        canProgress = false;
         obj = $("wizard_ispusername");
         if (obj) {
             id = obj.id;
-            canProgress = false;
         }
-        
     } else if (wizardStep == 5) {
         pars= "wizard_complete=yes"
@@ -137 +130 @@
         wizardPasswordUpdated(null);
     } else if (wizardStep == 4) {
-        if ($("wizard_essid")) {
+        if (!$("wizard_isptype")) {
             // Client node
-            wizardESSIDUpdated(null);
+            if ($("wizard_essid"))
+                wizardESSIDUpdated(null);
         } else {
             // Master node