gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-01-10 15:54:13 +01:00
Code Issues Projects Releases Wiki Activity

Wait for the network interface to finish coming up before moving on during the connection process.

Browse Source 
Use a dict instead of if/elifs in StartDHCP() method.
This commit is contained in:
Dan O'Reilly
2009-08-28 19:47:55 -04:00
parent 126a4e145e
commit ec8eade509
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wicd/networking.py
View File

@@ -526,6 +526,14 @@ class ConnectThread(threading.Thread):
print 'Putting interface up...'
self.SetStatus('interface_up')
iface.Up()
for x in range(0, 5):
time.sleep(2)
if iface.IsUp():
return
self.abort_if_needed()
# If we get here, the interface never came up
print "WARNING: Timed out waiting for interface to come up"
class Wireless(Controller):
@@ -769,7 +777,7 @@ class Wireless(Controller):
iwconfig = self.GetIwconfig()
else:
iwconfig = None
bssid = self.wiface.GetBSSID(iwconfig),
bssid = self.wiface.GetBSSID(iwconfig)
essid = self.wiface.GetCurrentNetwork(iwconfig)
Controller.Disconnect(self, bssid, essid)

23
wicd/wnettools.py
View File

@@ -550,19 +550,20 @@ class BaseInterface(object):
if self.verbose: print cmd
self.dhcp_object = misc.Run(cmd, include_stderr=True, return_obj=True)
pipe = self.dhcp_object.stdout
client_dict = { misc.DHCLIENT : self._parse_dhclient,
misc.DHCPCD : self._parse_dhcpcd,
misc.PUMP : self._parse_pump,
misc.UDHCPC : self._parse_udhcpc,
}
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)
elif DHCP_CLIENT == misc.UDHCPC:
return self._parse_udhcpc(pipe)
DHCP_CLIENT = self._get_dhcp_command()
if DHCP_CLIENT in client_dict:
ret = client_dict[DHCP_CLIENT](pipe)
else:
print 'ERROR no dhclient found!'
print "ERROR: no dhcp client found"
ret = None
return ret
@neediface(False)
def ReleaseDHCP(self):
""" Release the DHCP lease for this interface. """