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

Changed misc.Run to use subprocess.Popen instead of os.popen. Also altered Run to optionally return a pipe to the command run, instead of just the output.

Browse Source 
The output of dhclient is now parsed by wicd and used to determine why the connection failed.
All the wpa_supplicant conf files will now generate a ctrl_interface, so that they can be accessed by wpa_cli.  wpa_cli now is used by wicd to attempt to determine is wpa_supplicant authentication was successful.  This is still experimental, and might have to be tweaked to work properly.
If wicd.py is started and the daemon isn't present, it will autolaunch it by calling launchdaemon.sh, instead of asking the user to start the daemon manually.
Cleaned up some comments, formatting, etc.
Probably a couple of other little bug fixes I'm forgetting.
This commit is contained in:
imdano
2008-01-06 13:55:23 +00:00
parent 4e0dfc8e22
commit d64850dfd3
16 changed files with 354 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
networking.py
View File

@@ -48,6 +48,7 @@ import misc
import wnettools
import wpath
import os
import time
if __name__ == '__main__':
wpath.chdir(__file__)
@@ -104,6 +105,8 @@ class ConnectThread(threading.Thread):
self.wireless_interface = wireless
self.wired_interface = wired
self.is_connecting = False
self.is_aborted = False
self.abort_msg = None
self.before_script = before_script
self.after_script = after_script
self.disconnect_script = disconnect_script
@@ -123,8 +126,10 @@ class ConnectThread(threading.Thread):
"""
self.lock.acquire()
self.connecting_message = status
self.lock.release()
try:
self.connecting_message = status
finally:
self.lock.release()
def GetStatus(self):
@@ -135,8 +140,10 @@ class ConnectThread(threading.Thread):
"""
self.lock.acquire()
message = self.connecting_message
self.lock.release()
try:
message = self.connecting_message
finally:
self.lock.release()
return message
def connect_aborted(self, reason):
@@ -147,11 +154,12 @@ class ConnectThread(threading.Thread):
"""
self.SetStatus(reason)
self.is_aborted = True
self.abort_msg = reason
self.is_connecting = False
print 'exiting connection thread'
class Wireless(Controller):
""" A wrapper for common wireless interface functions. """
@@ -394,7 +402,7 @@ class WirelessConnectThread(ConnectThread):
return
# Execute pre-connection script if necessary
if self.before_script != '' and self.before_script != None:
if self.before_script != '' and self.before_script is not None:
print 'Executing pre-connection script'
misc.ExecuteScript(self.before_script)
@@ -427,7 +435,7 @@ class WirelessConnectThread(ConnectThread):
# Check to see if we need to generate a PSK (only for non-ralink
# cards).
if self.wpa_driver != 'ralink legacy':
if not self.network.get('key') == None:
if not self.network.get('key') is None:
self.SetStatus('generating_psk')
print 'Generating psk...'
@@ -437,10 +445,11 @@ class WirelessConnectThread(ConnectThread):
misc.Run('wpa_passphrase "' + self.network['essid'] +
'" "' + self.network['key'] + '"'))
# Generate the wpa_supplicant file...
if not self.network.get('enctype') == None:
if self.network.get('enctype') is not None:
self.SetStatus('generating_wpa_config')
print 'Attempting to authenticate...'
wiface.Authenticate(self.network)
auth_time = time.time()
if self.should_die:
wiface.Up()
@@ -464,16 +473,30 @@ class WirelessConnectThread(ConnectThread):
self.connect_aborted('aborted')
return
if self.network.get('enctype') is not None:
# Allow some time for wpa_supplicant to associate.
# Hopefully 3 sec is enough. If it proves to be inconsistent,
# we might have to try to monitor wpa_supplicant more closely,
# so we can tell exactly when it fails/succeeds.
elapsed = time.time() - auth_time
if elapsed < 3 and elapsed >= 0:
time.sleep(3 - elapsed)
# Make sure wpa_supplicant was able to associate.
if not wiface.ValidateAuthentication():
self.connect_aborted('bad_pass')
return
wiface.SetMode(self.network['mode'])
wiface.Associate(self.network['essid'],
self.network['channel'], self.network['bssid'])
wiface.Associate(self.network['essid'], self.network['channel'],
self.network['bssid'])
# Authenticate after association for Ralink legacy cards.
if self.wpa_driver == 'ralink legacy':
if self.network.get('key') != None:
if self.network.get('key') is not None:
wiface.Authenticate(self.network)
if not self.network.get('broadcast') == None:
if self.network.get('broadcast') is not None:
self.SetStatus('setting_broadcast_address')
print 'Setting the broadcast address...' + self.network['broadcast']
@@ -483,18 +506,20 @@ class WirelessConnectThread(ConnectThread):
self.connect_aborted('aborted')
return
if not self.network.get('ip') == None:
if self.network.get('ip') is not None:
self.SetStatus('setting_static_ip')
print 'Setting static IP : ' + self.network['ip']
wiface.SetAddress(self.network['ip'], self.network['netmask'])
print 'Setting default gateway : ' + self.network['gateway']
wiface.SetDefaultRoute(self.network['gateway'])
else:
# Run dhcp...
# Run DHCP...
self.SetStatus('running_dhcp')
print "Running DHCP"
if not self.should_die:
wiface.StartDHCP()
dhcp_status = wiface.StartDHCP()
if dhcp_status in ['no_dhcp_offers', 'dhcp_failed']:
self.connect_aborted(dhcp_status)
return
if ((self.network.get('dns1') or self.network.get('dns2') or
self.network.get('dns3')) and self.network.get('use_static_dns')):
@@ -697,8 +722,10 @@ class WiredConnectThread(ConnectThread):
# Run dhcp...
self.SetStatus('running_dhcp')
print "Running DHCP"
if not self.should_die:
liface.StartDHCP()
dhcp_status = liface.StartDHCP()
if dhcp_status in ['no_dhcp_offers', 'dhcp_failed']:
self.connect_aborted(dhcp_status)
return
if ((self.network.get('dns1') or self.network.get('dns2') or
self.network.get('dns3')) and self.network.get('use_static_dns')):