add support for umlauts

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

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index c38c44c66cfb611217fb48e7fe529e926a515729..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')
                # 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")
                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))
                        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):
                fp.close()
 
        def loadNetworkConfig(self):


@@ -48,19 +53,19 @@ class Network:
                                                ifaces[currif]["gateway"] = map(int, split[1].split('.'))                                                                       
                        
                        # parse the resolv.conf-file
                                                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:
                        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"):
                        
                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:
                except:

-                       pass
+                       print "[Network.py] resolv.conf parsing failed"

                
                try:
                        # set this config
                
                try:
                        # set this config


@@ -73,7 +78,7 @@ 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:
                                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
 
        def activateNetworkConfig(self):
                import os


@@ -120,12 +125,14 @@ class Network:
                #self.writeNetworkConfig()              
 
        def getCurrentIP(self):
                #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)"
+               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()
                return ip
 
 iNetwork = Network()


@@ -135,7 +142,7 @@ def InitNetwork():
 
                
        config.network = ConfigSubsection()
 
                
        config.network = ConfigSubsection()

-       config.network.dhcp = configElement_nonSave("config.network.dhcp", configSelection, 1, (_("no"), _("yes")))
+       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.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"))