X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6f50f87ade33d60f05939a38de1ae0f4117b414b..cd019e4b226fc51bfb11d113072dda3ba6013b13:/lib/python/Components/Network.py

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index cb2727cb..b5b8e201 100644
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -109,19 +109,19 @@ 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")				
+			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")				
 		fp.close()
 		self.writeNameserverConfig()
 
@@ -294,20 +294,10 @@ class Network:
 		self.getInterfaces()	
 
 	def checkNetworkState(self):
-		ok_counter = 0
-		ret1=system("ping -c 1 www.dream-multimedia-tv.de")
-		if ret1 != 0:
-			ok_counter = ok_counter + 1
-		ret2=system("ping -c 1 www.heise.de")
-		if ret2 != 0:
-			ok_counter = ok_counter + 1
-		ret3=system("ping -c 1 www.google.de")
-		if ret2 != 0:
-			ok_counter = ok_counter + 1		
-		if ok_counter <= 2:
-			return True
-		else:
-			return False
+		 # 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()
@@ -334,26 +324,15 @@ class Network:
 				return True
 			else:
 				return False
-		
+
 	def checkDNSLookup(self):
-		ok_counter = 0
-		ret1=system("nslookup www.dream-multimedia-tv.de")
-		if ret1 != 0:
-			ok_counter = ok_counter + 1
-		ret2=system("nslookup www.heise.de")
-		if ret2 != 0:
-			ok_counter = ok_counter + 1
-		ret3=system("nslookup www.google.de")
-		if ret2 != 0:
-			ok_counter = ok_counter + 1		
-		if ok_counter <= 2:
-			return True
-		else:
-			return False
-		
+		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):
 		system("ifconfig " + iface + " down")
-		
+
 	def detectWlanModule(self):
 		self.wlanmodule = None
 		rt73_dir = "/sys/bus/usb/drivers/rt73/"