Changeset 717

Timestamp:

06/01/06 16:00:00 (7 years ago)

Author:

mglb1

Message:

• Improve robustness of routing setup
  • Centralise route addition/removal
  • Check routes periodically

File:

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

ccsd/private/modules/ccs_monitor_rurallink.py

@@ -70 +70 @@
 # How often (seconds) to check DNS settings
 DNS_UPDATE_INTERVAL = 60
+
+# How often (seconds) to check routing
+ROUTE_CHECK_INTERVAL = 60
 
 ISP_IF_DISCONNECT = """<a href="/rladmin/isp-disconnect">[Disconnect]</a>"""
@@ -384 +387 @@
     found = False
     for route in routes:
-        if route["network"] == formatIP(network) and \
+        if network=="default" and route["network"]== "0.0.0.0" and \
+                route["netmask"] == "0.0.0.0":
+            found = True
+            break
+        elif route["network"] == formatIP(network) and \
                 route["netmask"]==formatIP(bitsToNetmask(mask)):
             found = True
             break
     if not found:
-        cidr = "%s/%s" % (formatIP(network), mask)
+        if network != "default":
+            cidr = "%s/%s" % (formatIP(network), mask)
+        else:
+            cidr = network
         rv = log_command("/sbin/ip route add %s via %s dev %s 2>&1" % \
                 (cidr, dest, dev))
@@ -399 +409 @@
 def delRoute(network, mask, dest, dev):
     """Removes a route from the route table"""
-    cidr = "%s/%s" % (formatIP(network), mask)
+    if network != "default":
+        cidr = "%s/%s" % (formatIP(network), mask)
+    else:
+        cidr = network
     rv = log_command("/sbin/ip route del %s via %s dev %s 2>&1" % \
             (cidr, dest, dev))
@@ -2305 +2318 @@
     pref_set("rurallink", "isptype", rl_isptype, monitor_prefs)
 
-    if rl_isptype == ISP_DSL:
-        # Add DSL alias IP
-        log_command("/sbin/ip addr add %s/%s dev %s 2>&1" % \
-            (DSL_CPE_IP, DSL_NETMASK, int_ifname))
-        log_command("/sbin/ip route add default via %s dev %s 2>&1" % \
-            (DSL_MODEM_IP, int_ifname))
-    else:
-        # Remove DSL alias IP
-        log_command("/sbin/ip addr del %s/%s dev %s &>/dev/null" % \
-            (DSL_CLE_IP, DSL_NETMASK, if_ifname))
-        log_command("/sbin/ip route del default via %s dev %s &>/dev/null" % \
-            (DSL_MODEM_IP, int_ifname))
+    # Setup routes
+    initialiseISPRoutes()
 
 def updateISP(username, password):
@@ -2418 +2421 @@
     else:
         raise ccs_rurallink_error("Unknown ISP type passed to ISPDisconnect!")
+
+def initialiseISPRoutes():
+    global rl_isptype, int_ifname
+    
+    if rl_isptype == ISP_DSL:
+        # Add DSL alias IP
+        log_command("/sbin/ip addr add %s/%s dev %s &>/dev/null" % \
+                (DSL_CPE_IP, DSL_NETMASK, int_ifname))
+        addRoute("default", 0, DSL_MODEM_IP, int_ifname)
+    else:
+        # Remove DSL alias IP
+        log_command("/sbin/ip addr del %s/%s dev %s &>/dev/null" % \
+                (DSL_CPE_IP, DSL_NETMASK, int_ifname))
+        delRoute("default", 0, DSL_MODEM_IP, int_ifname)
+
+@registerRecurring(ROUTE_CHECK_INTERVAL)
+def checkRoutes():
+    """Checks that the routing is setup correctly"""
+
+    if isMasterNode():
+        initialiseISPRoutes()
+    initialiseClientRoutes()
 
 @registerRecurring(DNS_UPDATE_INTERVAL)
@@ -2555 +2580 @@
         # Retrieve the ISP we're connecting to
         rl_isptype = pref_get("rurallink", "isptype", monitor_prefs, ISP_BCL)
-        if rl_isptype == ISP_DSL:
-            # Add DSL alias IP
-            log_command("/sbin/ip addr add %s/%s dev %s 2>&1" % \
-                (DSL_CPE_IP, DSL_NETMASK, int_ifname))
-            log_command("/sbin/ip route add default via %s dev %s 2>&1" % \
-                (DSL_MODEM_IP, int_ifname))
-        else:
-            # Remove DSL alias IP
-            log_command("/sbin/ip addr del %s/%s dev %s &>/dev/null" % \
-                (DSL_CPE_IP, DSL_NETMASK, int_ifname))
-            log_command("/sbin/ip route del default via %s dev %s " \
-                "&>/dev/null" % (DSL_MODEM_IP, int_ifname))
+        initialiseISPRoutes()
         
         # Initialise the status map