gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-20 04:48:00 +01:00
Code Issues Projects Releases Wiki Activity

Fixed problems with wpa_supplicant driver not being passed to wnettools correctly in networking.py.

Browse Source 
Fixed bug where connect threads could crash if debug was on and dhcp failed.
This commit is contained in:
imdano
2008-04-19 08:00:44 +00:00
parent b72f4b2803
commit 9662012fef
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
networking.py
View File

@@ -336,7 +336,7 @@ class Wireless(Controller):
Controller.__init__(self) Controller.__init__(self)
self._wpa_driver = None self._wpa_driver = None
self.wiface = wnettools.WirelessInterface(self.wireless_interface, self.wiface = wnettools.WirelessInterface(self.wireless_interface,
self.wpa_driver) self.debug, self.wpa_driver)
def set_wpa_driver(self, value): def set_wpa_driver(self, value):
self._wpa_driver = value self._wpa_driver = value
@@ -607,8 +607,8 @@ class WirelessConnectThread(ConnectThread):
""" """
wiface = wnettools.WirelessInterface(self.wireless_interface, wiface = wnettools.WirelessInterface(self.wireless_interface,
self.wpa_driver) self.debug, self.wpa_driver)
liface = wnettools.WiredInterface(self.wired_interface) liface = wnettools.WiredInterface(self.wired_interface, self.debug)
self.is_connecting = True self.is_connecting = True
# Run pre-connection script. # Run pre-connection script.
@@ -664,7 +664,7 @@ class WirelessConnectThread(ConnectThread):
self.SetStatus('done') self.SetStatus('done')
print 'Connecting thread exiting.' print 'Connecting thread exiting.'
if self.debug: if self.debug:
print "IP Address is: " + wiface.GetIP(fast=True) print "IP Address is: " + str(wiface.GetIP(fast=True))
self.is_connecting = False self.is_connecting = False
def generate_psk_and_authenticate(self, wiface): def generate_psk_and_authenticate(self, wiface):
@@ -831,8 +831,8 @@ class WiredConnectThread(ConnectThread):
5. Run post-connection script. 5. Run post-connection script.
""" """
wiface = wnettools.WirelessInterface(self.wireless_interface) wiface = wnettools.WirelessInterface(self.wireless_interface, self.debug)
liface = wnettools.WiredInterface(self.wired_interface) liface = wnettools.WiredInterface(self.wired_interface, self.debug)
self.is_connecting = True self.is_connecting = True
@@ -865,5 +865,5 @@ class WiredConnectThread(ConnectThread):
self.SetStatus('done') self.SetStatus('done')
print 'Connecting thread exiting.' print 'Connecting thread exiting.'
if self.debug: if self.debug:
print "IP Address is: " + liface.GetIP(fast=True) print "IP Address is: " + str(liface.GetIP(fast=True))
self.is_connecting = False self.is_connecting = False