1
0
mirror of https://github.com/gryf/wicd.git synced 2025-12-23 14:42:29 +01:00

Fix bug where interface name was being passed to the dhcp client executable twice.

Tweak connect/disconnect to not kill any processes.  Instead it releases leases and terminates the wpa_supplicant instance through its ctrl interface.  This should make wicd handle multiple connections better.
This commit is contained in:
Dan O'Reilly
2009-02-06 19:26:09 -05:00
parent cbbf438f34
commit 450677c83d
5 changed files with 66 additions and 45 deletions

View File

@@ -379,12 +379,12 @@ class WicdDaemon(dbus.service.Object):
print 'canceling connection attempt'
if self.wifi.connecting_thread:
self.wifi.connecting_thread.should_die = True
self.wifi.StopDHCP()
self.wifi.ReleaseDHCP()
self.wifi.StopWPA()
self.wifi.connecting_thread.connect_result = 'aborted'
if self.wired.connecting_thread:
self.wired.connecting_thread.should_die = True
self.wired.StopDHCP()
self.wired.ReleaseDHCP()
self.wired.connecting_thread.connect_result = 'aborted'
@dbus.service.method('org.wicd.daemon')