gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-21 05:18:02 +01:00
Code Issues Projects Releases Wiki Activity

- Replace some tabs that snuck in with spaces.

Browse Source 
- Try to validate successful association with static IPs by pinging the gateway specified.
This commit is contained in:
Dan O'Reilly
2009-03-21 16:28:40 -04:00
parent 518e0ec358
commit 34832775c8
6 changed files with 132 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
wicd/backends/be-ioctl.py
View File

@@ -79,13 +79,13 @@ SIOCGIFFLAGS = 0x8913
def get_iw_ioctl_result(iface, call): def get_iw_ioctl_result(iface, call):
""" Makes the given ioctl call and returns the results. """ Makes the given ioctl call and returns the results.
Keyword arguments: Keyword arguments:
call -- The ioctl call to make call -- The ioctl call to make
Returns: Returns:
The results of the ioctl call. The results of the ioctl call.
""" """
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
buff = array.array('c', '\0' * 32) buff = array.array('c', '\0' * 32)
@@ -118,7 +118,7 @@ class Interface(wnettools.BaseInterface):
wnettools.BaseInterface.__init__(self, iface, verbose) wnettools.BaseInterface.__init__(self, iface, verbose)
self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
self.Check() self.Check()
def CheckWirelessTools(self): def CheckWirelessTools(self):
""" Check for the existence needed wireless tools """ """ Check for the existence needed wireless tools """
# We don't need any external apps so just return # We don't need any external apps so just return
@@ -138,15 +138,15 @@ class Interface(wnettools.BaseInterface):
return None return None
except OSError: except OSError:
return None return None
return socket.inet_ntoa(raw_ip[20:24]) return socket.inet_ntoa(raw_ip[20:24])
def IsUp(self): def IsUp(self):
""" Determines if the interface is up. """ Determines if the interface is up.
Returns: Returns:
True if the interface is up, False otherwise. True if the interface is up, False otherwise.
""" """
if not self.iface: return False if not self.iface: return False
data = (self.iface + '\0' * 16)[:18] data = (self.iface + '\0' * 16)[:18]
@@ -156,7 +156,7 @@ class Interface(wnettools.BaseInterface):
if self.verbose: if self.verbose:
print "SIOCGIFFLAGS failed: " + str(e) print "SIOCGIFFLAGS failed: " + str(e)
return False return False
flags, = struct.unpack('H', result[16:18]) flags, = struct.unpack('H', result[16:18])
return bool(flags & 1) return bool(flags & 1)
@@ -176,14 +176,14 @@ class WiredInterface(Interface, wnettools.BaseWiredInterface):
def GetPluggedIn(self): def GetPluggedIn(self):
""" Get the current physical connection state. """ Get the current physical connection state.
The method will first attempt to use ethtool do determine The method will first attempt to use ethtool do determine
physical connection state. Should ethtool fail to run properly, physical connection state. Should ethtool fail to run properly,
mii-tool will be used instead. mii-tool will be used instead.
Returns: Returns:
True if a link is detected, False otherwise. True if a link is detected, False otherwise.
""" """
if not self.iface: return False if not self.iface: return False
if self.ethtool_cmd and self.link_detect in [misc.ETHTOOL, misc.AUTO]: if self.ethtool_cmd and self.link_detect in [misc.ETHTOOL, misc.AUTO]:
@@ -197,10 +197,10 @@ class WiredInterface(Interface, wnettools.BaseWiredInterface):
def _eth_get_plugged_in(self): def _eth_get_plugged_in(self):
""" Use ethtool to determine the physical connection state. """ Use ethtool to determine the physical connection state.
Returns: Returns:
True if a link is detected, False otherwise. True if a link is detected, False otherwise.
""" """
if not self.IsUp(): if not self.IsUp():
self.Up() self.Up()
@@ -216,19 +216,19 @@ class WiredInterface(Interface, wnettools.BaseWiredInterface):
print 'SIOCETHTOOL failed: ' + str(e) print 'SIOCETHTOOL failed: ' + str(e)
return False return False
return bool(buff.tolist()[1]) return bool(buff.tolist()[1])
def _mii_get_plugged_in(self): def _mii_get_plugged_in(self):
""" Use mii-tool to determine the physical connection state. """ Use mii-tool to determine the physical connection state.
Returns: Returns:
True if a link is detected, False otherwise. True if a link is detected, False otherwise.
""" """
if not self.IsUp(): if not self.IsUp():
self.Up() self.Up()
time.sleep(2.5) time.sleep(2.5)
buff = struct.pack('16shhhh', (self.iface + '\0' * 16)[:16], 0, 1, buff = struct.pack('16shhhh', (self.iface + '\0' * 16)[:16], 0, 1,
0x0004, 0) 0x0004, 0)
try: try:
result = fcntl.ioctl(self.sock.fileno(), SIOCGMIIPHY, buff) result = fcntl.ioctl(self.sock.fileno(), SIOCGMIIPHY, buff)
except IOError, e: except IOError, e:
@@ -253,7 +253,7 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
wpa_driver) wpa_driver)
Interface.__init__(self, iface, verbose) Interface.__init__(self, iface, verbose)
self.scan_iface = None self.scan_iface = None
def GetNetworks(self): def GetNetworks(self):
""" Get a list of available wireless networks. """ Get a list of available wireless networks.
@@ -267,14 +267,14 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
except iwscan.error, e: except iwscan.error, e:
print "GetNetworks caught an exception: %s" % e print "GetNetworks caught an exception: %s" % e
return [] return []
try: try:
results = self.scan_iface.Scan() results = self.scan_iface.Scan()
except iwscan.error, e: except iwscan.error, e:
print "ERROR: %s" print "ERROR: %s"
return [] return []
return filter(None, [self._parse_ap(cell) for cell in results]) return filter(None, [self._parse_ap(cell) for cell in results])
def _parse_ap(self, cell): def _parse_ap(self, cell):
""" Parse a single cell from the python-iwscan list. """ """ Parse a single cell from the python-iwscan list. """
ap = {} ap = {}
@@ -283,22 +283,22 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
except UnicodeError: except UnicodeError:
print 'Unicode problem with the current network essid, ignoring!!' print 'Unicode problem with the current network essid, ignoring!!'
return None return None
if ap['essid'] in [ "", '<hidden>']: if ap['essid'] in [ "", '<hidden>']:
ap['essid'] = '<hidden>' ap['essid'] = '<hidden>'
ap['hidden'] = True ap['hidden'] = True
else: else:
ap['hidden'] = False ap['hidden'] = False
if cell["channel"]: if cell["channel"]:
ap["channel"] = cell["channel"] ap["channel"] = cell["channel"]
else: else:
ap["channel"] = self._FreqToChannel(cell["frequency"]) ap["channel"] = self._FreqToChannel(cell["frequency"])
ap["bssid"] = cell["bssid"] ap["bssid"] = cell["bssid"]
ap["mode"] = cell["mode"] ap["mode"] = cell["mode"]
ap["bitrates"] = cell["bitrate"] ap["bitrates"] = cell["bitrate"]
if cell["enc"]: if cell["enc"]:
ap["encryption"] = True ap["encryption"] = True
if cell["ie"] and cell["ie"].get('type'): if cell["ie"] and cell["ie"].get('type'):
@@ -310,7 +310,7 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
ap['encryption_method'] = 'WEP' ap['encryption_method'] = 'WEP'
else: else:
ap["encryption"] = False ap["encryption"] = False
# Link Quality # Link Quality
ap['qual_found'] = True ap['qual_found'] = True
ap['quality'] = self._get_link_quality(cell['stats']) ap['quality'] = self._get_link_quality(cell['stats'])
@@ -324,9 +324,9 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
ap['strength'] = misc.RunRegex(signaldbm_pattern, cell["stats"]) ap['strength'] = misc.RunRegex(signaldbm_pattern, cell["stats"])
elif self.wpa_driver != RALINK_DRIVER: # This is already set for ralink elif self.wpa_driver != RALINK_DRIVER: # This is already set for ralink
ap['strength'] = -1 ap['strength'] = -1
return ap return ap
def _connect_to_wpa_ctrl_iface(self): def _connect_to_wpa_ctrl_iface(self):
""" Connect to the wpa ctrl interface. """ """ Connect to the wpa ctrl interface. """
ctrl_iface = '/var/run/wpa_supplicant' ctrl_iface = '/var/run/wpa_supplicant'
@@ -340,7 +340,7 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
else: else:
print "Couldn't find a wpa_supplicant ctrl_interface for iface %s" % self.iface print "Couldn't find a wpa_supplicant ctrl_interface for iface %s" % self.iface
return None return None
def ValidateAuthentication(self, auth_time): def ValidateAuthentication(self, auth_time):
""" Validate WPA authentication. """ Validate WPA authentication.
@@ -350,27 +350,27 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
NOTE: It's possible this could return False, NOTE: It's possible this could return False,
though in reality wpa_supplicant just isn't though in reality wpa_supplicant just isn't
finished yet. finished yet.
Keyword arguments: Keyword arguments:
auth_time -- The time at which authentication began. auth_time -- The time at which authentication began.
Returns: Returns:
True if wpa_supplicant authenticated succesfully, True if wpa_supplicant authenticated succesfully,
False otherwise. False otherwise.
""" """
error= "Unable to find ctrl_interface for wpa_supplicant. " + \ error= "Unable to find ctrl_interface for wpa_supplicant. " + \
"Could not validate authentication." "Could not validate authentication."
# Right now there's no way to do this for ralink drivers # Right now there's no way to do this for ralink drivers
if self.wpa_driver == RALINK_DRIVER: if self.wpa_driver == RALINK_DRIVER:
return True return True
wpa = self._connect_to_wpa_ctrl_iface() wpa = self._connect_to_wpa_ctrl_iface()
if not wpa: if not wpa:
print "Failed to open ctrl interface" print "Failed to open ctrl interface"
return False return False
MAX_TIME = 35 MAX_TIME = 35
MAX_DISCONNECTED_TIME = 3 MAX_DISCONNECTED_TIME = 3
disconnected_time = 0 disconnected_time = 0
@@ -380,15 +380,15 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
except: except:
print "wpa_supplicant status query failed." print "wpa_supplicant status query failed."
return False return False
if self.verbose: if self.verbose:
print 'wpa_supplicant ctrl_interface status query is %s' % str(status) print 'wpa_supplicant ctrl_interface status query is %s' % str(status)
try: try:
[result] = [l for l in status if l.startswith("wpa_state=")] [result] = [l for l in status if l.startswith("wpa_state=")]
except ValueError: except ValueError:
return False return False
result = result result = result
if result.endswith("COMPLETED"): if result.endswith("COMPLETED"):
return True return True
@@ -404,7 +404,7 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
print 'wpa_supplicant authentication may have failed.' print 'wpa_supplicant authentication may have failed.'
return False return False
def StopWPA(self): def StopWPA(self):
""" Terminates wpa_supplicant using its ctrl interface. """ """ Terminates wpa_supplicant using its ctrl interface. """
wpa = self._connect_to_wpa_ctrl_iface() wpa = self._connect_to_wpa_ctrl_iface()
@@ -433,7 +433,7 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
info[4] == 'WEP'): info[4] == 'WEP'):
print 'Setting up WEP' print 'Setting up WEP'
cmd = ''.join(['iwconfig ', self.iface, ' key ', cmd = ''.join(['iwconfig ', self.iface, ' key ',
network.get('key')]) network.get('key')])
if self.verbose: print cmd if self.verbose: print cmd
misc.Run(cmd) misc.Run(cmd)
else: else:
@@ -451,7 +451,7 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
key_name = 'WPAPSK' key_name = 'WPAPSK'
else: else:
print 'Unknown AuthMode, can\'t complete ' + \ print 'Unknown AuthMode, can\'t complete ' + \
'connection process!' 'connection process!'
return return
cmd_list = [] cmd_list = []
@@ -495,7 +495,7 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
print "SIOCGIWRATE failed: " + str(e) print "SIOCGIWRATE failed: " + str(e)
return "" return ""
f, e, x, x = struct.unpack(fmt, result[:size]) f, e, x, x = struct.unpack(fmt, result[:size])
return "%s %s" % ((f / 1000000), 'Mb/s') return "%s %s" % ((f / 1000000), 'Mb/s')
#def GetOperationalMode(self, iwconfig=None): #def GetOperationalMode(self, iwconfig=None):
# """ Get the operational mode for the interface. """ # """ Get the operational mode for the interface. """
@@ -524,7 +524,7 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
return int(strength) return int(strength)
else: else:
return None return None
def _get_max_strength(self): def _get_max_strength(self):
""" Gets the maximum possible strength from the wireless driver. """ """ Gets the maximum possible strength from the wireless driver. """
buff = array.array('c', '\0' * 700) buff = array.array('c', '\0' * 700)
@@ -544,7 +544,7 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
data = data[0:size] data = data[0:size]
values = struct.unpack(fmt, data) values = struct.unpack(fmt, data)
return values[12] return values[12]
def GetDBMStrength(self, iwconfig=None): def GetDBMStrength(self, iwconfig=None):
""" Get the dBm signal strength of the current network. """ Get the dBm signal strength of the current network.
@@ -572,4 +572,3 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
return None return None
return buff.strip('\x00') return buff.strip('\x00')

15
wicd/misc.py
View File

@@ -69,7 +69,8 @@ class WicdError(Exception):
__LANG = None __LANG = None
def Run(cmd, include_stderr=False, return_pipe=False, return_obj=False): def Run(cmd, include_stderr=False, return_pipe=False,
return_obj=False, return_retcode=True):
""" Run a command. """ Run a command.
Runs the given command, returning either the output Runs the given command, returning either the output
@@ -81,8 +82,10 @@ def Run(cmd, include_stderr=False, return_pipe=False, return_obj=False):
be included in the pipe to the cmd. be included in the pipe to the cmd.
return_pipe - Boolean specifying if a pipe to the return_pipe - Boolean specifying if a pipe to the
command should be returned. If it is command should be returned. If it is
false, all that will be returned is False, all that will be returned is
one output string from the command. one output string from the command.
return_obj - If True, Run will return the Popen object
for the command that was run.
""" """
global __LANG global __LANG
@@ -135,9 +138,15 @@ def LaunchAndWait(cmd):
""" Launches the given program with the given arguments, then blocks. """ Launches the given program with the given arguments, then blocks.
cmd : A list contained the program name and its arguments. cmd : A list contained the program name and its arguments.
returns: The exit code of the process.
""" """
call(cmd, shell=False) if not isinstance(cmd, list):
cmd = to_unicode(str(cmd))
cmd = cmd.split()
p = Popen(cmd, shell=False, stdout=PIPE, stderr=STDOUT, stdin=None)
return p.wait()
def IsValidIP(ip): def IsValidIP(ip):
""" Make sure an entered IP is valid. """ """ Make sure an entered IP is valid. """

83
wicd/monitor.py
View File

@@ -38,7 +38,7 @@ misc.RenameProcess("wicd-monitor")
if __name__ == '__main__': if __name__ == '__main__':
wpath.chdir(__file__) wpath.chdir(__file__)
dbusmanager.connect_to_dbus() dbusmanager.connect_to_dbus()
dbus_dict = dbusmanager.get_dbus_ifaces() dbus_dict = dbusmanager.get_dbus_ifaces()
daemon = dbus_dict["daemon"] daemon = dbus_dict["daemon"]
@@ -61,7 +61,7 @@ def diewithdbus(func):
mainloop.quit() mainloop.quit()
self.__lost_dbus_count += 1 self.__lost_dbus_count += 1
return True return True
wrapper.__name__ = func.__name__ wrapper.__name__ = func.__name__
wrapper.__dict__ = func.__dict__ wrapper.__dict__ = func.__dict__
wrapper.__doc__ = func.__doc__ wrapper.__doc__ = func.__doc__
@@ -86,7 +86,7 @@ class ConnectionStatus(object):
self.iwconfig = "" self.iwconfig = ""
self.trigger_reconnect = False self.trigger_reconnect = False
self.__lost_dbus_count = 0 self.__lost_dbus_count = 0
bus = dbusmanager.get_bus() bus = dbusmanager.get_bus()
bus.add_signal_receiver(self._force_update_connection_status, bus.add_signal_receiver(self._force_update_connection_status,
"UpdateState", "org.wicd.daemon") "UpdateState", "org.wicd.daemon")
@@ -99,7 +99,7 @@ class ConnectionStatus(object):
in, and the user has chosen to switch to a wired connection in, and the user has chosen to switch to a wired connection
whenever its available, even if already connected to a whenever its available, even if already connected to a
wireless network. wireless network.
2) A wired connection is currently active. 2) A wired connection is currently active.
""" """
@@ -107,7 +107,7 @@ class ConnectionStatus(object):
if not wired_ip and daemon.GetPreferWiredNetwork(): if not wired_ip and daemon.GetPreferWiredNetwork():
if not daemon.GetForcedDisconnect() and wired.CheckPluggedIn(): if not daemon.GetForcedDisconnect() and wired.CheckPluggedIn():
self.trigger_reconnect = True self.trigger_reconnect = True
elif wired_ip and wired.CheckPluggedIn(): elif wired_ip and wired.CheckPluggedIn():
# Only change the interface if it's not already set for wired # Only change the interface if it's not already set for wired
if not self.still_wired: if not self.still_wired:
@@ -128,7 +128,7 @@ class ConnectionStatus(object):
Checks for an active wireless connection. Also notes Checks for an active wireless connection. Also notes
if the signal strength is 0, and if it remains there if the signal strength is 0, and if it remains there
for too long, triggers a wireless disconnect. for too long, triggers a wireless disconnect.
Returns True if wireless connection is active, and Returns True if wireless connection is active, and
False otherwise. False otherwise.
@@ -144,7 +144,7 @@ class ConnectionStatus(object):
self.iwconfig = '' self.iwconfig = ''
# Reset this, just in case. # Reset this, just in case.
self.tried_reconnect = False self.tried_reconnect = False
wifi_signal = self._get_printable_sig_strength() wifi_signal = self._get_printable_sig_strength()
if wifi_signal == 0: if wifi_signal == 0:
# If we have no signal, increment connection loss counter. # If we have no signal, increment connection loss counter.
@@ -165,17 +165,17 @@ class ConnectionStatus(object):
self.last_network = self.network self.last_network = self.network
self.signal_changed = True self.signal_changed = True
daemon.SetCurrentInterface(daemon.GetWirelessInterface()) daemon.SetCurrentInterface(daemon.GetWirelessInterface())
return True return True
@diewithdbus @diewithdbus
def update_connection_status(self): def update_connection_status(self):
""" Updates the tray icon and current connection status. """ Updates the tray icon and current connection status.
Determines the current connection state and sends a dbus signal Determines the current connection state and sends a dbus signal
announcing when the status changes. Also starts the automatic announcing when the status changes. Also starts the automatic
reconnection process if necessary. reconnection process if necessary.
""" """
wired_ip = None wired_ip = None
wifi_ip = None wifi_ip = None
@@ -183,24 +183,21 @@ class ConnectionStatus(object):
if daemon.GetSuspend(): if daemon.GetSuspend():
print "Suspended." print "Suspended."
state = misc.SUSPENDED state = misc.SUSPENDED
self.update_state(state) return self.update_state(state)
return True
# Determine what our current state is. # Determine what our current state is.
# Are we currently connecting? # Are we currently connecting?
if daemon.CheckIfConnecting(): if daemon.CheckIfConnecting():
state = misc.CONNECTING state = misc.CONNECTING
self.update_state(state) return self.update_state(state)
return True
daemon.SendConnectResultsIfAvail() daemon.SendConnectResultsIfAvail()
# Check for wired. # Check for wired.
wired_ip = wired.GetWiredIP("") wired_ip = wired.GetWiredIP("")
wired_found = self.check_for_wired_connection(wired_ip) wired_found = self.check_for_wired_connection(wired_ip)
if wired_found: if wired_found:
self.update_state(misc.WIRED, wired_ip=wired_ip) return self.update_state(misc.WIRED, wired_ip=wired_ip)
return True
# Check for wireless # Check for wireless
wifi_ip = wireless.GetWirelessIP("") wifi_ip = wireless.GetWirelessIP("")
@@ -213,35 +210,32 @@ class ConnectionStatus(object):
# connection is active. So we kill the wireless connection # connection is active. So we kill the wireless connection
# so the autoconnect logic will connect to the wired network. # so the autoconnect logic will connect to the wired network.
self.trigger_reconnect = False self.trigger_reconnect = False
# Don't trigger it if the gui is open, because autoconnect # Don't trigger it if the gui is open, because autoconnect
# is disabled while it's open. # is disabled while it's open.
if not daemon.GetGUIOpen(): if not daemon.GetGUIOpen():
print 'Killing wireless connection to switch to wired...' print 'Killing wireless connection to switch to wired...'
wireless.DisconnectWireless() wireless.DisconnectWireless()
daemon.AutoConnect(False, reply_handler=lambda:None, daemon.AutoConnect(False, reply_handler=lambda *a:None,
error_handler=lambda:None) error_handler=lambda *a:None)
self.update_state(misc.NOT_CONNECTED) return self.update_state(misc.NOT_CONNECTED)
return True return self.update_state(misc.WIRELESS, wifi_ip=wifi_ip)
self.update_state(misc.WIRELESS, wifi_ip=wifi_ip)
return True
state = misc.NOT_CONNECTED state = misc.NOT_CONNECTED
if self.last_state == misc.WIRELESS: if self.last_state == misc.WIRELESS:
from_wireless = True from_wireless = True
else: else:
from_wireless = False from_wireless = False
self.auto_reconnect(from_wireless) self.auto_reconnect(from_wireless)
self.update_state(state) return self.update_state(state)
return True
def _force_update_connection_status(self): def _force_update_connection_status(self):
""" Run a connection status update on demand. """ Run a connection status update on demand.
Removes the scheduled update_connection_status() Removes the scheduled update_connection_status()
call, explicitly calls the function, and reschedules call, explicitly calls the function, and reschedules
it. it.
""" """
global update_callback global update_callback
gobject.source_remove(update_callback) gobject.source_remove(update_callback)
@@ -272,6 +266,7 @@ class ConnectionStatus(object):
else: else:
print 'ERROR: Invalid state!' print 'ERROR: Invalid state!'
return True return True
daemon.SetConnectionStatus(state, info) daemon.SetConnectionStatus(state, info)
# Send a D-Bus signal announcing status has changed if necessary. # Send a D-Bus signal announcing status has changed if necessary.
@@ -280,7 +275,7 @@ class ConnectionStatus(object):
daemon.EmitStatusChanged(state, info) daemon.EmitStatusChanged(state, info)
self.last_state = state self.last_state = state
return True return True
def _get_printable_sig_strength(self): def _get_printable_sig_strength(self):
""" Get the correct signal strength format. """ """ Get the correct signal strength format. """
try: try:
@@ -290,7 +285,7 @@ class ConnectionStatus(object):
wifi_signal = int(wireless.GetCurrentDBMStrength(self.iwconfig)) wifi_signal = int(wireless.GetCurrentDBMStrength(self.iwconfig))
except TypeError: except TypeError:
wifi_signal = 0 wifi_signal = 0
return wifi_signal return wifi_signal
def auto_reconnect(self, from_wireless=None): def auto_reconnect(self, from_wireless=None):
@@ -303,37 +298,37 @@ class ConnectionStatus(object):
""" """
if self.reconnecting: if self.reconnecting:
return return
# Some checks to keep reconnect retries from going crazy. # Some checks to keep reconnect retries from going crazy.
if (self.reconnect_tries > 3 and if (self.reconnect_tries > 3 and
(time.time() - self.last_reconnect_time) < 200): (time.time() - self.last_reconnect_time) < 200):
print "Throttling autoreconnect" print "Throttling autoreconnect"
return return
self.reconnecting = True self.reconnecting = True
daemon.SetCurrentInterface('') daemon.SetCurrentInterface('')
if daemon.ShouldAutoReconnect(): if daemon.ShouldAutoReconnect():
print 'Starting automatic reconnect process' print 'Starting automatic reconnect process'
self.last_reconnect_time = time.time() self.last_reconnect_time = time.time()
self.reconnect_tries += 1 self.reconnect_tries += 1
# If we just lost a wireless connection, try to connect to that # If we just lost a wireless connection, try to connect to that
# network again. Otherwise just call Autoconnect. # network again. Otherwise just call Autoconnect.
cur_net_id = wireless.GetCurrentNetworkID(self.iwconfig) cur_net_id = wireless.GetCurrentNetworkID(self.iwconfig)
if from_wireless and cur_net_id > -1: if from_wireless and cur_net_id > -1:
print 'Trying to reconnect to last used wireless ' + \ print 'Trying to reconnect to last used wireless ' + \
'network' 'network'
wireless.ConnectWireless(cur_net_id) wireless.ConnectWireless(cur_net_id)
else: else:
daemon.AutoConnect(True, reply_handler=reply_handle, daemon.AutoConnect(True, reply_handler=reply_handle,
error_handler=err_handle) error_handler=err_handle)
self.reconnecting = False self.reconnecting = False
def reply_handle(): def reply_handle():
""" Just a dummy function needed for asynchronous dbus calls. """ """ Just a dummy function needed for asynchronous dbus calls. """
pass pass
def err_handle(error): def err_handle(error):
""" Just a dummy function needed for asynchronous dbus calls. """ """ Just a dummy function needed for asynchronous dbus calls. """
pass pass
@@ -343,16 +338,16 @@ def add_poll_callback():
update_callback = misc.timeout_add(to_time, update_callback = misc.timeout_add(to_time,
monitor.update_connection_status) monitor.update_connection_status)
def main(): def main():
""" Starts the connection monitor. """ Starts the connection monitor.
Starts a ConnectionStatus instance, sets the status to update Starts a ConnectionStatus instance, sets the status to update
an amount of time determined by the active backend. an amount of time determined by the active backend.
""" """
global monitor, to_time, mainloop global monitor, to_time, mainloop
monitor = ConnectionStatus() monitor = ConnectionStatus()
to_time = daemon.GetBackendUpdateInterval() to_time = daemon.GetBackendUpdateInterval()
add_poll_callback() add_poll_callback()

24
wicd/networking.py
View File

@@ -425,7 +425,30 @@ class ConnectThread(threading.Thread):
if self.connect_result != "aborted": if self.connect_result != "aborted":
self.abort_connection(dhcp_status) self.abort_connection(dhcp_status)
return return
@abortable
def verify_association(self, iface):
""" Verify that our association the AP is valid.
Try to ping the gateway we have set to see if we're
really associated with it. This is only done if
we're using a static IP.
"""
if self.network.get('gateway'):
self.SetStatus('verifying_association')
print "Verifying AP association"
retcode = self.iface.VerifyAPAssociation(self.network['gateway'])
#TODO this should be in wnettools.py
if retcode:
print "Connection Failed: Failed to ping the access point!"
# Clean up before aborting.
iface.SetAddress('0.0.0.0')
iface.FlushRoutes()
if hasattr(iface, "StopWPA"):
iface.StopWPA()
self.abort_connection("association_failed")
@abortable @abortable
def set_dns_addresses(self, iface): def set_dns_addresses(self, iface):
""" Set the DNS address(es). """ Set the DNS address(es).
@@ -838,6 +861,7 @@ class WirelessConnectThread(ConnectThread):
self.set_broadcast_address(wiface) self.set_broadcast_address(wiface)
self.set_ip_address(wiface) self.set_ip_address(wiface)
self.set_dns_addresses(wiface) self.set_dns_addresses(wiface)
self.verify_association(wiface)
# Run post-connection script. # Run post-connection script.
self.run_global_scripts_if_needed(wpath.postconnectscripts) self.run_global_scripts_if_needed(wpath.postconnectscripts)

2
wicd/translations.py
View File

@@ -153,6 +153,8 @@ language['dhcp_failed'] = _('Connection Failed: Unable to Get IP Address')
language['no_dhcp_offers'] = _('Connection Failed: No DHCP offers received.') language['no_dhcp_offers'] = _('Connection Failed: No DHCP offers received.')
language['aborted'] = _('Connection Cancelled') language['aborted'] = _('Connection Cancelled')
language['bad_pass'] = _('Connection Failed: Could not authenticate (bad password?)') language['bad_pass'] = _('Connection Failed: Could not authenticate (bad password?)')
language['verifying_association'] = _("Verifying access point association...")
language['association_failed'] = _("Connection Failed: Could not contact the wireless access point.")
language['done'] = _('Done connecting...') language['done'] = _('Done connecting...')
language['scanning'] = _('Scanning') language['scanning'] = _('Scanning')
language['scanning_stand_by'] = _('Scanning networks... stand by...') language['scanning_stand_by'] = _('Scanning networks... stand by...')

11
wicd/wnettools.py
View File

@@ -585,6 +585,17 @@ class BaseInterface(object):
output = ifconfig output = ifconfig
return misc.RunRegex(ip_pattern, output) return misc.RunRegex(ip_pattern, output)
def VerifyAPAssociation(self, gateway):
""" Verify assocation with an access point.
Verifies that an access point can be contacted by
trying to ping it.
"""
cmd = "ping -q -w 3 -c 1 %s" % gateway
if self.verbose: print cmd
return misc.LaunchAndWait(cmd)
def IsUp(self, ifconfig=None): def IsUp(self, ifconfig=None):
""" Determines if the interface is up. """ Determines if the interface is up.