Commit 1f8195ff authored by Dan Williams's avatar Dan Williams
Browse files

2005-08-22 Dan Williams <dcbw@redhat.com>

	Patch by Bill Moss <bmoss@clemson.edu>
	* src/dhcp-manager/nm-dhcp-manager.c
		- (nm_dhcp_manager_cancel_transaction): Give dhcdbd/dhclient
			some time to send out a RELEASE if they like


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@899 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
parent 29aa287e
2005-08-22 Dan Williams <dcbw@redhat.com>
Patch by Bill Moss <bmoss@clemson.edu>
* src/dhcp-manager/nm-dhcp-manager.c
- (nm_dhcp_manager_cancel_transaction): Give dhcdbd/dhclient
some time to send out a RELEASE if they like
2005-08-22 Dan Williams <dcbw@redhat.com>
Noticed by Bill Moss <bmoss@clemson.edu>
......
......@@ -3188,6 +3188,7 @@ gboolean nm_device_deactivate (NMDevice *dev)
*/
if (dev->act_request)
{
nm_dhcp_manager_cancel_transaction (dev->app_data->dhcp_manager, dev->act_request);
nm_act_request_unref (dev->act_request);
dev->act_request = NULL;
}
......
......@@ -320,6 +320,12 @@ void nm_dhcp_manager_cancel_transaction (NMDHCPManager *manager, NMActRequest *r
{
dbus_connection_send (manager->data->dbus_connection, message, NULL);
dbus_message_unref (message);
/* Give dhcdbd/dhclient some time to send out a RELEASE if they like */
/* FIXME: we should really monitor the interface's DHCP state by waiting
* for dhcdbd to tell us the device is "down" rather than sleeping here.
*/
sleep (1);
}
g_free (path);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment