moving the list generation to a seperate method

[enigma2.git] / lib / python / Components / Network.py

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 85d0a3a2cea9f5182b48c4d106a4bfbe741f4630..c38c44c66cfb611217fb48e7fe529e926a515729 100644 (file)
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -12,7 +12,7 @@ class Network:
                # fixme using interfaces.tmp instead of interfaces for now
                fp = file('/etc/network/interfaces', 'w')
                fp.write("auto eth0\n")
-               if (config.network.dhcp.value == "yes"):
+               if (config.network.dhcp.value == _("yes")):
                        fp.write("iface eth0 inet dhcp\n")
                else:
                        fp.write("iface eth0 inet static\n")
@@ -26,6 +26,8 @@ class Network:
                        # parse the interfaces-file
                        fp = file('/etc/network/interfaces', 'r')
                        interfaces = fp.readlines()
+                       fp.close()
+                       
                        ifaces = {}
                        currif = ""
                        for i in interfaces:
@@ -43,8 +45,24 @@ class Network:
                                        if (split[0] == "netmask"):
                                                ifaces[currif]["netmask"] = map(int, split[1].split('.'))
                                        if (split[0] == "gateway"):
-                                               ifaces[currif]["gateway"] = map(int, split[1].split('.'))                                                                               
+                                               ifaces[currif]["gateway"] = map(int, split[1].split('.'))                                                                       
                        
+                       # parse the resolv.conf-file
+                       fp = file('/etc/network/interfaces', 'r')
+                       resolv = fp.readlines()
+                       fp.close()
+               except:
+                       pass
+                       
+               try:
+                       for i in resolv:
+                               split = i.strip().split(' ')
+                               if (split[0] == "nameserver"):
+                                       config.network.nameserver.value = map(int, split[1].split('.'))
+               except:
+                       pass
+               
+               try:
                        # set this config
                        if (ifaces.has_key("eth0")):
                                if (ifaces["eth0"]["dhcp"] == "yes"):
@@ -54,13 +72,13 @@ class Network:
                                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"]
-                       fp.close()
                except:
                        pass
 
        def activateNetworkConfig(self):
                import os
                os.system("/etc/init.d/networking restart")
+               config.network.ip.value = self.getCurrentIP()
                
        def setDHCP(self, useDHCP):
                if (useDHCP):
@@ -101,19 +119,28 @@ class Network:
                #os.system("echo ifconfig eth0 netmask %d.%d.%d.%d" % tuple(ip))                
                #self.writeNetworkConfig()              
 
+       def getCurrentIP(self):
+               ip = [0, 0, 0, 0]
+               try:
+                       print gethostbyname(gethostname())
+                       ip = gethostbyname(gethostname()).split('.')
+               except:
+                       print "[Network.py] Could not get current ip (not necessarily an error)"
+               return ip
 
 iNetwork = Network()
 
 def InitNetwork():
-       ip = map (int, gethostbyname(gethostname()).split('.'))
+       ip = iNetwork.getCurrentIP()
+
                
        config.network = ConfigSubsection()
-       config.network.dhcp = configElement_nonSave("config.network.dhcp", configSelection, 1, ("no", "yes"))
-       config.network.ip = configElement_nonSave("config.network.ip", configSequence, ip, (("."), (1,255)))
-       config.network.netmask = configElement_nonSave("config.network.netmask", configSequence, [255,255,255,0], (("."), (1,255)))
-       config.network.gateway = configElement_nonSave("config.network.gateway", configSequence, [192,168,1,3], (("."), (1,255)))
-       config.network.dns = configElement_nonSave("config.network.dns", configSequence, [192,168,1,3], (("."), (1,255)))
-       config.network.mac = configElement_nonSave("config.network.mac", configSequence, [00,11,22,33,44,55], ((":"), (1,255)))
+       config.network.dhcp = configElement_nonSave("config.network.dhcp", configSelection, 1, (_("no"), _("yes")))
+       config.network.ip = configElement_nonSave("config.network.ip", configSequence, ip, configsequencearg.get("IP"))
+       config.network.netmask = configElement_nonSave("config.network.netmask", configSequence, [255,255,255,0], configsequencearg.get("IP"))
+       config.network.gateway = configElement_nonSave("config.network.gateway", configSequence, [192,168,1,3], configsequencearg.get("IP"))
+       config.network.dns = configElement_nonSave("config.network.dns", configSequence, [192,168,1,3], configsequencearg.get("IP"))
+       config.network.mac = configElement_nonSave("config.network.mac", configSequence, [00,11,22,33,44,55], configsequencearg.get("MAC"))
 
        iNetwork.loadNetworkConfig()