git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/obi/bug_724_wpa_modes' into acid-burn/networking_changes
[enigma2.git]
/
lib
/
python
/
Plugins
/
SystemPlugins
/
WirelessLan
/
Wlan.py
diff --git
a/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
b/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
index baefd435846599e84293c55edb3363270f228471..a64a5a6d5277e782fde1950f9d19b2d8271f0932 100755
(executable)
--- a/
lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
+++ b/
lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
@@
-265,7
+265,7
@@
class wpaSupplicant:
fp.write('\tssid="'+essid+'"\n')
fp.write('\tscan_ssid=0\n')
if encrypted:
fp.write('\tssid="'+essid+'"\n')
fp.write('\tscan_ssid=0\n')
if encrypted:
- if encryption
== 'WPA' or encryption == 'WPA2' or encryption == 'WPA/WPA2'
:
+ if encryption
in ('WPA', 'WPA2', 'WPA/WPA2')
:
fp.write('\tkey_mgmt=WPA-PSK\n')
if encryption == 'WPA':
fp.write('\tkey_mgmt=WPA-PSK\n')
if encryption == 'WPA':
@@
-273,15
+273,14
@@
class wpaSupplicant:
fp.write('\tpairwise=TKIP\n')
fp.write('\tgroup=TKIP\n')
elif encryption == 'WPA2':
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('\tproto=WPA RSN\n')
fp.write('\tpairwise=CCMP TKIP\n')
- fp.write('\tgroup=CCMP TKIP\n')
- else:
- fp.write('\tproto=WPA WPA2\n')
- fp.write('\tpairwise=CCMP\n')
- fp.write('\tgroup=TKIP\n')
+ fp.write('\tgroup=CCMP TKIP\n')
fp.write('\tpsk="'+psk+'"\n')
fp.write('\tpsk="'+psk+'"\n')
-
elif encryption == 'WEP':
fp.write('\tkey_mgmt=NONE\n')
if wepkeytype == 'ASCII':
elif encryption == 'WEP':
fp.write('\tkey_mgmt=NONE\n')
if wepkeytype == 'ASCII':
@@
-408,6
+407,7
@@
class Status:
def stopWlanConsole(self):
if self.WlanConsole is not None:
print "killing self.WlanConsole"
def stopWlanConsole(self):
if self.WlanConsole is not None:
print "killing self.WlanConsole"
+ self.WlanConsole.killAll()
self.WlanConsole = None
def getDataForInterface(self, iface, callback = None):
self.WlanConsole = None
def getDataForInterface(self, iface, callback = None):