config rewrite. some extensions still need to be updated.
[enigma2.git] / lib / python / Components / Network.py
index cc6ed26a455c0f136ae67eb3590c1cbba2ab058d..7513901f87a0ea933a4b6b37a3cf94f21fd17c80 100644 (file)
@@ -1,6 +1,7 @@
-from config import *
+from config import config, ConfigYesNo, ConfigIP, NoSave, ConfigSubsection, ConfigMAC
 
 import os
+from socket import *
 
 class Network:
        def __init__(self):
@@ -9,20 +10,81 @@ class Network:
        def writeNetworkConfig(self):
                # fixme restarting and updating the network too often. possible fix: check current config and execute only if changed :/
                # fixme using interfaces.tmp instead of interfaces for now
-               fp = file('/etc/network/interfaces.tmp', 'w')
+               fp = file('/etc/network/interfaces', 'w')
+               fp.write("auto lo\n")
+               fp.write("iface lo inet loopback\n\n")
                fp.write("auto eth0\n")
-               if (config.network.dhcp.value == "yes"):
+               if config.network.dhcp.value:
                        fp.write("iface eth0 inet dhcp\n")
                else:
                        fp.write("iface eth0 inet static\n")
                        fp.write("      address %d.%d.%d.%d\n" % tuple(config.network.ip.value))
                        fp.write("      netmask %d.%d.%d.%d\n" % tuple(config.network.netmask.value))
                        fp.write("      gateway %d.%d.%d.%d\n" % tuple(config.network.gateway.value))
+                       fp2 = file('/etc/resolv.conf', 'w')
+                       fp2.write("nameserver %d.%d.%d.%d\n" % tuple(config.network.dns.value))
+                       fp2.close()
                fp.close()
 
+       def loadNetworkConfig(self):
+               try:
+                       # parse the interfaces-file
+                       fp = file('/etc/network/interfaces', 'r')
+                       interfaces = fp.readlines()
+                       fp.close()
+                       
+                       ifaces = {}
+                       currif = ""
+                       for i in interfaces:
+                               split = i.strip().split(' ')
+                               if (split[0] == "iface"):
+                                       currif = split[1]
+                                       ifaces[currif] = {}
+                                       if (len(split) == 4 and split[3] == "dhcp"):
+                                               ifaces[currif]["dhcp"] = "yes"
+                                       else:
+                                               ifaces[currif]["dhcp"] = "no"
+                               if (currif != ""):
+                                       if (split[0] == "address"):
+                                               ifaces[currif]["address"] = map(int, split[1].split('.'))
+                                       if (split[0] == "netmask"):
+                                               ifaces[currif]["netmask"] = map(int, split[1].split('.'))
+                                       if (split[0] == "gateway"):
+                                               ifaces[currif]["gateway"] = map(int, split[1].split('.'))                                                                       
+                       
+                       # parse the resolv.conf-file
+                       fp = file('/etc/resolv.conf', 'r')
+                       resolv = fp.readlines()
+                       fp.close()
+               except:
+                       print "[Network.py] loading network files failed"
+                       
+               try:
+                       for i in resolv:
+                               split = i.strip().split(' ')
+                               if (split[0] == "nameserver"):
+                                       config.network.dns.value = map(int, split[1].split('.'))
+               except:
+                       print "[Network.py] resolv.conf parsing failed"
+               
+               try:
+                       # set this config
+                       if (ifaces.has_key("eth0")):
+                               if (ifaces["eth0"]["dhcp"] == "yes"):
+                                       config.network.dhcp.value = 1
+                               else:
+                                       config.network.dhcp.value = 0
+                               if (ifaces["eth0"].has_key("address")): config.network.ip.value = ifaces["eth0"]["address"]
+                               if (ifaces["eth0"].has_key("netmask")): config.network.netmask.value = ifaces["eth0"]["netmask"]
+                               if (ifaces["eth0"].has_key("gateway")): config.network.gateway.value = ifaces["eth0"]["gateway"]
+               except:
+                       print "[Network.py] parsing network failed"
+
        def activateNetworkConfig(self):
                import os
                os.system("/etc/init.d/networking restart")
+               config.network.ip.value = self.getCurrentIP()
+               config.network.ip.save()
                
        def setDHCP(self, useDHCP):
                if (useDHCP):
@@ -39,39 +101,56 @@ class Network:
                        config.network.dns.enabled = True
                                        
        def setIPNameserver(self, ip):
+               return
                resolvconf = file('/etc/resolv.conf', 'w')
                resolvconf.write("nameserver %d.%d.%d.%d" % tuple(ip))
                resolvconf.close()
                
        def setMACAddress(self, mac):
-               os.system("echo ifconfig eth0 ether %02x:%02x:%02x:%02x:%02x:%02x" % tuple(mac))
+               #os.system("echo ifconfig eth0 ether %02x:%02x:%02x:%02x:%02x:%02x" % tuple(mac))
+               pass
                
        def setIPAddress(self, ip):
-               os.system("echo ifconfig eth0 %d.%d.%d.%d" % tuple(ip))
-               self.writeNetworkConfig()
+               pass
+               #os.system("echo ifconfig eth0 %d.%d.%d.%d" % tuple(ip))
+               #self.writeNetworkConfig()
 
        def setGateway(self, ip):
-               os.system("echo route add default gw %d.%d.%d.%d" % tuple(ip))
-               self.writeNetworkConfig()
+               pass
+               #os.system("echo route add default gw %d.%d.%d.%d" % tuple(ip))
+               #self.writeNetworkConfig()
                
        def setNetmask(self, ip):
-               os.system("echo ifconfig eth0 netmask %d.%d.%d.%d" % tuple(ip))         
-               self.writeNetworkConfig()               
+               pass
+               #os.system("echo ifconfig eth0 netmask %d.%d.%d.%d" % tuple(ip))                
+               #self.writeNetworkConfig()              
+
+       def getCurrentIP(self):
+               ipstr = [0,0,0,0]
+               for x in os.popen("ifconfig eth0 | grep 'inet addr:'", "r").readline().split(' '):
+                       if x.split(':')[0] == "addr":
+                               ipstr = x.split(':')[1].split('.')
+               ip = []
+               for x in ipstr:
+                       ip.append(int(x))
+               print "[Network.py] got ip " + str(ip)
+               return ip
+
+iNetwork = Network()
 
 def InitNetwork():
-       config.network = ConfigSubsection()
-       config.network.dhcp = configElement("config.network.dhcp", configSelection, 0, ("no", "yes"))
-       config.network.ip = configElement("config.network.ip", configSequence, [192,168,1,45], (("."), (1,255)))
-       config.network.netmask = configElement("config.network.netmask", configSequence, [255,255,255,0], (("."), (1,255)))
-       config.network.gateway = configElement("config.network.gateway", configSequence, [192,168,1,3], (("."), (1,255)))
-       config.network.dns = configElement("config.network.dns", configSequence, [192,168,1,3], (("."), (1,255)))
-       config.network.mac = configElement("config.network.mac", configSequence, [00,11,22,33,44,55], ((":"), (1,255)))
-       
-       #FIXME using this till other concept for this is implemented
-       config.network.activate = configElement("config.network.activate", configSelection, 0, ("yes, sir", "you are my hero"))
+       ip = iNetwork.getCurrentIP()
 
-       iNetwork = Network()
+       config.network = ConfigSubsection()
+       config.network.dhcp = NoSave(ConfigYesNo(default=True))
+       config.network.ip = NoSave(ConfigIP(default=[0,0,0,0]))
+       config.network.netmask = NoSave(ConfigIP(default=[255,255,255,0]))
+       config.network.gateway = NoSave(ConfigIP(default=[192,168,1,3]))
+       config.network.dns = NoSave(ConfigIP(default=[192,168,1,3]))
+       config.network.mac = NoSave(ConfigMAC(default=[00,11,22,33,44,55]))
 
+       iNetwork.loadNetworkConfig()
+       
        def writeNetworkConfig(configElement):
                iNetwork.writeNetworkConfig()
                
@@ -93,9 +172,6 @@ def InitNetwork():
        def setMACAddress(configElement):
                iNetwork.setMACAddress(configElement.value)
 
-       def activateNetworkConfig(configElement):
-               iNetwork.activateNetworkConfig()
-
 
        # this will call the "setup-val" initial
        config.network.dhcp.addNotifier(setDHCP)
@@ -104,4 +180,3 @@ def InitNetwork():
        config.network.gateway.addNotifier(setGateway)
        config.network.dns.addNotifier(setIPNameserver)
        config.network.mac.addNotifier(setMACAddress)
-       config.network.activate.addNotifier(activateNetworkConfig)
\ No newline at end of file