Changeset 712

Timestamp:

06/01/06 04:34:21 (7 years ago)

Author:

mglb1

Message:

• Retrieve DNS server IPs from the DSL modem and give them to pdnsd
• Check pdnsd status at regular intervals to ensure we always have valid DNS information

File:

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

ccsd/private/modules/ccs_monitor_rurallink.py

@@ -67 +67 @@
 DSL_NETMASK = "8"
 DSL_TELNET_TIMEOUT = 2
+
+# How often (seconds) to check DNS settings
+DNS_UPDATE_INTERVAL = 60
 
 ISP_IF_DISCONNECT = """<a href="/rladmin/isp-disconnect">[Disconnect]</a>"""
@@ -2016 +2019 @@
     return "<i>No username configured</i>"
     
+def getDSLNameservers():
+    """Retrieves the ISP allocated nameservers"""
+    dns1 = None
+    dns2 = None
+    conn = None
+    try:
+        conn = DSLLogin()
+    except:
+        pass
+    if conn is None:
+        return None, None
+
+    # Ask for the DHCP server configuration details
+    conn.write("get dhcp server cfg\n")
+    
+    # Wait for the prompt
+    r = conn.read_until("$", DSL_TELNET_TIMEOUT)
+    conn.close()
+                
+    # Extract DHCP server addresses
+    lines = r.strip().split("\n")
+    for line in lines:
+        if line.strip().startswith("Def Pri"):
+            try:
+                parts = line.split(":")
+                dns1 = parts[1].split()[0].strip()
+                dns2 = parts[2].strip()
+            except:
+                log_error("Could not parse DNS servers from DSL modem!")
+                log_debug(line.strip())
+            break
+    if dns1 == "0.0.0.0": dns1 = None
+    if dns2 == "0.0.0.0": dns2 = None
+
+    # Return them
+    return dns1, dns2
+
 def connectDSL():
     """Tells the modem to connect"""
@@ -2379 +2419 @@
         raise ccs_rurallink_error("Unknown ISP type passed to ISPDisconnect!")
 
+@registerRecurring(DNS_UPDATE_INTERVAL)
+def updateDNS():
+    """Checks that pdnsd has appropriate name servers configured"""
+    global rl_isptype, rl_masterip
+    
+    if isMasterNode():
+        if rl_isptype == ISP_DSL:
+            # Check if pdnsd has any servers
+            fh = os.popen("/usr/sbin/pdnsd-ctl status | grep ip: | " \
+                "grep -v ping")
+            lines = fh.readlines()
+            rv = fh.close()
+            if rv is not None or len(lines)==0:
+                # It doesn't, get some
+                ns1, ns2 = getDSLNameservers()
+                if ns1 is not None:
+                    log_command("/usr/sbin/pdnsd-ctl server pppdns1 up %s " \
+                        "2>&1" % ns1)
+                    log_info("Set NS1 to %s" % ns1)
+                if ns2 is not None:
+                    log_command("/usr/sbin/pdnsd-ctl server pppdns2 up %s " \
+                        "2>&1" % ns2)
+                    log_info("Set NS2 to %s" % ns2)
+        # Use localhost as our nameserver
+        ns = "127.0.0.1"
+    else:
+        ns = rl_masterip
+
+    # Check that resolv.conf is correct
+    fp = open("/etc/resolv.conf", "r")
+    lines = fp.readlines()
+    fp.close()
+    
+    update = False
+    for line in lines:
+        parts = line.split()
+        if line.startswith("search"):
+            if parts[1].strip() != "rurallink.co.nz":
+                update=True
+                break
+        elif line.startswith("nameserver"):
+            if parts[1].strip() != ns:
+                update=True
+                break
+    if update:
+        try:
+            remountrw("updateDNS")
+            fp = open("/etc/resolv.conf", "w")
+            fp.write("search rurallink.co.nz\n")
+            fp.write("nameserver %s\n" % ns)
+            fp.close()
+            remountro("updateDNS")
+        except:
+            log_error("Could not write resolv.conf!", sys.exc_info())
+            remountro("updateDNS")
+ 
 ##############################################################################
 # Initialisation
@@ -2497 +2593 @@
         httpd = AsyncHTTPServer(('', 81), CaptivePortalHandler)
         log_info("Captive Portal Initialised. Traffic management in place.")
+    
+    # Make sure DNS is correctly setup
+    updateDNS()
 
 @catchEvent("statusMapRequested")