projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0ca21ce
)
WirelessLanSetup : block wireless module setup in master mode.
author
Chang.H.S
<jhs@dev3>
Fri, 4 May 2012 05:08:01 +0000
(14:08 +0900)
committer
Chang.H.S
<jhs@dev3>
Fri, 4 May 2012 06:21:01 +0000
(15:21 +0900)
lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py
patch
|
blob
|
history
diff --git
a/lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py
b/lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py
index
233662a
..
3207bb8
100755
(executable)
--- a/
lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py
+++ b/
lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py
@@
-74,21
+74,38
@@
class WlanSelection(Screen,HelpableScreen):
iNetwork.msgPlugins()
iNetwork.getInterfaces()
iNetwork.msgPlugins()
iNetwork.getInterfaces()
+ def checkIfaceMode(self, iface = None):
+ try:
+ obj = Wireless(iface)
+ if obj.getMode() == 'Master':
+ return -1
+ else:
+ return 0
+ except:
+ return -2
+
def ok(self):
# print len(self["menulist"].list)
if len(self["menulist"].list) == 0:
self.session.open(MessageBox, (_("Can not find any WirelessLan Module\n")),MessageBox.TYPE_ERROR,5 )
return
def ok(self):
# print len(self["menulist"].list)
if len(self["menulist"].list) == 0:
self.session.open(MessageBox, (_("Can not find any WirelessLan Module\n")),MessageBox.TYPE_ERROR,5 )
return
- iface
s
=self["menulist"].getCurrent()[1]
- if iface
s
== None:
- pass
+ iface=self["menulist"].getCurrent()[1]
+ if iface == None:
+ return
else:
else:
- self.session.open(WlanSetup,ifaces)
+ ret = self.checkIfaceMode(iface)
+ if ret == -2:
+ self.session.open(MessageBox, (_("Invalid WirelessLan Module.\n")),MessageBox.TYPE_ERROR,5 )
+ return
+ elif ret == -1:
+ self.session.open(MessageBox, (_("Can not setup WirelessLan Module in 'AP Mode'\n")),MessageBox.TYPE_ERROR,5 )
+ return
+ self.session.open(WlanSetup, iface)
def getWlandevice(self):
list = []
for x in iNetwork.getInstalledAdapters():
def getWlandevice(self):
list = []
for x in iNetwork.getInstalledAdapters():
- if x.startswith('eth'):
+ if x.startswith('eth')
or x.startswith('br') or x.startswith('mon')
:
continue
description=self.getAdapterDescription(x)
if description == "Unknown network adapter":
continue
description=self.getAdapterDescription(x)
if description == "Unknown network adapter":