X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FSystemPlugins%2FWirelessLanSetup%2Fplugin.py;h=2f1eb90c28c0eb1a7d8057e0e7abfd470ef5fbbb;hp=1427d1f956b22df9241e122d11021dd51609bcdf;hb=b2660920e43e2f0d56be9387ba92a76ec77e58bc;hpb=4e6ee0f7a9b56c4a998522b844627fa469e1e3d6 diff --git a/lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py index 1427d1f..2f1eb90 100755 --- a/lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py +++ b/lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py @@ -27,6 +27,8 @@ from os import path as os_path, system as os_system, unlink,listdir from re import compile as re_compile, search as re_search from Tools.Directories import fileExists import time +from pythonwifi.iwlibs import Wireless +import pythonwifi.flags class WlanSelection(Screen,HelpableScreen): skin = """ @@ -225,7 +227,7 @@ class WlanSetup(Screen,HelpableScreen): if self["menulist"].getCurrent()[1] == 'setting': self.session.openWithCallback(self.checklist, WlanConfig, self.iface) elif self["menulist"].getCurrent()[1] == 'scanap': - self.session.open(WlanScanAp, self.iface) + self.session.openWithCallback(self.WlanScanApCallback, WlanScanAp, self.iface) elif self["menulist"].getCurrent()[1] == 'dns': self.session.open(NameserverSetup) elif self["menulist"].getCurrent()[1] == 'status': @@ -250,6 +252,10 @@ class WlanSetup(Screen,HelpableScreen): return menu + def WlanScanApCallback(self, essid = None): + if essid is not None: + self.session.openWithCallback(self.checklist, WlanConfig, self.iface, essid) + def restartLan(self, ret = False): if (ret == True): iNetwork.restartNetwork(self.restartLanDataAvail) @@ -310,7 +316,7 @@ class WlanConfig(Screen, ConfigListScreen, HelpableScreen): """ - def __init__(self, session, iface): + def __init__(self, session, iface, essidSelected = None): Screen.__init__(self,session) self.session = session self["key_red"] = StaticText(_("Close")) @@ -326,6 +332,7 @@ class WlanConfig(Screen, ConfigListScreen, HelpableScreen): "red": self.keyCancel, }, -2) self.iface = iface + self.essidSelected = essidSelected self.ssid = None self.ap_scan = None self.scan_ssid = None @@ -335,18 +342,15 @@ class WlanConfig(Screen, ConfigListScreen, HelpableScreen): self.encryption_key = None self.wlanscanap = None self.wpaphraseconsole = None -# self.scanAPcount =5 - self.scanAPcount =1 self.list = [] ConfigListScreen.__init__(self, self.list,session = self.session) self.oldInterfaceState = iNetwork.getAdapterAttribute(self.iface, "up") self.readWpaSupplicantConf() - self.scanAPFailedTimer = eTimer() - self.scanAPFailedTimer.callback.append(self.scanAPFailed) self.scanAplistTimer = eTimer() self.scanAplistTimer.callback.append(self.scanApList) + self.emptyListMsgTimer = eTimer() + self.emptyListMsgTimer.callback.append(self.emptyListMsg) self.Console = Console() -# self.scanAplistTimer.start(100,True) self.updateInterfaces(self.readWlanSettings) self.onClose.append(self.cleanup) @@ -415,9 +419,8 @@ class WlanConfig(Screen, ConfigListScreen, HelpableScreen): wlanconfig.keytype = ConfigSelection(default = default_tmp, choices = [ ("ascii", _("ASCII")), ("hex", _("HEX"))]) default_tmp = self.encryption_key or "XXXXXXXX" -# default_tmp = "XXXXXXXX" wlanconfig.key = ConfigPassword(default = default_tmp, visible_width = 50, fixed_size = False) - self.scanAplistTimer.start(100,True) + self.getApList() def readWpaSupplicantConf(self): try: @@ -458,7 +461,7 @@ class WlanConfig(Screen, ConfigListScreen, HelpableScreen): self.key_type = 0 # hex self.encryption_key = data[4:-1] data = wpafd.readline() - print self.ssid,self.scan_ssid,self.key_mgmt,self.proto,self.key_type,self.encryption_key +# print self.ssid,self.scan_ssid,self.key_mgmt,self.proto,self.key_type,self.encryption_key wpafd.close() else: print 'read error' @@ -494,7 +497,6 @@ class WlanConfig(Screen, ConfigListScreen, HelpableScreen): if wlanconfig.usegateway.value is "on": self.configList.append(self.gatewayEntry) self.configList.append( self.essidEntry ) -# print "#### wlanconfig.essid.value : ",wlanconfig.essid.value if wlanconfig.essid.value == 'Input hidden ESSID': self.configList.append( self.hiddenessidEntry ) self.configList.append( self.encryptEntry ) @@ -506,79 +508,59 @@ class WlanConfig(Screen, ConfigListScreen, HelpableScreen): self["config"].list = self.configList self["config"].l.setList(self.configList) -# if not self.selectionChanged in self["config"].onSelectionChanged: -# self["config"].onSelectionChanged.append(self.selectionChanged) - - def scanApList(self): - self.apList = [] - self.configurationmsg = self.session.open(MessageBox, _("Please wait for scanning AP..."), type = MessageBox.TYPE_INFO, enable_input = False) - cmd = "ifconfig "+self.iface+" up" - print 'cmd ',cmd - os_system(cmd) - self.wlanscanap = Console() - cmd = "iwlist "+self.iface+" scan" - print 'cmd ',cmd - self.wlanscanap.ePopen(cmd, self.apListFinnished,self.apListParse) - - def apListFinnished(self, result, retval,extra_args): - (callback) = extra_args - if self.wlanscanap is not None: - if retval == 0: - self.wlanscanap = None - content = result.splitlines() - first = content[0].split() - completed = False - for x in first: - if x == 'completed': - completed = True - if completed == True: - callback(result) - else: - callback(0) - else: - callback(0) - def apListParse(self,data): - global selectap - if data == 0: - if self.scanAPcount >0: - self.scanAPcount -=1 - self.configurationmsg.close(True) - time.sleep(3) - self.scanAplistTimer.start(500,True) - return - else: - self.configurationmsg.close(True) - self.scanAPFailedTimer.start(500,True) - return - else: + def getApList(self): + if self.essidSelected is None: self.apList = [] -# self.scanAPcount =5 - self.scanAPcount =0 - list = data.splitlines() - for x in list: - xx = x.lstrip() - if xx.startswith('ESSID:') and len(xx)>8 and xx[7:-1]not in self.apList: - self.apList.append(xx[7:-1]) - self.apList.append('Input hidden ESSID') -# print "###### selectap : ",selectap - if selectap is not None and selectap in self.apList: - wlanconfig.essid = ConfigSelection(default=selectap,choices = self.apList) - elif self.ap_scan is not None and self.ap_scan.strip() == '2': - wlanconfig.essid = ConfigSelection(default='Input hidden ESSID',choices = self.apList) - elif self.ssid is not None and self.ssid in self.apList: - wlanconfig.essid = ConfigSelection(default=self.ssid,choices = self.apList) - else: - wlanconfig.essid = ConfigSelection(choices = self.apList) + self.configurationmsg = self.session.open(MessageBox, _("Please wait for scanning AP..."), type = MessageBox.TYPE_INFO, enable_input = False) + self.scanAplistTimer.start(100,True) + else: + self.apList = [self.essidSelected] + wlanconfig.essid = ConfigSelection(choices = self.apList) if self.ssid is not None: wlanconfig.hiddenessid = ConfigText(default = self.ssid, visible_width = 50, fixed_size = False) else: wlanconfig.hiddenessid = ConfigText(default = "", visible_width = 50, fixed_size = False) + self.createConfig() + + def scanApList(self): + if self.oldInterfaceState is not True: + os_system("ifconfig "+self.iface+" up") + iNetwork.setAdapterAttribute(self.iface, "up", True) + Iwscanresult = None + wirelessObj = Wireless(self.iface) + try: + Iwscanresult = wirelessObj.scan() + except IOError: + print "%s Interface doesn't support scanning.."%self.iface +# self.session.open(MessageBox, "%s Interface doesn't support scanning.."%self.iface, MessageBox.TYPE_ERROR,10) self.configurationmsg.close(True) + if Iwscanresult is None: + self.emptyListMsgTimer.start(100,True) + else: + for ap in Iwscanresult: + if ap.essid not in self.apList and len(ap.essid) > 0: + self.apList.append(ap.essid) + self.apList.append('Input hidden ESSID') + if selectap is not None and selectap in self.apList: + wlanconfig.essid = ConfigSelection(default=selectap,choices = self.apList) + elif self.scan_ssid is not None and self.scan_ssid.strip() == '1': + wlanconfig.essid = ConfigSelection(default='Input hidden ESSID',choices = self.apList) + elif self.ssid is not None and self.ssid in self.apList: + wlanconfig.essid = ConfigSelection(default=self.ssid, choices = self.apList) + else: + try: + wlanconfig.essid = ConfigSelection(defalut = self.apList[0], choices = self.apList) + except: + wlanconfig.essid = ConfigSelection(choices = self.apList) + if self.ssid is not None: + wlanconfig.hiddenessid = ConfigText(default = self.ssid, visible_width = 50, fixed_size = False) + else: + wlanconfig.hiddenessid = ConfigText(default = "", visible_width = 50, fixed_size = False) self.createConfig() - def scanAPFailed(self): - self.session.openWithCallback(self.keyCancel ,MessageBox, _("Scan AP Failed"), MessageBox.TYPE_ERROR,10) + def emptyListMsg(self): + self.session.open(MessageBox, _("No AP detected."), type = MessageBox.TYPE_INFO, timeout = 10) def keyLeft(self): ConfigListScreen.keyLeft(self) @@ -619,11 +601,6 @@ class WlanConfig(Screen, ConfigListScreen, HelpableScreen): return self.checkNetworkShares() -# def checkNetworkShares(self,ret = False): -# if ret == False: -# if self["config"].getCurrent() == self.keyEntry or self["config"].getCurrent() == self.hiddenessidEntry : -# self["config"].getCurrent()[1].onSelect(self.session) -# return def checkNetworkShares(self): if not self.Console: self.Console = Console() @@ -632,7 +609,7 @@ class WlanConfig(Screen, ConfigListScreen, HelpableScreen): def checkSharesFinished(self, result, retval, extra_args): callback = extra_args - print "checkMountsFinished : result : \n",result +# print "checkMountsFinished : result : \n",result networks = ['nfs','smbfs','ncp','coda'] for line in result.splitlines(): split = line.strip().split(' ',3) @@ -677,15 +654,13 @@ class WlanConfig(Screen, ConfigListScreen, HelpableScreen): self.wpaphraseconsole.ePopen(cmd, self.parseWpaPhrase, self.writeWpasupplicantConf) def parseWpaPhrase(self, result, retval, extra_args): - print "parseWpaPhrase" (writewlanconfig) = extra_args if self.wpaphraseconsole is not None: - print "retval = ",retval if retval == 0: self.wpaphraseconsole.killAll() self.wpaphraseconsole = None - print "parseWpaPhrase result : " - print result +# print "parseWpaPhrase result : " +# print result psk = None for line in result.splitlines(): if line.find('ssid') == -1 and line.find('#psk=') != -1: @@ -694,7 +669,6 @@ class WlanConfig(Screen, ConfigListScreen, HelpableScreen): psk = line if psk: writewlanconfig(psk,plainpwd) -# writewlanconfig(None) else: writewlanconfig(None) else: @@ -708,17 +682,14 @@ class WlanConfig(Screen, ConfigListScreen, HelpableScreen): contents += "ctrl_interface=/var/run/wpa_supplicant\n" contents += "eapol_version=1\n" contents += "fast_reauth=1\n" - - if wlanconfig.essid.value == 'Input hidden ESSID': - contents += "ap_scan=2\n" - else : - contents += "ap_scan=1\n" + contents += "ap_scan=1\n" contents += "network={\n" if wlanconfig.essid.value == 'Input hidden ESSID': contents += "\tssid=\""+wlanconfig.hiddenessid.value+"\"\n" + contents += "\tscan_ssid=1\n" else : contents += "\tssid=\""+wlanconfig.essid.value+"\"\n" - contents += "\tscan_ssid=0\n" + contents += "\tscan_ssid=0\n" if wlanconfig.encrypt.value == "on": if wlanconfig.method.value =="wep": contents += "\tkey_mgmt=NONE\n" @@ -728,8 +699,8 @@ class WlanConfig(Screen, ConfigListScreen, HelpableScreen): else: contents += wlanconfig.key.value+"\n" else: - print "plainpwd : ",plainpwd - print "passphrasekey : ",passphrasekey +# print "plainpwd : ",plainpwd +# print "passphrasekey : ",passphrasekey if wlanconfig.method.value == "wpa": contents += "\tkey_mgmt=WPA-PSK\n" contents += "\tproto=WPA\n" @@ -899,10 +870,8 @@ class WlanScanAp(Screen,HelpableScreen): self.session = session self.iface = iface self.wlanscanap = None -# self.scanAPcount = 5 - self.scanAPcount = 1 self.apList = {} - self.SetApList = [] + self.setApList = [] self["WizardActions"] = HelpableActionMap(self, "WizardActions", { @@ -910,7 +879,7 @@ class WlanScanAp(Screen,HelpableScreen): "down": (self.down, _("move down to next entry")), "left": (self.left, _("move up to first entry")), "right": (self.right, _("move down to last entry")), - }) + }, -2) self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions", { @@ -922,21 +891,11 @@ class WlanScanAp(Screen,HelpableScreen): { "red": (self.close, _("exit")), "green": (self.ok, "select AP"), + "yellow": (self.restartScanAP, "restart scan AP"), "blue": (self.startWlanConfig, "Edit Wireless settings"), }) - self["actions"] = NumberActionMap(["WizardActions","ShortcutActions"], - { - "ok": self.ok, - "back": self.close, - "up": self.up, - "down": self.down, - "red": self.close, - "left": self.left, - "right": self.right, - }, -2) - - self["menulist"] = MenuList(self.SetApList) + self["menulist"] = MenuList(self.setApList) self["key_red"] = StaticText(_("Close")) self["key_green"] = StaticText(_("Select")) self["key_blue"] = StaticText(_("EditSetting")) @@ -946,12 +905,16 @@ class WlanScanAp(Screen,HelpableScreen): self["Frequency"] = StaticText(" ") self["Encryption key"] = StaticText(" ") self["BitRate"] = StaticText(" ") - self.scanAPFailedTimer = eTimer() - self.scanAPFailedTimer.callback.append(self.scanAPFailed) + self.oldInterfaceState = iNetwork.getAdapterAttribute(self.iface, "up") + self.getAplistTimer = eTimer() + self.getAplistTimer.callback.append(self.getApList) self.scanAplistTimer = eTimer() self.scanAplistTimer.callback.append(self.scanApList) - self.scanAplistTimer.start(100,True) - self.onClose.append(self.cleanup) + self.emptyListMsgTimer = eTimer() + self.emptyListMsgTimer.callback.append(self.emptyListMsg) + self.apList = {} + self.onClose.append(self.__onClose) + self.getAplistTimer.start(100,True) def left(self): self["menulist"].pageUp() @@ -976,111 +939,90 @@ class WlanScanAp(Screen,HelpableScreen): self.close() def startWlanConfig(self): - global selectap selectAp=self["menulist"].getCurrent()[0] - selectap = selectAp - self.cleanup() - self.session.open(WlanConfig,self.iface) -# self.close() + self.close(selectAp) - def scanApList(self): - # print "self.scanAPcount : ",self.scanAPcount + def getApList(self): self.apList = {} - self.SetApList = [] + self.setApList = [] self.configurationmsg = self.session.open(MessageBox, _("Please wait for scanning AP..."), type = MessageBox.TYPE_INFO, enable_input = False) - os_system('ifconfig '+self.iface+" up") - self.wlanscanap = Console() - cmd = "iwlist "+self.iface+" scan" - print cmd - self.wlanscanap.ePopen(cmd, self.iwlistfinnished,self.APListParse) - - def iwlistfinnished(self, result, retval,extra_args): -# print "iwlistfinnished" - (statecallback) = extra_args - if self.wlanscanap is not None: -# print "retval = ",retval - if retval == 0: - self.wlanscanap = None - content = result.splitlines() - first = content[0].split() - completed = False - for x in first: - if x == 'completed': - completed = True - if completed == True: - statecallback(result) - else: - statecallback(0) - else: - statecallback(0) + self.scanAplistTimer.start(100,True) - def APListParse(self,data): - if data == 0: - if self.scanAPcount >0: - self.scanAPcount -=1 - self.configurationmsg.close(True) - time.sleep(3) - self.scanAplistTimer.start(500,True) - return - else: - self.configurationmsg.close(True) - self.scanAPFailedTimer.start(500,True) - return - else: -# print data - self.apList = {} -# self.scanAPcount =5 - self.scanAPcount =0 - list = data.splitlines() - for line in list: -# print "line : ",line - if line.strip().startswith("Cell"): # Cell 01 - Address: 00:26:66:5C:EF:24 - parts = line.strip().split(" ") - current_ap_id = int(parts[1]) - self.apList[current_ap_id]={} - self.apList[current_ap_id]["Address"]=parts[4] - elif line.strip().startswith("ESSID"): - self.apList[current_ap_id]["ESSID"]=line.strip()[6:].strip('"') - self.SetApList.append( (self.apList[current_ap_id]["ESSID"],current_ap_id) ) - elif line.strip().startswith("Protocol"): - self.apList[current_ap_id]["Protocol"]=line.strip()[9:] - elif line.strip().startswith("Frequency"): - self.apList[current_ap_id]["Frequency"]=line.strip()[10:] - elif line.strip().startswith("Encryption key"): - self.apList[current_ap_id]["Encryption key"]=line.strip()[15:] - elif line.strip().startswith("Bit Rates"): - self.apList[current_ap_id]["BitRate"]=line.strip()[10:] - print self.apList - print len(self.apList) + def scanApList(self): + if self.oldInterfaceState is not True: + os_system("ifconfig "+self.iface+" up") + iNetwork.setAdapterAttribute(self.iface, "up", True) + Iwscanresult = None + wirelessObj = Wireless(self.iface) + try: + Iwscanresult = wirelessObj.scan() + except IOError: + print "%s Interface doesn't support scanning.."%self.iface +# self.session.open(MessageBox, "%s Interface doesn't support scanning.."%self.iface, MessageBox.TYPE_ERROR,10) self.configurationmsg.close(True) + if Iwscanresult is not None: + (num_channels, frequencies) = wirelessObj.getChannelInfo() + index = 1 + for ap in Iwscanresult: + self.apList[index] = {} + self.apList[index]["Address"] = ap.bssid + if len(ap.essid) == 0: + self.apList[index]["ESSID"] = "" + else: + self.apList[index]["ESSID"] = ap.essid + self.setApList.append( (self.apList[index]["ESSID"], index) ) + self.apList[index]["Protocol"] = ap.protocol + self.apList[index]["Frequency"] = wirelessObj._formatFrequency(ap.frequency.getFrequency()) + try: + self.apList[index]["Channel"] = frequencies.index(self.apList[index]["Frequency"] + 1) + except: + self.apList[index]["Channel"] = "Unknown" + + self.apList[index]["Quality"] = "%s/%s" % \ + ( ap.quality.quality, wirelessObj.getQualityMax().quality ) + self.apList[index]["Signal Level"] = "%s/%s" % \ + ( ap.quality.getSignallevel(), "100" ) + self.apList[index]["Noise Level"] = "%s/%s" % \ + ( ap.quality.getNoiselevel(), "100" ) + +# get encryption key on/off + key_status = "Unknown" + if (ap.encode.flags & pythonwifi.flags.IW_ENCODE_DISABLED): + key_status = "off" + elif (ap.encode.flags & pythonwifi.flags.IW_ENCODE_NOKEY): + if (ap.encode.length <= 0): + key_status = "on" + self.apList[index]["Encryption key"] = key_status + self.apList[index]["BitRate"] = wirelessObj._formatBitrate(ap.rate[-1][-1]) + index += 1 +# print self.apList +# print self.setApList self.displayApInfo() - - def scanAPFailed(self): - self.session.openWithCallback(self.ScanAPclose,MessageBox, _("Scan AP Failed"), MessageBox.TYPE_ERROR,10) + if len(self.apList) == 0: + self.emptyListMsgTimer.start(100,True) def displayApInfo(self): if len(self.apList) >0: - self["menulist"].setList(self.SetApList) + self["menulist"].setList(self.setApList) index = self["menulist"].getCurrent()[1] for key in ["Address", "ESSID", "Protocol", "Frequency", "Encryption key", "BitRate"]: if self.apList[index].has_key(key): self[key].setText((key+": "+self.apList[index][key])) else: self[key].setText((key+": None")) - else: - self.session.openWithCallback(self.ScanAPclose, MessageBox, _("No AP detected."), type = MessageBox.TYPE_INFO, timeout = 10) - def ScanAPclose(self,data): - self.close() + def emptyListMsg(self): + self.session.open(MessageBox, _("No AP detected."), type = MessageBox.TYPE_INFO, timeout = 10) + self["Address"].setText(_("No AP detected.")) + self["ESSID"].setText(_("")) - def cleanup(self): - self.stopwlanscanapConsole() + def restartScanAP(self): + self.getAplistTimer.start(100,True) - def stopwlanscanapConsole(self): - if self.wlanscanap is not None: - if len(self.wlanscanap.appContainers): - for name in self.wlanscanap.appContainers.keys(): - self.wlanscanap.kill(name) + def __onClose(self): + if self.oldInterfaceState is False: + iNetwork.setAdapterAttribute(self.iface, "up", False) + iNetwork.deactivateInterface(self.iface) class NetworkAdapterTest(Screen): def __init__(self, session,iface):