X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9f2a341b5affc52089e2f7429672df2e93b97a29..deaf3139671ce0aa53a741b2fece9fbe3fd98c4e:/lib/python/Components/Network.py

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 17a505ef..79ec1ed6 100644
--- 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,19 +112,23 @@ class Network:
 		for ifacename, iface in self.ifaces.items():
 			if iface['up'] == True:
 				fp.write("auto " + ifacename + "\n")
-				if iface['dhcp'] == True:
-					fp.write("iface "+ ifacename +" inet dhcp\n")
-				if iface['dhcp'] == False:
-					fp.write("iface "+ ifacename +" inet static\n")
-					if iface.has_key('ip'):
-						print tuple(iface['ip'])
-						fp.write("	address %d.%d.%d.%d\n" % tuple(iface['ip']))
-						fp.write("	netmask %d.%d.%d.%d\n" % tuple(iface['netmask']))
-						if iface.has_key('gateway'):
-							fp.write("	gateway %d.%d.%d.%d\n" % tuple(iface['gateway']))
-				if iface.has_key("configStrings"):
-					fp.write("\n" + iface["configStrings"] + "\n")
-				fp.write("\n")				
+				self.configuredInterfaces.append(ifacename)
+			if iface['dhcp'] == True:
+				fp.write("iface "+ ifacename +" inet dhcp\n")
+			if iface['dhcp'] == False:
+				fp.write("iface "+ ifacename +" inet static\n")
+				if iface.has_key('ip'):
+					print tuple(iface['ip'])
+					fp.write("	address %d.%d.%d.%d\n" % tuple(iface['ip']))
+					fp.write("	netmask %d.%d.%d.%d\n" % tuple(iface['netmask']))
+					if iface.has_key('gateway'):
+						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()
 
@@ -160,13 +167,15 @@ class Network:
 					ifaces[currif]["netmask"] = map(int, split[1].split('.'))
 				if (split[0] == "gateway"):
 					ifaces[currif]["gateway"] = map(int, split[1].split('.'))
-		
-		self.configuredInterfaces = ifaces
+				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):
@@ -294,9 +303,10 @@ class Network:
 		self.getInterfaces()	
 
 	def checkNetworkState(self):
-		return system("ping -c 1 82.149.226.170") == 0 or # www.dream-multimedia-tv.de
-			system("ping -c 1 193.99.144.85") == 0 or # www.heise.de
-			system("ping -c 1 209.85.135.103") == 0 # www.google.de
+		 # www.dream-multimedia-tv.de, www.heise.de, www.google.de
+		return system("ping -c 1 82.149.226.170") == 0 or \
+			system("ping -c 1 193.99.144.85") == 0 or \
+			system("ping -c 1 209.85.135.103") == 0
 
 	def restartNetwork(self):
 		iNetwork.deactivateNetworkConfig()
@@ -325,8 +335,8 @@ class Network:
 				return False
 
 	def checkDNSLookup(self):
-		return system("nslookup www.dream-multimedia-tv.de") == 0 or
-			system("nslookup www.heise.de") == 0 or
+		return system("nslookup www.dream-multimedia-tv.de") == 0 or \
+			system("nslookup www.heise.de") == 0 or \
 			system("nslookup www.google.de")
 
 	def deactivateInterface(self,iface):
@@ -341,13 +351,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