gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-01-08 06:44:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix crash with hidden essids if it was stored in wireless-settings.conf as None.

Browse Source 
Only trigger a wpa_supplicant rescan once when connecting.
This commit is contained in:
Dan O'Reilly
2009-04-04 13:43:29 -04:00
parent b79151ef07
commit 665fe76885
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wicd/wicd-daemon.py
View File

@@ -1170,18 +1170,17 @@ class WirelessDaemon(dbus.service.Object):
cur_network["has_profile"] = True cur_network["has_profile"] = True
# Read the essid because we need to name those hidden
# wireless networks now - but only read it if it is hidden.
if cur_network["hidden"]:
cur_network["essid"] = self.config.get(section, "essid")
if cur_network["essid"] in ["", "Hidden", "<hidden>"]:
cur_network["essid"] = "<hidden>"
for x in self.config.options(section): for x in self.config.options(section):
if not cur_network.has_key(x) or x.endswith("script"): if not cur_network.has_key(x) or x.endswith("script"):
cur_network[x] = misc.Noneify(self.config.get(section, x)) cur_network[x] = misc.Noneify(self.config.get(section, x))
for option in ['use_static_dns', 'use_global_dns', 'encryption', for option in ['use_static_dns', 'use_global_dns', 'encryption',
'use_settings_globally']: 'use_settings_globally']:
cur_network[option] = bool(cur_network.get(option)) cur_network[option] = bool(cur_network.get(option))
# Read the essid because we need to name those hidden
# wireless networks now - but only read it if it is hidden.
if cur_network["hidden"]:
if cur_network.get("essid") in ["", "Hidden", "<hidden>", None]:
cur_network["essid"] = "<hidden>"
return "100: Loaded Profile" return "100: Loaded Profile"
@dbus.service.method('org.wicd.daemon.wireless') @dbus.service.method('org.wicd.daemon.wireless')

7
wicd/wnettools.py
View File

@@ -1094,7 +1094,8 @@ class BaseWirelessInterface(BaseInterface):
except (UnicodeDecodeError, UnicodeEncodeError): except (UnicodeDecodeError, UnicodeEncodeError):
print 'Unicode problem with current network essid, ignoring!!' print 'Unicode problem with current network essid, ignoring!!'
return None return None
if ap['essid'] in ['<hidden>', ""]: if ap['essid'] in ['<hidden>', "", None]:
print 'hidden'
ap['hidden'] = True ap['hidden'] = True
ap['essid'] = "<hidden>" ap['essid'] = "<hidden>"
else: else:
@@ -1176,6 +1177,7 @@ class BaseWirelessInterface(BaseInterface):
MAX_TIME = 35 MAX_TIME = 35
MAX_DISCONNECTED_TIME = 3 MAX_DISCONNECTED_TIME = 3
disconnected_time = 0 disconnected_time = 0
forced_rescan = False
while (time.time() - auth_time) < MAX_TIME: while (time.time() - auth_time) < MAX_TIME:
cmd = '%s -i %s status' % (self.wpa_cli_cmd, self.iface) cmd = '%s -i %s status' % (self.wpa_cli_cmd, self.iface)
output = misc.Run(cmd) output = misc.Run(cmd)
@@ -1187,11 +1189,12 @@ class BaseWirelessInterface(BaseInterface):
return False return False
if result == "COMPLETED": if result == "COMPLETED":
return True return True
elif result == "DISCONNECTED": elif result == "DISCONNECTED" and not forced_rescan:
disconnected_time += 1 disconnected_time += 1
if disconnected_time > MAX_DISCONNECTED_TIME: if disconnected_time > MAX_DISCONNECTED_TIME:
disconnected_time = 0 disconnected_time = 0
# Force a rescan to get wpa_supplicant moving again. # Force a rescan to get wpa_supplicant moving again.
forced_rescan = True
self._ForceSupplicantScan() self._ForceSupplicantScan()
MAX_TIME += 5 MAX_TIME += 5
else: else: