workaround for not working /etc/init.d/network script

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

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 85d0a3a2cea9f5182b48c4d106a4bfbe741f4630..5add0c01913aa0560a268514c68fa1f9bf129d17 100644 (file)
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -1,4 +1,4 @@
-from config import *
+from config import config, ConfigYesNo, ConfigIP, NoSave, ConfigSubsection, ConfigMAC
 
 import os
 from socket import *
@@ -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 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):
@@ -26,6 +31,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 +50,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/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"):
@@ -54,13 +77,21 @@ 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
+                       print "[Network.py] parsing network failed"
+
+       def deactivateNetworkConfig(self):
+               import os
+               os.system("ip addr flush eth0")
+               os.system("/etc/init.d/networking stop")
+               os.system("killall -9 udhcpc")
+               os.system("rm /var/run/udhcpc*")
 
        def activateNetworkConfig(self):
                import os
-               os.system("/etc/init.d/networking restart")
+               os.system("/etc/init.d/networking start")
+               config.network.ip.value = self.getCurrentIP()
+               config.network.ip.save()
                
        def setDHCP(self, useDHCP):
                if (useDHCP):
@@ -101,27 +132,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():
-       ip = map (int, gethostbyname(gethostname()).split('.'))
-               
        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 = NoSave(ConfigYesNo(default=True))
+       config.network.ip = NoSave(ConfigIP(default=iNetwork.getCurrentIP()))
+       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()
        
-       #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"))
-       #config.network.activate = configElement("config.network.activate", configSelection, 0, ("yes", "you are my hero"))
-
-
        def writeNetworkConfig(configElement):
                iNetwork.writeNetworkConfig()