add scrollbars ondemand

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

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index cd82081b774b8c741f01c84f5e8a0dea16327791..7d6c5e17e5104118f3e784b5a7898520939b4307 100644 (file)
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -11,14 +11,19 @@ class Network:
                # 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', '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 (currentConfigSelectionElement(config.network.dhcp) == "yes"):
                        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):
@@ -48,19 +53,19 @@ class Network:
                                                ifaces[currif]["gateway"] = map(int, split[1].split('.'))                                                                       
                        
                        # parse the resolv.conf-file
-                       fp = file('/etc/network/interfaces', 'r')
+                       fp = file('/etc/resolv.conf', 'r')
                        resolv = fp.readlines()
                        fp.close()
                except:
-                       pass
+                       print "[Network.py] loading network files failed"
                        
                try:
                        for i in resolv:
                                split = i.strip().split(' ')
                                if (split[0] == "nameserver"):
-                                       config.network.nameserver.value = map(int, split[1].split('.'))
+                                       config.network.dns.value = map(int, split[1].split('.'))
                except:
-                       pass
+                       print "[Network.py] resolv.conf parsing failed"
                
                try:
                        # set this config
@@ -73,11 +78,12 @@ class Network:
                                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:
-                       pass
+                       print "[Network.py] parsing network failed"
 
        def activateNetworkConfig(self):
                import os
                os.system("/etc/init.d/networking restart")
+               config.network.ip.value = self.getCurrentIP()
                
        def setDHCP(self, useDHCP):
                if (useDHCP):
@@ -118,25 +124,30 @@ class Network:
                #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():
-       try:
-               ip = [0, 0, 0, 0]
-               print gethostbyname(gethostname())
-               ip = gethostbyname(gethostname()).split('.')
-               print ip
-       except:
-               print "[Network.py] Could not get current ip (not necessarily an error)"
+       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", _("no")), ("yes", _("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()