Merge remote branch 'origin/acid-burn/network_changes_next'

2 files changed, 269 insertions, 393 deletions

diff --git a/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py b/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
index 480f201f..a1851579 100755
--- a/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
+++ b/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
@@ -1,36 +1,42 @@
 from Components.config import config, ConfigYesNo, NoSave, ConfigSubsection, ConfigText, ConfigSelection, ConfigPassword
 from Components.Console import Console
+from Components.Network import iNetwork
 
-from os import system
+from os import system, path as os_path
 from string import maketrans, strip
 import sys
 import types
-from re import compile as re_compile, search as re_search
+from re import compile as re_compile, search as re_search, escape as re_escape
 from pythonwifi.iwlibs import getNICnames, Wireless, Iwfreq, getWNICnames
 from pythonwifi import flags as wififlags
 
 list = []
+list.append("Unencrypted")
 list.append("WEP")
 list.append("WPA")
-list.append("WPA2")
 list.append("WPA/WPA2")
+list.append("WPA2")
 
 weplist = []
 weplist.append("ASCII")
 weplist.append("HEX")
 
 config.plugins.wlan = ConfigSubsection()
-config.plugins.wlan.essid = NoSave(ConfigText(default = "home", fixed_size = False))
-config.plugins.wlan.hiddenessid = NoSave(ConfigText(default = "home", fixed_size = False))
+config.plugins.wlan.essid = NoSave(ConfigText(default = "", fixed_size = False))
+config.plugins.wlan.hiddenessid = NoSave(ConfigYesNo(default = False))
+config.plugins.wlan.encryption = NoSave(ConfigSelection(list, default = "WPA2"))
+config.plugins.wlan.wepkeytype = NoSave(ConfigSelection(weplist, default = "ASCII"))
+config.plugins.wlan.psk = NoSave(ConfigPassword(default = "", fixed_size = False))
+
 
-config.plugins.wlan.encryption = ConfigSubsection()
-config.plugins.wlan.encryption.enabled = NoSave(ConfigYesNo(default = True))
-config.plugins.wlan.encryption.type = NoSave(ConfigSelection(list, default = "WPA/WPA2"))
-config.plugins.wlan.encryption.wepkeytype = NoSave(ConfigSelection(weplist, default = "ASCII"))
-config.plugins.wlan.encryption.psk = NoSave(ConfigPassword(default = "mysecurewlan", fixed_size = False))
+def getWlanConfigName(iface):
+	return '/etc/wpa_supplicant.' + iface + '.conf'
 
 class Wlan:
-	def __init__(self, iface):
+	def __init__(self, iface = None):
+		self.iface = iface
+		self.oldInterfaceState = None
+		
 		a = ''; b = ''
 		for i in range(0, 255):
 			a = a + chr(i)
@@ -39,135 +45,37 @@ class Wlan:
 			else:
 				b = b + chr(i)
 		
-		self.iface = iface
-		self.wlaniface = {}
-		self.WlanConsole = Console()
 		self.asciitrans = maketrans(a, b)
 
-	def stopWlanConsole(self):
-		if self.WlanConsole is not None:
-			print "killing self.WlanConsole"
-			self.WlanConsole = None
-			del self.WlanConsole
-			
-	def getDataForInterface(self, callback = None):
-		#get ip out of ip addr, as avahi sometimes overrides it in ifconfig.
-		print "self.iface im getDataForInterface",self.iface
-		if len(self.WlanConsole.appContainers) == 0:
-			self.WlanConsole = Console()
-			cmd = "iwconfig " + self.iface
-			self.WlanConsole.ePopen(cmd, self.iwconfigFinished, callback)
-
-	def iwconfigFinished(self, result, retval, extra_args):
-		print "self.iface im iwconfigFinished",self.iface
-		callback = extra_args
-		data = { 'essid': False, 'frequency': False, 'acesspoint': False, 'bitrate': False, 'encryption': False, 'quality': False, 'signal': False }
-		
-		for line in result.splitlines():
-			line = line.strip()
-			if "ESSID" in line:
-				if "off/any" in line:
-					ssid = _("No Connection")
-				else:
-					if "Nickname" in line:
-						tmpssid=(line[line.index('ESSID')+7:line.index('"  Nickname')])
-						if tmpssid == '':
-							ssid = _("Hidden networkname")
-						elif tmpssid ==' ':
-							ssid = _("Hidden networkname")
-						else:
-							ssid = tmpssid
-					else:
-						tmpssid=(line[line.index('ESSID')+7:len(line)-1])
-						if tmpssid == '':
-							ssid = _("Hidden networkname")
-						elif tmpssid ==' ':
-							ssid = _("Hidden networkname")
-						else:
-							ssid = tmpssid						
-
-				if ssid is not None:
-					data['essid'] = ssid
-			if 'Frequency' in line:
-				frequency = line[line.index('Frequency')+10 :line.index(' GHz')]
-				if frequency is not None:
-					data['frequency'] = frequency
-			if "Access Point" in line:
-				ap=line[line.index('Access Point')+14:len(line)-1]
-				if ap is not None:
-					data['acesspoint'] = ap
-			if "Bit Rate" in line:
-				br = line[line.index('Bit Rate')+9 :line.index(' Mb/s')]
-				if br is not None:
-					data['bitrate'] = br
-			if 'Encryption key' in line:
-				if ":off" in line:
-				    enc = _("Disabled")
-				else:
-				    enc = line[line.index('Encryption key')+15 :line.index('   Security')]
-				if enc is not None:
-					data['encryption'] = _("Enabled")
-			if 'Quality' in line:
-				if "/100" in line:
-					qual = line[line.index('Quality')+8:line.index('/100')]
-				else:
-					qual = line[line.index('Quality')+8:line.index('Sig')]
-				if qual is not None:
-					data['quality'] = qual
-			if 'Signal level' in line:
-				signal = line[line.index('Signal level')+13 :line.index(' dBm')]
-				if signal is not None:
-					data['signal'] = signal
-
-		self.wlaniface[self.iface] = data
-		
-		if len(self.WlanConsole.appContainers) == 0:
-			print "self.wlaniface after loading:", self.wlaniface
-			self.WlanConsole = None
-			if callback is not None:
-				callback(True,self.wlaniface)
-
-	def getAdapterAttribute(self, attribute):
-		if self.wlaniface.has_key(self.iface):
-			print "self.wlaniface.has_key",self.iface
-			if self.wlaniface[self.iface].has_key(attribute):
-				return self.wlaniface[self.iface][attribute]
-		return None
-		
 	def asciify(self, str):
 		return str.translate(self.asciitrans)
-
 	
 	def getWirelessInterfaces(self):
-		device = re_compile('[a-z]{2,}[0-9]*:')
-		ifnames = []
+		return getWNICnames()
 
-		fp = open('/proc/net/wireless', 'r')
-		for line in fp:
-			try:
-				# append matching pattern, without the trailing colon
-				ifnames.append(device.search(line).group()[:-1])
-			except AttributeError:
-				pass
-		return ifnames
+	def setInterface(self, iface = None):
+		self.iface = iface
+
+	def getInterface(self):
+		return self.iface
 
-	
 	def getNetworkList(self):
-		system("ifconfig "+self.iface+" up")
+		if self.oldInterfaceState is None:
+			self.oldInterfaceState = iNetwork.getAdapterAttribute(self.iface, "up")
+		if self.oldInterfaceState is False:
+			if iNetwork.getAdapterAttribute(self.iface, "up") is False:
+				iNetwork.setAdapterAttribute(self.iface, "up", True)
+				system("ifconfig "+self.iface+" up")
+
 		ifobj = Wireless(self.iface) # a Wireless NIC Object
-		
-		#Association mappings
-		#stats, quality, discard, missed_beacon = ifobj.getStatistics()
-		#snr = quality.signallevel - quality.noiselevel
 
 		try:
 			scanresults = ifobj.scan()
 		except:
 			scanresults = None
-			print "[Wlan.py] No Wireless Networks could be found"
-		
+			print "[Wlan.py] No wireless networks could be found"
+		aps = {}
 		if scanresults is not None:
-			aps = {}
 			(num_channels, frequencies) = ifobj.getChannelInfo()
 			index = 1
 			for result in scanresults:
@@ -188,7 +96,6 @@ class Wlan:
 					element = element.encode()
 					extra.append( strip(self.asciify(element)) )
 				for element in extra:
-					print element
 					if 'SignalStrength' in element:
 						signal = element[element.index('SignalStrength')+15:element.index(',L')]					
 					if 'LinkQuality' in element:
@@ -207,183 +114,151 @@ class Wlan:
 					'signal' : str(signal),
 					'custom' : extra,
 				}
-				#print "GOT APS ENTRY:",aps[bssid]
-				index = index + 1
-			return aps
 
+				index = index + 1
+		return aps
 		
-	def getStatus(self):
-		ifobj = Wireless(self.iface)
-		fq = Iwfreq()
-		try:
-			self.channel = str(fq.getChannel(str(ifobj.getFrequency()[0:-3])))
-		except:
-			self.channel = 0
-		status = {
-				  'BSSID': str(ifobj.getAPaddr()), #ifobj.getStatistics()
-				  'ESSID': str(ifobj.getEssid()),
-				  'quality': "%s/%s" % (ifobj.getStatistics()[1].quality,ifobj.getQualityMax().quality),
-				  'signal': str(ifobj.getStatistics()[1].siglevel-0x100) + " dBm",
-				  'bitrate': str(ifobj.getBitrate()),
-				  'channel': str(self.channel),
-				  #'channel': str(fq.getChannel(str(ifobj.getFrequency()[0:-3]))),
-		}
-		
-		for (key, item) in status.items():
-			if item is "None" or item is "":
-					status[key] = _("N/A")
-				
-		return status
+	def stopGetNetworkList(self):
+		if self.oldInterfaceState is not None:
+			if self.oldInterfaceState is False:
+				iNetwork.setAdapterAttribute(self.iface, "up", False)
+				system("ifconfig "+self.iface+" down")
+				self.oldInterfaceState = None
+				self.iface = None
 
+iWlan = Wlan()
 
 class wpaSupplicant:
 	def __init__(self):
 		pass
-	
 		
-	def writeConfig(self):	
-			
-			essid = config.plugins.wlan.essid.value
-			hiddenessid = config.plugins.wlan.hiddenessid.value
-			encrypted = config.plugins.wlan.encryption.enabled.value
-			encryption = config.plugins.wlan.encryption.type.value
-			wepkeytype = config.plugins.wlan.encryption.wepkeytype.value
-			psk = config.plugins.wlan.encryption.psk.value
-			fp = file('/etc/wpa_supplicant.conf', 'w')
-			fp.write('#WPA Supplicant Configuration by enigma2\n')
-			fp.write('ctrl_interface=/var/run/wpa_supplicant\n')
-			fp.write('eapol_version=1\n')
-			fp.write('fast_reauth=1\n')	
-			if essid == 'hidden...':
-				fp.write('ap_scan=2\n')
-			else:
-				fp.write('ap_scan=1\n')
-			fp.write('network={\n')
-			if essid == 'hidden...':
-				fp.write('\tssid="'+hiddenessid+'"\n')
+	def writeConfig(self, iface):
+		essid = config.plugins.wlan.essid.value
+		hiddenessid = config.plugins.wlan.hiddenessid.value
+		encryption = config.plugins.wlan.encryption.value
+		wepkeytype = config.plugins.wlan.wepkeytype.value
+		psk = config.plugins.wlan.psk.value
+		fp = file(getWlanConfigName(iface), 'w')
+		fp.write('#WPA Supplicant Configuration by enigma2\n')
+		fp.write('ctrl_interface=/var/run/wpa_supplicant\n')
+		fp.write('eapol_version=1\n')
+		fp.write('fast_reauth=1\n')	
+
+		if hiddenessid:
+			fp.write('ap_scan=2\n')
+		else:
+			fp.write('ap_scan=1\n')
+		fp.write('network={\n')
+		fp.write('\tssid="'+essid+'"\n')
+		fp.write('\tscan_ssid=0\n')			
+		if encryption in ('WPA', 'WPA2', 'WPA/WPA2'):
+			fp.write('\tkey_mgmt=WPA-PSK\n')
+			if encryption == 'WPA':
+				fp.write('\tproto=WPA\n')
+				fp.write('\tpairwise=TKIP\n')
+				fp.write('\tgroup=TKIP\n')
+			elif encryption == 'WPA2':
+				fp.write('\tproto=RSN\n')
+				fp.write('\tpairwise=CCMP\n')
+				fp.write('\tgroup=CCMP\n')
 			else:
-				fp.write('\tssid="'+essid+'"\n')
-			fp.write('\tscan_ssid=0\n')			
-			if encrypted:
-				if encryption in ('WPA', 'WPA2', 'WPA/WPA2'):
-					fp.write('\tkey_mgmt=WPA-PSK\n')
-		
-					if encryption == 'WPA':
-						fp.write('\tproto=WPA\n')
-						fp.write('\tpairwise=TKIP\n')
-						fp.write('\tgroup=TKIP\n')
-					elif encryption == 'WPA2':
-						fp.write('\tproto=RSN\n')
-						fp.write('\tpairwise=CCMP\n')
-						fp.write('\tgroup=CCMP\n')
-					else:
-						fp.write('\tproto=WPA RSN\n')
-						fp.write('\tpairwise=CCMP TKIP\n')
-						fp.write('\tgroup=CCMP TKIP\n')
-					fp.write('\tpsk="'+psk+'"\n')
-				elif encryption == 'WEP':
-					fp.write('\tkey_mgmt=NONE\n')
-					if wepkeytype == 'ASCII':
-						fp.write('\twep_key0="'+psk+'"\n')
-					else:
-						fp.write('\twep_key0='+psk+'\n')
+				fp.write('\tproto=WPA RSN\n')
+				fp.write('\tpairwise=CCMP TKIP\n')
+				fp.write('\tgroup=CCMP TKIP\n')
+			fp.write('\tpsk="'+psk+'"\n')
+		elif encryption == 'WEP':
+			fp.write('\tkey_mgmt=NONE\n')
+			if wepkeytype == 'ASCII':
+				fp.write('\twep_key0="'+psk+'"\n')
 			else:
-				fp.write('\tkey_mgmt=NONE\n')			
-			fp.write('}')
-			fp.write('\n')
-			fp.close()
-			system("cat /etc/wpa_supplicant.conf")
+				fp.write('\twep_key0='+psk+'\n')
+		else:
+			fp.write('\tkey_mgmt=NONE\n')
+		fp.write('}')
+		fp.write('\n')
+		fp.close()
+		#system('cat ' + getWlanConfigName(iface))
 		
-	def loadConfig(self):
+	def loadConfig(self,iface):
+		configfile = getWlanConfigName(iface)
+		if not os_path.exists(configfile):
+			configfile = '/etc/wpa_supplicant.conf'
 		try:
 			#parse the wpasupplicant configfile
-			fp = file('/etc/wpa_supplicant.conf', 'r')
+			print "[Wlan.py] parsing configfile: ",configfile
+			fp = file(configfile, 'r')
 			supplicant = fp.readlines()
 			fp.close()
-			ap_scan = False
 			essid = None
+			encryption = "Unencrypted"
 
 			for s in supplicant:
 				split = s.strip().split('=',1)
 				if split[0] == 'ap_scan':
-					print "[Wlan.py] Got Hidden SSID Scan  Value "+split[1]
 					if split[1] == '2':
-						ap_scan = True
+						config.plugins.wlan.hiddenessid.value = True
 					else:
-						ap_scan = False
-						
+						config.plugins.wlan.hiddenessid.value = False
+
 				elif split[0] == 'ssid':
-					print "[Wlan.py] Got SSID "+split[1][1:-1]
 					essid = split[1][1:-1]
-					
+					config.plugins.wlan.essid.value = essid
+
 				elif split[0] == 'proto':
-					config.plugins.wlan.encryption.enabled.value = True
 					if split[1] == 'WPA' :
 						mode = 'WPA'
 					if split[1] == 'RSN':
 						mode = 'WPA2'
 					if split[1] in ('WPA RSN', 'WPA WPA2'):
 						mode = 'WPA/WPA2'
-
-					config.plugins.wlan.encryption.type.value = mode
-					print "[Wlan.py] Got Encryption: "+mode
+					encryption = mode
 					
 				elif split[0] == 'wep_key0':
-					config.plugins.wlan.encryption.enabled.value = True
-					config.plugins.wlan.encryption.type.value = 'WEP'
+					encryption = 'WEP'
 					if split[1].startswith('"') and split[1].endswith('"'):
-						config.plugins.wlan.encryption.wepkeytype.value = 'ASCII'
-						config.plugins.wlan.encryption.psk.value = split[1][1:-1]
+						config.plugins.wlan.wepkeytype.value = 'ASCII'
+						config.plugins.wlan.psk.value = split[1][1:-1]
 					else:
-						config.plugins.wlan.encryption.wepkeytype.value = 'HEX'
-						config.plugins.wlan.encryption.psk.value = split[1]						
+						config.plugins.wlan.wepkeytype.value = 'HEX'
+						config.plugins.wlan.psk.value = split[1]						
 					
 				elif split[0] == 'psk':
-					config.plugins.wlan.encryption.psk.value = split[1][1:-1]
+					config.plugins.wlan.psk.value = split[1][1:-1]
 				else:
 					pass
+
+			config.plugins.wlan.encryption.value = encryption
 				
-			if ap_scan is True:
-				config.plugins.wlan.hiddenessid.value = essid
-				config.plugins.wlan.essid.value = 'hidden...'
-			else:
-				config.plugins.wlan.hiddenessid.value = essid
-				config.plugins.wlan.essid.value = essid
 			wsconfig = {
 					'hiddenessid': config.plugins.wlan.hiddenessid.value,
 					'ssid': config.plugins.wlan.essid.value,
-					'encryption': config.plugins.wlan.encryption.enabled.value,
-					'encryption_type': config.plugins.wlan.encryption.type.value,
-					'encryption_wepkeytype': config.plugins.wlan.encryption.wepkeytype.value,
-					'key': config.plugins.wlan.encryption.psk.value,
+					'encryption': config.plugins.wlan.encryption.value,
+					'wepkeytype': config.plugins.wlan.wepkeytype.value,
+					'key': config.plugins.wlan.psk.value,
 				}
 		
 			for (key, item) in wsconfig.items():
 				if item is "None" or item is "":
 					if key == 'hiddenessid':
-						wsconfig['hiddenessid'] = "home"
+						wsconfig['hiddenessid'] = False
 					if key == 'ssid':
-						wsconfig['ssid'] = "home"
-					if key == 'encryption':
-						wsconfig['encryption'] = True				
-					if key == 'encryption':
-						wsconfig['encryption_type'] = "WPA/WPA2"
+						wsconfig['ssid'] = ""
 					if key == 'encryption':
-						wsconfig['encryption_wepkeytype'] = "ASCII"
-					if key == 'encryption':
-						wsconfig['key'] = "mysecurewlan"
-
+						wsconfig['encryption'] = "WPA2"			
+					if key == 'wepkeytype':
+						wsconfig['wepkeytype'] = "ASCII"
+					if key == 'key':
+						wsconfig['key'] = ""
 		except:
-			print "[Wlan.py] Error parsing /etc/wpa_supplicant.conf"
+			print "[Wlan.py] Error parsing ",configfile
 			wsconfig = {
-					'hiddenessid': "home",
-					'ssid': "home",
-					'encryption': True,
-					'encryption_type': "WPA/WPA2",
-					'encryption_wepkeytype': "ASCII",
-					'key': "mysecurewlan",
+					'hiddenessid': False,
+					'ssid': "",
+					'encryption': "WPA2",
+					'wepkeytype': "ASCII",
+					'key': "",
 				}
-		print "[Wlan.py] WS-CONFIG-->",wsconfig
+		#print "[Wlan.py] WS-CONFIG-->",wsconfig
 		return wsconfig
 
 
@@ -391,82 +266,70 @@ class Status:
 	def __init__(self):
 		self.wlaniface = {}
 		self.backupwlaniface = {}
+		self.statusCallback = None
 		self.WlanConsole = Console()
 
 	def stopWlanConsole(self):
 		if self.WlanConsole is not None:
-			print "killing self.WlanConsole"
+			print "[iStatus] killing self.WlanConsole"
 			self.WlanConsole.killAll()
 			self.WlanConsole = None
 			
 	def getDataForInterface(self, iface, callback = None):
 		self.WlanConsole = Console()
 		cmd = "iwconfig " + iface
-		self.WlanConsole.ePopen(cmd, self.iwconfigFinished, [iface, callback])
+		if callback is not None:
+			self.statusCallback = callback
+		self.WlanConsole.ePopen(cmd, self.iwconfigFinished, iface)
 
 	def iwconfigFinished(self, result, retval, extra_args):
-		(iface, callback) = extra_args
-		data = { 'essid': False, 'frequency': False, 'acesspoint': False, 'bitrate': False, 'encryption': False, 'quality': False, 'signal': False }
+		iface = extra_args
+		data = { 'essid': False, 'frequency': False, 'accesspoint': False, 'bitrate': False, 'encryption': False, 'quality': False, 'signal': False }
 		for line in result.splitlines():
 			line = line.strip()
 			if "ESSID" in line:
 				if "off/any" in line:
-					ssid = _("No Connection")
+					ssid = "off"
 				else:
 					if "Nickname" in line:
-						tmpssid=(line[line.index('ESSID')+7:line.index('"  Nickname')])
-						if tmpssid == '':
-							ssid = _("Hidden networkname")
-						elif tmpssid ==' ':
-							ssid = _("Hidden networkname")
-						else:
-							ssid = tmpssid
+						ssid=(line[line.index('ESSID')+7:line.index('"  Nickname')])
 					else:
-						tmpssid=(line[line.index('ESSID')+7:len(line)-1])
-						if tmpssid == '':
-							ssid = _("Hidden networkname")
-						elif tmpssid ==' ':
-							ssid = _("Hidden networkname")
-						else:
-							ssid = tmpssid						
+						ssid=(line[line.index('ESSID')+7:len(line)-1])
 				if ssid is not None:
 					data['essid'] = ssid
-			if 'Frequency' in line:
+			if "Frequency" in line:
 				frequency = line[line.index('Frequency')+10 :line.index(' GHz')]
 				if frequency is not None:
 					data['frequency'] = frequency
 			if "Access Point" in line:
-				ap=line[line.index('Access Point')+14:len(line)]
+				if "Sensitivity" in line:
+					ap=line[line.index('Access Point')+14:line.index('   Sensitivity')]
+				else:
+					ap=line[line.index('Access Point')+14:len(line)]
 				if ap is not None:
-					data['acesspoint'] = ap
-					if ap == "Not-Associated":
-						data['essid'] = _("No Connection")
+					data['accesspoint'] = ap
 			if "Bit Rate" in line:
 				if "kb" in line:
 					br = line[line.index('Bit Rate')+9 :line.index(' kb/s')]
-					if br == '0':
-						br = _("Unsupported")
-					else:
-						br += " Mb/s"
 				else:
-					br = line[line.index('Bit Rate')+9 :line.index(' Mb/s')] + " Mb/s"
+					br = line[line.index('Bit Rate')+9 :line.index(' Mb/s')]
 				if br is not None:
 					data['bitrate'] = br
-			if 'Encryption key' in line:
+			if "Encryption key" in line:
 				if ":off" in line:
-					if data['acesspoint'] is not "Not-Associated":
-						enc = _("Unsupported")
-					else:
-						enc = _("Disabled")
-				else:
+					enc = "off"
+				elif "Security" in line:
 					enc = line[line.index('Encryption key')+15 :line.index('   Security')]
 					if enc is not None:
-						enc = _("Enabled")
+						enc = "on"
+				else:
+					enc = line[line.index('Encryption key')+15 :len(line)]
+					if enc is not None:
+						enc = "on"
 				if enc is not None:
 					data['encryption'] = enc
 			if 'Quality' in line:
 				if "/100" in line:
-					#qual = line[line.index('Quality')+8:line.index('/100')]
 					qual = line[line.index('Quality')+8:line.index('  Signal')]
 				else:
 					qual = line[line.index('Quality')+8:line.index('Sig')]
@@ -474,8 +337,7 @@ class Status:
 					data['quality'] = qual
 			if 'Signal level' in line:
 				if "dBm" in line:
-					signal = line[line.index('Signal level')+13 :line.index(' dBm')]
-					signal += " dBm"
+					signal = line[line.index('Signal level')+13 :line.index(' dBm')] + " dBm"
 				elif "/100" in line:
 					if "Noise" in line:
 						signal = line[line.index('Signal level')+13:line.index('  Noise')]
@@ -494,9 +356,10 @@ class Status:
 		
 		if self.WlanConsole is not None:
 			if len(self.WlanConsole.appContainers) == 0:
-				print "self.wlaniface after loading:", self.wlaniface
-				if callback is not None:
-					callback(True,self.wlaniface)
+				print "[Wlan.py] self.wlaniface after loading:", self.wlaniface
+				if self.statusCallback is not None:
+						self.statusCallback(True,self.wlaniface)
+						self.statusCallback = None
 
 	def getAdapterAttribute(self, iface, attribute):
 		self.iface = iface
diff --git a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
index efec340a..3462146f 100644
--- a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
@@ -8,37 +8,40 @@ from Components.Sources.List import List
 from Components.MenuList import MenuList
 from Components.config import config, getConfigListEntry, ConfigYesNo, NoSave, ConfigSubsection, ConfigText, ConfigSelection, ConfigPassword
 from Components.ConfigList import ConfigListScreen
-from Components.Network import Network, iNetwork
+from Components.Network import iNetwork
 from Components.Console import Console
 from Plugins.Plugin import PluginDescriptor
 from os import system, path as os_path, listdir
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
 from Tools.LoadPixmap import LoadPixmap
 from Tools.HardwareInfo import HardwareInfo
-from Wlan import Wlan, wpaSupplicant, iStatus
-import sha
+from Wlan import iWlan, wpaSupplicant, iStatus, getWlanConfigName
+import hashlib
+from time import time
+from os import urandom, system
+from re import escape as re_escape
 
 plugin_path = eEnv.resolve("${libdir}/enigma2/python/Plugins/SystemPlugins/WirelessLan")
 
+
 list = []
+list.append("Unencrypted")
 list.append("WEP")
 list.append("WPA")
-list.append("WPA2")
 list.append("WPA/WPA2")
+list.append("WPA2")
 
 weplist = []
 weplist.append("ASCII")
 weplist.append("HEX")
 
 config.plugins.wlan = ConfigSubsection()
-config.plugins.wlan.essid = NoSave(ConfigText(default = "home", fixed_size = False))
-config.plugins.wlan.hiddenessid = NoSave(ConfigText(default = "home", fixed_size = False))
+config.plugins.wlan.essid = NoSave(ConfigText(default = "", fixed_size = False))
+config.plugins.wlan.hiddenessid = NoSave(ConfigYesNo(default = False))
+config.plugins.wlan.encryption = NoSave(ConfigSelection(list, default = "WPA2"))
+config.plugins.wlan.wepkeytype = NoSave(ConfigSelection(weplist, default = "ASCII"))
+config.plugins.wlan.psk = NoSave(ConfigPassword(default = "", fixed_size = False))
 
-config.plugins.wlan.encryption = ConfigSubsection()
-config.plugins.wlan.encryption.enabled = NoSave(ConfigYesNo(default = False))
-config.plugins.wlan.encryption.type = NoSave(ConfigSelection(list, default = "WPA/WPA2" ))
-config.plugins.wlan.encryption.wepkeytype = NoSave(ConfigSelection(weplist, default = "ASCII"))
-config.plugins.wlan.encryption.psk = NoSave(ConfigPassword(default = "mysecurewlan", fixed_size = False))
 
 
 class WlanStatus(Screen):
@@ -105,7 +108,7 @@ class WlanStatus(Screen):
 		}, -1)
 		self.timer = eTimer()
 		self.timer.timeout.get().append(self.resetList) 
-		self.onShown.append(lambda: self.timer.start(5000))
+		self.onShown.append(lambda: self.timer.start(8000))
 		self.onLayoutFinish.append(self.layoutFinished)
 		self.onClose.append(self.cleanup)
 
@@ -113,7 +116,7 @@ class WlanStatus(Screen):
 		iStatus.stopWlanConsole()
 		
 	def layoutFinished(self):
-		self.setTitle(_("Wireless Network State"))
+		self.setTitle(_("Wireless network state"))
 		
 	def resetList(self):
 		iStatus.getDataForInterface(self.iface,self.getInfoCB)
@@ -122,32 +125,65 @@ class WlanStatus(Screen):
 		if data is not None:
 			if data is True:
 				if status is not None:
-					self["BSSID"].setText(status[self.iface]["acesspoint"])
-					self["ESSID"].setText(status[self.iface]["essid"])
-					self["quality"].setText(status[self.iface]["quality"])
-					self["signal"].setText(status[self.iface]["signal"])
-					self["bitrate"].setText(status[self.iface]["bitrate"])
-					self["enc"].setText(status[self.iface]["encryption"])
+					if status[self.iface]["essid"] == "off":
+						essid = _("No Connection")
+					else:
+						essid = status[self.iface]["essid"]
+					if status[self.iface]["accesspoint"] == "Not-Associated":
+						accesspoint = _("Not-Associated")
+						essid = _("No Connection")
+					else:
+						accesspoint = status[self.iface]["accesspoint"]
+					if self.has_key("BSSID"):
+						self["BSSID"].setText(accesspoint)
+					if self.has_key("ESSID"):
+						self["ESSID"].setText(essid)
+
+					quality = status[self.iface]["quality"]
+					if self.has_key("quality"):
+						self["quality"].setText(quality)
+						
+					if status[self.iface]["bitrate"] == '0':
+						bitrate = _("Unsupported")
+					else:
+						bitrate = str(status[self.iface]["bitrate"]) + " Mb/s"
+					if self.has_key("bitrate"):
+						self["bitrate"].setText(bitrate)					
+					
+					signal = status[self.iface]["signal"]
+					if self.has_key("signal"):
+						self["signal"].setText(signal)
+
+					if status[self.iface]["encryption"] == "off":
+						if accesspoint == "Not-Associated":
+							encryption = _("Disabled")
+						else:
+							encryption = _("Unsupported")
+					else:
+						encryption = _("Enabled")
+					if self.has_key("enc"):
+						self["enc"].setText(encryption)
 					self.updateStatusLink(status)
 
 	def exit(self):
 		self.timer.stop()
-		self.close(True)	
+		self.close(True)
 
 	def updateStatusbar(self):
-		self["BSSID"].setText(_("Please wait..."))
-		self["ESSID"].setText(_("Please wait..."))
-		self["quality"].setText(_("Please wait..."))
-		self["signal"].setText(_("Please wait..."))
-		self["bitrate"].setText(_("Please wait..."))
-		self["enc"].setText(_("Please wait..."))
+		wait_txt = _("Please wait...")
+		self["BSSID"].setText(wait_txt)
+		self["ESSID"].setText(wait_txt)
+		self["quality"].setText(wait_txt)
+		self["signal"].setText(wait_txt)
+		self["bitrate"].setText(wait_txt)
+		self["enc"].setText(wait_txt)
 		self["IFtext"].setText(_("Network:"))
 		self["IF"].setText(iNetwork.getFriendlyAdapterName(self.iface))
 		self["Statustext"].setText(_("Link:"))
 
 	def updateStatusLink(self,status):
 		if status is not None:
-			if status[self.iface]["acesspoint"] == "No Connection" or status[self.iface]["acesspoint"] == "Not-Associated" or status[self.iface]["acesspoint"] == False:
+			if status[self.iface]["essid"] == "off" or status[self.iface]["accesspoint"] == "Not-Associated" or status[self.iface]["accesspoint"] == False:
 				self["statuspic"].setPixmapNum(1)
 			else:
 				self["statuspic"].setPixmapNum(0)
@@ -217,6 +253,8 @@ class WlanScan(Screen):
 			"red": self.cancel,
 			"green": self.select,
 		})
+		iWlan.setInterface(self.iface)
+		self.w = iWlan.getInterface()
 		self.onLayoutFinish.append(self.layoutFinished)
 		self.getAccessPoints(refresh = False)
 		
@@ -226,42 +264,24 @@ class WlanScan(Screen):
 	def select(self):
 		cur = self["list"].getCurrent()
 		if cur is not None:
+			iWlan.stopGetNetworkList()
 			self.rescanTimer.stop()
 			del self.rescanTimer
-			if cur[1] is not None:
-				if cur[1] == 'hidden...':
-					essid = cur[1]
-				else:
-					essid = cur[0]
-				self.close(essid,self.getWlanList())
+			if cur[0] is not None:
+				self.close(cur[0])
 			else:
-				self.close(None,None)
+				self.close(None)
 		else:
-			self.rescanTimer.stop()
-			del self.rescanTimer
-			self.close(None,None)
-	
-	def WlanSetupClosed(self, *ret):
-		if ret[0] == 2:
+			iWlan.stopGetNetworkList()
 			self.rescanTimer.stop()
 			del self.rescanTimer
 			self.close(None)
 	
 	def cancel(self):
-		if self.oldInterfaceState is False:
-			iNetwork.setAdapterAttribute(self.iface, "up", False)
-			iNetwork.deactivateInterface(self.iface,self.deactivateInterfaceCB)
-		else:
-			self.rescanTimer.stop()
-			del self.rescanTimer
-			self.close(None)
-
-	def deactivateInterfaceCB(self,data):
-		if data is not None:
-			if data is True:
-				self.rescanTimer.stop()
-				del self.rescanTimer
-				self.close(None)
+		iWlan.stopGetNetworkList()
+		self.rescanTimer.stop()
+		del self.rescanTimer
+		self.close(None)
 
 	def rescanTimerFired(self):
 		self.rescanTimer.stop()
@@ -270,10 +290,7 @@ class WlanScan(Screen):
 	def buildEntryComponent(self, essid, bssid, encrypted, iface, maxrate, signal):
 		divpng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/div-h.png"))
 		encryption = encrypted and _("Yes") or _("No")
-		if bssid == 'hidden...':
-			return((essid, bssid, None, None, None, None, divpng))
-		else:					
-			return((essid, bssid, _("Signal: ") + str(signal), _("Max. Bitrate: ") + str(maxrate), _("Encrypted: ") + encryption, _("Interface: ") + str(iface), divpng))
+		return((essid, bssid, _("Signal: ") + str(signal), _("Max. Bitrate: ") + str(maxrate), _("Encrypted: ") + encryption, _("Interface: ") + str(iface), divpng))
 
 	def updateAPList(self):
 		newList = []
@@ -290,20 +307,19 @@ class WlanScan(Screen):
 				tmpList.append(data)
 
 		if len(tmpList):
-			if "hidden..." not in tmpList:
-				tmpList.append( ( _("enter hidden network SSID"), "hidden...", True, self.iface, _("unavailable"), "" ) )
-	
 			for entry in tmpList:
 				self.newAPList.append(self.buildEntryComponent( entry[0], entry[1], entry[2], entry[3], entry[4], entry[5] ))
 	
 			currentListEntry = self["list"].getCurrent()
-			idx = 0
-			for entry in self.newAPList:
-				if entry[0] == currentListEntry[0]:
-					newListIndex = idx
-				idx +=1
+			if currentListEntry is not None:
+				idx = 0
+				for entry in self.newAPList:
+					if entry[0] == currentListEntry[0]:
+						newListIndex = idx
+					idx +=1
 			self['list'].setList(self.newAPList)
-			self["list"].setIndex(newListIndex)
+			if newListIndex is not None:
+				self["list"].setIndex(newListIndex)
 			self["list"].updateList(self.newAPList)
 			self.listLength = len(self.newAPList)
 			self.buildWlanList()
@@ -312,8 +328,7 @@ class WlanScan(Screen):
 	def getAccessPoints(self, refresh = False):
 		self.APList = []
 		self.cleanList = []
-		self.w = Wlan(self.iface)
-		aps = self.w.getNetworkList()
+		aps = iWlan.getNetworkList()
 		if aps is not None:
 			print "[WirelessLan.py] got Accespoints!"
 			tmpList = []
@@ -336,9 +351,6 @@ class WlanScan(Screen):
 				else:
 					self.oldlist[entry[0]]['data'] = entry
 		
-		if "hidden..." not in self.cleanList:
-			self.cleanList.append( ( _("enter hidden network SSID"), "hidden...", True, self.iface, _("unavailable"), "" ) )
-
 		for entry in self.cleanList:
 			self.APList.append(self.buildEntryComponent( entry[0], entry[1], entry[2], entry[3], entry[4], entry[5] ))
 		
@@ -351,20 +363,17 @@ class WlanScan(Screen):
 
 	def setInfo(self):
 		length = self.getLength()
-		if length <= 1:
-			self["info"].setText(_("No wireless networks found! Please refresh."))
-		elif length == 2:
+		if length == 0:
+			self["info"].setText(_("No wireless networks found! Searching..."))
+		elif length == 1:
 			self["info"].setText(_("1 wireless network found!"))
 		else:
-			self["info"].setText(str(length-1)+_(" wireless networks found!"))
+			self["info"].setText(str(length)+_(" wireless networks found!"))
 
 	def buildWlanList(self):
 		self.WlanList = []
 		for entry in self['list'].list:
-			if entry[1] == "hidden...":
-				self.WlanList.append(( "hidden...",_("enter hidden network SSID") ))#continue
-			else:
-				self.WlanList.append( (entry[0], entry[0]) )
+			self.WlanList.append( (entry[0], entry[0]) )
 
 	def getLength(self):
 		return self.listLength		
@@ -391,7 +400,7 @@ def decrypt_block(src, mod):
 	if len(src) != 128 and len(src) != 202:
 		return None
 	dest = rsa_pub1024(src[:128], mod)
-	hash = sha.new(dest[1:107])
+	hash = hashlib.sha1(dest[1:107])
 	if len(src) == 202:
 		hash.update(src[131:192])	
 	result = hash.digest()
@@ -399,65 +408,69 @@ def decrypt_block(src, mod):
 		return dest
 	return None
 
-def validate_cert(cert, key):
+def validate_certificate(cert, key):
 	buf = decrypt_block(cert[8:], key) 
 	if buf is None:
 		return None
 	return buf[36:107] + cert[139:196]
 
-def read_random():
+def get_random():
 	try:
-		fd = open("/dev/urandom", "r")
-		buf = fd.read(8)
-		fd.close()
-		return buf
+		xor = lambda a,b: ''.join(chr(ord(c)^ord(d)) for c,d in zip(a,b*100))
+		random = urandom(8)
+		x = str(time())[-8:]
+		result = xor(random, x)
+				
+		return result
 	except:
 		return None
 
 def WlanStatusScreenMain(session, iface):
 	session.open(WlanStatus, iface)
 
-
 def callFunction(iface):
-	w = Wlan(iface)
-	i = w.getWirelessInterfaces()
+	iWlan.setInterface(iface)
+	i = iWlan.getWirelessInterfaces()
 	if i:
-		if iface in i:
+		if iface in i or iNetwork.isWirelessInterface(iface):
 			return WlanStatusScreenMain
+		return None
 	return None
 
-
 def configStrings(iface):
-	hardware_info = HardwareInfo()
-	if  hardware_info.device_name != "dm7025":
+	try:
+		device = open("/proc/stb/info/model", "r").readline().strip()
+	except:
+		device = ""	
+	if device != "dm7025":
 		rootkey = ['\x9f', '|', '\xe4', 'G', '\xc9', '\xb4', '\xf4', '#', '&', '\xce', '\xb3', '\xfe', '\xda', '\xc9', 'U', '`', '\xd8', '\x8c', 's', 'o', '\x90', '\x9b', '\\', 'b', '\xc0', '\x89', '\xd1', '\x8c', '\x9e', 'J', 'T', '\xc5', 'X', '\xa1', '\xb8', '\x13', '5', 'E', '\x02', '\xc9', '\xb2', '\xe6', 't', '\x89', '\xde', '\xcd', '\x9d', '\x11', '\xdd', '\xc7', '\xf4', '\xe4', '\xe4', '\xbc', '\xdb', '\x9c', '\xea', '}', '\xad', '\xda', 't', 'r', '\x9b', '\xdc', '\xbc', '\x18', '3', '\xe7', '\xaf', '|', '\xae', '\x0c', '\xe3', '\xb5', '\x84', '\x8d', '\r', '\x8d', '\x9d', '2', '\xd0', '\xce', '\xd5', 'q', '\t', '\x84', 'c', '\xa8', ')', '\x99', '\xdc', '<', '"', 'x', '\xe8', '\x87', '\x8f', '\x02', ';', 'S', 'm', '\xd5', '\xf0', '\xa3', '_', '\xb7', 'T', '\t', '\xde', '\xa7', '\xf1', '\xc9', '\xae', '\x8a', '\xd7', '\xd2', '\xcf', '\xb2', '.', '\x13', '\xfb', '\xac', 'j', '\xdf', '\xb1', '\x1d', ':', '?']
 		etpm = eTPM()
 		l2cert = etpm.getCert(eTPM.TPMD_DT_LEVEL2_CERT)
 		if l2cert is None:
 			return
-		l2key = validate_cert(l2cert, rootkey)
+		l2key = validate_certificate(l2cert, rootkey)
 		if l2key is None:
 			return
 		l3cert = etpm.getCert(eTPM.TPMD_DT_LEVEL3_CERT)
 		if l3cert is None:
-			print "better run the genuine dreambox plugin"
 			return
-		l3key = validate_cert(l3cert, l2key)
+		l3key = validate_certificate(l3cert, l2key)
 		if l3key is None:
 			return
-		rnd = read_random()
+		rnd = get_random()
 		if rnd is None:
 			return
 		val = etpm.challenge(rnd)
 		result = decrypt_block(val, l3key)
-	if hardware_info.device_name == "dm7025" or result[80:88] == rnd:
+	if device == "dm7025" or result[80:88] == rnd:
 		driver = iNetwork.detectWlanModule(iface)
 	else:
 		driver = 'dreambox'
+	print 'Using "%s" as wpa-supplicant driver' % (driver)
 	ret = ""
-	if driver == 'madwifi' and config.plugins.wlan.essid.value == "hidden...":
-		ret += "\tpre-up iwconfig " + iface + " essid \"" + config.plugins.wlan.hiddenessid.value + "\" || true\n"
-	ret += "\tpre-up wpa_supplicant -i" + iface + " -c/etc/wpa_supplicant.conf -B -dd -D" + driver + " || true\n"
+	if driver == 'madwifi' and config.plugins.wlan.hiddenessid.value:
+		ret += "\tpre-up iwconfig " + iface + " essid \"" + re_escape(config.plugins.wlan.essid.value) + "\" || true\n"
+	ret += "\tpre-up wpa_supplicant -i" + iface + " -c" + getWlanConfigName(iface) + " -B -dd -D" + driver + " || true\n"
 	ret += "\tpre-down wpa_cli -i" + iface + " terminate || true\n"
 	return ret