fix more very stupid bugs... someone must have had too much drinks while writing...

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

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index e3077d0039f45723a44ec3df0e363c86e49b8fe0..365e15f08ae24c203017f6d53da4bb384bbfc78e 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 == 1):
                        fp.write("iface eth0 inet dhcp\n")
                else:
                        fp.write("iface eth0 inet static\n")
@@ -21,6 +21,12 @@ class Network:
                        fp.write("      gateway %d.%d.%d.%d\n" % tuple(config.network.gateway.value))
                fp.close()
 
+               if config.network.dhcp.value == 0:
+                       fp = file('/etc/resolv.conf', 'w')
+                       fp.write("nameserver %d.%d.%d.%d\n" % tuple(config.network.dns.value))
+                       fp.close()              
+
+
        def loadNetworkConfig(self):
                try:
                        # parse the interfaces-file
@@ -48,7 +54,7 @@ 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:
@@ -78,6 +84,7 @@ class Network:
        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,17 +125,22 @@ 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")))