gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-03-14 05:35:49 +01:00
Code Issues Projects Releases Wiki Activity

Fix issue where GetForcedDisconnect was returning True when we had just connected.

Browse Source 
Fix issues with auto-switch to wired.
Change to how the gui handles changing state from connecting to not-connecting to be nicer.
Make the gui trigger monitor state updates while in the connecting state.
Make sure the monitor logs a warning when it catches a D-Bus exception.
Make sure cancelling a wired connection attempt kills DHCP.
Fix issue where DHCP wouldn't get run if automatic dhcp tool was enabled.
This commit is contained in:
Dan O'Reilly
2009-02-12 18:38:40 -05:00
parent 4076153796
commit f237f421ab
5 changed files with 66 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
wicd/wnettools.py
View File

@@ -217,15 +217,22 @@ class BaseInterface(object):
cmd = ""
return (client, cmd)
connect_dict = {
"dhclient" : r"%s %s",
"pump" : r"%s -i %s",
"dhcpcd" : r"%s %s",
}
release_dict = {
"dhclient" : r"%s -r %s",
"pump" : r"%s -r -i %s",
"dhcpcd" : r"%s -k %s",
client_dict = {
"dhclient" :
{'connect' : r"%s %s",
'release' : r"%s -r %s",
'id' : misc.DHCLIENT,
},
"pump" :
{ 'connect' : r"%s -i %s",
'release' : r"%s -r -i %s",
'id' : misc.PUMP,
},
"dhcpcd" :
{'connect' : r"%s %s",
'release' : r"%s -k %s",
'id' : misc.DHCPCD,
},
}
(client_name, cmd) = get_client_name(self.DHCP_CLIENT)
if not client_name or not cmd:
@@ -233,11 +240,11 @@ class BaseInterface(object):
return ""
if flavor == "connect":
return connect_dict[client_name] % (cmd, self.iface)
return client_dict[client_name]['connect'] % (cmd, self.iface)
elif flavor == "release":
return release_dict[client_name] % (cmd, self.iface)
return client_dict[client_name]['release'] % (cmd, self.iface)
else:
return str(cmd)
return client_dict[client_name]['id']
def AppAvailable(self, app):
""" Return whether a given app is available.
@@ -451,18 +458,19 @@ class BaseInterface(object):
if not self.iface: return False
cmd = self._get_dhcp_command('connect')
#cmd = self.DHCP_CMD + " " + self.iface
if self.verbose: print cmd
self.dhcp_object = misc.Run(cmd, include_stderr=True, return_obj=True)
pipe = self.dhcp_object.stdout
DHCP_CLIENT = self.DHCP_CLIENT
DHCP_CLIENT = self._get_dhcp_command()
if DHCP_CLIENT == misc.DHCLIENT:
return self._parse_dhclient(pipe)
elif DHCP_CLIENT == misc.PUMP:
return self._parse_pump(pipe)
elif DHCP_CLIENT == misc.DHCPCD:
return self._parse_dhcpcd(pipe)
else:
print 'ERROR no dhclient found!'
def ReleaseDHCP(self):
""" Release the DHCP lease for this interface. """