Networksetup update

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

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index b5b8e20113a164c02d8366ebd91c256168e8a4c8..c28710b7b129ddb3479c2c60d50f2584c3fe9327 100644 (file)
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -6,7 +6,7 @@ from enigma import eConsoleAppContainer
 class Network:
        def __init__(self):
                self.ifaces = {}
-               self.configuredInterfaces = {}
+               self.configuredInterfaces = []
                self.nameservers = []
                self.getInterfaces()
                self.ethtool_bin = "/usr/sbin/ethtool"
@@ -14,7 +14,7 @@ class Network:
 
        def getInterfaces(self):
                devicesPattern = re_compile('[a-z]+[0-9]+')
-
+               self.configuredInterfaces = []
                fp = file('/proc/net/dev', 'r')
                result = fp.readlines()
                fp.close()
@@ -30,7 +30,7 @@ class Network:
                        except AttributeError:
                                pass
 
-               print "self.ifaces:", self.ifaces
+               #print "self.ifaces:", self.ifaces
                self.loadNetworkConfig()
                #self.writeNetworkConfig()
                #print ord(' ')
@@ -63,11 +63,11 @@ class Network:
                ipPattern = re_compile(ipRegexp)
                upPattern = re_compile('UP ')
                macPattern = re_compile('[0-9]{2}\:[0-9]{2}\:[0-9]{2}\:[0-9]{2}\:[0-9]{2}\:[0-9]{2}')
-               
+
                fp = popen("ifconfig " + iface)
                result = fp.readlines()
                fp.close()
-               data = { 'up': False, 'dhcp': False }
+               data = { 'up': False, 'dhcp': False, 'preup' : False, 'postdown' : False }
                for line in result:
                        ip = self.regExpMatch(ipPattern, self.regExpMatch(ipLinePattern, line))
                        netmask = self.regExpMatch(ipPattern, self.regExpMatch(netmaskLinePattern, line))
@@ -82,6 +82,8 @@ class Network:
                                data['bcast'] = self.convertIP(bcast)
                        if up is not None:
                                data['up'] = True
+                               if iface is not 'lo':
+                                       self.configuredInterfaces.append(iface)
                        if mac is not None:
                                data['mac'] = mac
                if not data.has_key('ip'):
@@ -102,6 +104,7 @@ class Network:
                return data
 
        def writeNetworkConfig(self):
+               self.configuredInterfaces = []
                fp = file('/etc/network/interfaces', 'w')
                fp.write("# automatically generated by enigma 2\n# do NOT change manually!\n\n")
                fp.write("auto lo\n")
@@ -109,6 +112,7 @@ class Network:
                for ifacename, iface in self.ifaces.items():
                        if iface['up'] == True:
                                fp.write("auto " + ifacename + "\n")
+                               self.configuredInterfaces.append(ifacename)
                        if iface['dhcp'] == True:
                                fp.write("iface "+ ifacename +" inet dhcp\n")
                        if iface['dhcp'] == False:
@@ -121,6 +125,9 @@ class Network:
                                                fp.write("      gateway %d.%d.%d.%d\n" % tuple(iface['gateway']))
                        if iface.has_key("configStrings"):
                                fp.write("\n" + iface["configStrings"] + "\n")
+                       if iface["preup"] is not False and not iface.has_key("configStrings"):
+                               fp.write(iface["preup"])
+                               fp.write(iface["postdown"])
                        fp.write("\n")                          
                fp.close()
                self.writeNameserverConfig()
@@ -156,17 +163,28 @@ class Network:
                        if (currif != ""):
                                if (split[0] == "address"):
                                        ifaces[currif]["address"] = map(int, split[1].split('.'))
+                                       if self.ifaces[currif].has_key("ip"):
+                                               if self.ifaces[currif]["ip"] != ifaces[currif]["address"] and ifaces[currif]["dhcp"] == False:
+                                                       self.ifaces[currif]["ip"] = map(int, split[1].split('.'))
                                if (split[0] == "netmask"):
                                        ifaces[currif]["netmask"] = map(int, split[1].split('.'))
+                                       if self.ifaces[currif].has_key("netmask"):
+                                               if self.ifaces[currif]["netmask"] != ifaces[currif]["netmask"] and ifaces[currif]["dhcp"] == False:
+                                                       self.ifaces[currif]["netmask"] = map(int, split[1].split('.'))
                                if (split[0] == "gateway"):
                                        ifaces[currif]["gateway"] = map(int, split[1].split('.'))
-               
-               self.configuredInterfaces = ifaces
+                                       if self.ifaces[currif].has_key("gateway"):
+                                               if self.ifaces[currif]["gateway"] != ifaces[currif]["gateway"] and ifaces[currif]["dhcp"] == False:
+                                                       self.ifaces[currif]["gateway"] = map(int, split[1].split('.'))                                  
+                               if (split[0] == "pre-up"):
+                                       self.ifaces[currif]["preup"] = i
+                               if (split[0] == "post-down"):
+                                       self.ifaces[currif]["postdown"] = i
+
                print "read interfaces:", ifaces
                for ifacename, iface in ifaces.items():
                        if self.ifaces.has_key(ifacename):
                                self.ifaces[ifacename]["dhcp"] = iface["dhcp"]
-
                print "self.ifaces after loading:", self.ifaces
 
        def loadNameserverConfig(self):
@@ -342,13 +360,13 @@ class Network:
                        files = listdir(madwifi_dir)
                        if len(files) >= 1:
                                self.wlanmodule = 'madwifi'
-               elif os_path.exists(rt73_dir):
-                       files = listdir(rt73_dir)
-                       if len(files) >= 1:
+               if os_path.exists(rt73_dir):
+                       rtfiles = listdir(rt73_dir)
+                       if len(rtfiles) == 2:
                                self.wlanmodule = 'ralink'
-               elif os_path.exists(zd1211b_dir):
-                       files = listdir(zd1211b_dir)
-                       if len(files) != 0:
+               if os_path.exists(zd1211b_dir):
+                       zdfiles = listdir(zd1211b_dir)
+                       if len(zdfiles) == 1:
                                self.wlanmodule = 'zydas'
                return self.wlanmodule