Changeset 716

Timestamp:

06/01/06 15:41:15 (7 years ago)

Author:

mglb1

Message:

• Rearrange startup process to speed things up when starting the wizard
• Ensure that traffic policy data is always set in the preferences file for the firewall to read
• Load the firewall in the background so that it doesn't slow things down

File:

• ccsd/private/modules/ccs_monitor_rurallink.py (modified) (8 diffs)

ccsd/private/modules/ccs_monitor_rurallink.py

@@ -733 +733 @@
     # Restart DHCP and Reload Firewall 
     log_command("/etc/init.d/dhcp3-server restart 2>&1")
-    log_command("/etc/init.d/firewall start 2>&1")
+    log_command("/etc/init.d/firewall start & 2>&1")
     
     return True
@@ -782 +782 @@
     # Restart DHCP and Reload Firewall 
     log_command("/etc/init.d/dhcp3-server restart 2>&1")
-    log_command("/etc/init.d/firewall start 2>&1")
+    log_command("/etc/init.d/firewall start & 2>&1")
     
     return True
@@ -844 +844 @@
     # Restart DHCP and Reload Firewall 
     log_command("/etc/init.d/dhcp3-server restart 2>&1")
-    log_command("/etc/init.d/firewall start 2>&1")
+    log_command("/etc/init.d/firewall start & 2>&1")
 
     return True
@@ -2536 +2536 @@
         # Reload interfaces to pick up any new configuration
         log_command("/etc/init.d/networking restart 2>&1")
-        
-        # Reload the firewall
-        log_command("/etc/init.d/firewall start 2>&1")
-        
-        # Check services are running
-        checkDHCPServer()
-        
-        # Initialise routes for the clients
-        initialiseClientRoutes()
     
     # Check if we know the master device to talk to
@@ -2561 +2552 @@
         # Master node can get its own IP when it needs it...
         rl_masterip = None
+        
         # Retrieve the ISP we're connecting to
         rl_isptype = pref_get("rurallink", "isptype", monitor_prefs, ISP_BCL)
@@ -2591 +2583 @@
             rl_trafficusers = {}
             return
-    
+        
+        # Ensure that default traffic management policies are set in the
+        # preferences file for the firewall to use
+        ap0_policy = pref_get("traffic", "ap0_policy", monitor_prefs, None)
+        int_policy = pref_get("traffic", "internal_policy", monitor_prefs, \
+                None)
+        if ap0_policy is None:
+            ap0_policy = DEFAULT_AP0_POLICY
+            pref_set("traffic", "ap0_policy", ap0_policy, monitor_prefs)
+        if int_policy is None:
+            int_policy = DEFAULT_INTERNAL_POLICY
+            pref_set("traffic", "internal_policy", int_policy, monitor_prefs)
+
         # Initialise the counters
         for username,user in rl_trafficusers.items():
@@ -2600 +2604 @@
         httpd = AsyncHTTPServer(('', 81), CaptivePortalHandler)
         log_info("Captive Portal Initialised. Traffic management in place.")
-    
+     
+    # Reload the firewall
+    log_command("/etc/init.d/firewall start & 2>&1")
+
     # Make sure DNS is correctly setup
     updateDNS()
+    
+    if rl_wizardrun:
+        # Check services are running
+        checkDHCPServer()
+        
+        # Initialise routes for the clients
+        initialiseClientRoutes()
 
 @catchEvent("statusMapRequested")
@@ -3004 +3018 @@
             
             # Reload the firewall
-            log_command("/etc/init.d/firewall start 2>&1")
+            log_command("/etc/init.d/firewall start & 2>&1")
             
             # Check services are running