X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7cc28be2015e4ebb56d585c9cee2949138e4d67e..4aec730b6eb5eaac23a7eab69678ce13bd45a0a3:/lib/python/Components/Network.py

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index f65d6090..29491cb0 100755
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -24,6 +24,7 @@ class Network:
 		self.activateConsole = Console()
 		self.resetNetworkConsole = Console()
 		self.DnsConsole = Console()
+		self.PingConsole = Console()
 		self.config_ready = None
 		self.getInterfaces()
 
@@ -233,7 +234,7 @@ class Network:
 				self.configuredNetworkAdapters = self.configuredInterfaces
 				# load ns only once	
 				self.loadNameserverConfig()
-				print "read configured interfac:", ifaces
+				print "read configured interface:", ifaces
 				print "self.ifaces after loading:", self.ifaces
 				self.config_ready = True
 				self.msgPlugins()
@@ -424,6 +425,7 @@ class Network:
 
 	def checkNetworkState(self,statecallback):
 		# www.dream-multimedia-tv.de, www.heise.de, www.google.de
+		self.NetworkState = 0
 		cmd1 = "ping -c 1 82.149.226.170"
 		cmd2 = "ping -c 1 193.99.144.85"
 		cmd3 = "ping -c 1 209.85.135.103"
@@ -475,10 +477,17 @@ class Network:
 
 	def getLinkStateFinished(self, result, retval,extra_args):
 		(callback) = extra_args
+
 		if self.LinkConsole is not None:
 			if len(self.LinkConsole.appContainers) == 0:
 				callback(result)
 			
+	def stopPingConsole(self):
+		if self.PingConsole is not None:
+			if len(self.PingConsole.appContainers):
+				for name in self.PingConsole.appContainers.keys():
+					self.PingConsole.kill(name)
+
 	def stopLinkStateConsole(self):
 		if self.LinkConsole is not None:
 			if len(self.LinkConsole.appContainers):
@@ -571,11 +580,11 @@ class Network:
 				self.wlanmodule = 'madwifi'
 		if os_path.exists(rt73_dir):
 			rtfiles = listdir(rt73_dir)
-			if len(rtfiles) == 2:
+			if len(rtfiles) == 2 or len(rtfiles) == 5:
 				self.wlanmodule = 'ralink'
 		if os_path.exists(zd1211b_dir):
 			zdfiles = listdir(zd1211b_dir)
-			if len(zdfiles) == 1:
+			if len(zdfiles) == 1 or len(zdfiles) == 5:
 				self.wlanmodule = 'zydas'
 		return self.wlanmodule