colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-08-13 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/dhcp-manager/nm-dhcp-manager.c
		- Stop any dhclient instance that might be already running for a
			particular interface before starting an NM spawned dhclient.  Fixes
			dhclient processes left over if NM crashes, stuff like that.



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2674 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-08-13 20:38:47 +00:00
parent 146a4374b0
commit 07db7f145d
2 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2007-08-13 Dan Williams <dcbw@redhat.com>
* src/dhcp-manager/nm-dhcp-manager.c
- Stop any dhclient instance that might be already running for a
particular interface before starting an NM spawned dhclient. Fixes
dhclient processes left over if NM crashes, stuff like that.
2007-08-13 Dan Williams <dcbw@redhat.com> 2007-08-13 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerAP.c * src/NetworkManagerAP.c

46
src/dhcp-manager/nm-dhcp-manager.c
View File

@@ -81,6 +81,8 @@ static NMDHCPManager *nm_dhcp_manager_new (void);
static void nm_dhcp_manager_cancel_transaction_real (NMDHCPDevice *device, gboolean blocking); static void nm_dhcp_manager_cancel_transaction_real (NMDHCPDevice *device, gboolean blocking);
static void stop_dhclient (const char * iface, const pid_t pid, gboolean blocking);
static char * static char *
get_pidfile_for_iface (const char * iface) get_pidfile_for_iface (const char * iface)
{ {
@@ -626,6 +628,7 @@ dhclient_run (NMDHCPDevice *device, gchar *xtra_arg)
char * pidfile = NULL; char * pidfile = NULL;
char * leasefile = NULL; char * leasefile = NULL;
gboolean success = FALSE; gboolean success = FALSE;
char * pid_contents = NULL;
/* Find dhclient */ /* Find dhclient */
dhclient_binary = dhclient_binary_paths; dhclient_binary = dhclient_binary_paths;
@@ -652,7 +655,14 @@ dhclient_run (NMDHCPDevice *device, gchar *xtra_arg)
goto out; goto out;
} }
// FIXME: look for existing pidfile and kill dhclient /* Kill any existing dhclient bound to this interface */
if (g_file_get_contents (pidfile, &pid_contents, NULL, NULL)) {
unsigned long int tmp = strtoul (pid_contents, NULL, 10);
if (!((tmp == ULONG_MAX) && (errno == ERANGE)))
stop_dhclient (device->iface, (pid_t) tmp, TRUE);
remove (pidfile);
}
dhclient_argv = g_ptr_array_new (); dhclient_argv = g_ptr_array_new ();
g_ptr_array_add (dhclient_argv, (gpointer) (*dhclient_binary)); g_ptr_array_add (dhclient_argv, (gpointer) (*dhclient_binary));
@@ -691,6 +701,7 @@ dhclient_run (NMDHCPDevice *device, gchar *xtra_arg)
success = TRUE; success = TRUE;
out: out:
g_free (pid_contents);
g_free (leasefile); g_free (leasefile);
g_free (pidfile); g_free (pidfile);
g_ptr_array_free (dhclient_argv, TRUE); g_ptr_array_free (dhclient_argv, TRUE);
@@ -735,22 +746,19 @@ nm_dhcp_manager_begin_transaction (NMDHCPManager *manager,
} }
static void static void
nm_dhcp_manager_cancel_transaction_real (NMDHCPDevice *device, gboolean blocking) stop_dhclient (const char * iface,
pid_t pid,
gboolean blocking)
{ {
int i = 20; /* 4 seconds */ int i = 20; /* 4 seconds */
char * pidfile;
char * leasefile;
if (!device->dhclient_pid) /* Tell it to quit */
return; kill (pid, SIGTERM);
kill (device->dhclient_pid, SIGTERM);
/* Yes, the state has to reach DHC_END. */
while (blocking && i-- > 0) { while (blocking && i-- > 0) {
gint child_status; gint child_status;
int ret; int ret;
ret = waitpid (device->dhclient_pid, &child_status, WNOHANG); ret = waitpid (pid, &child_status, WNOHANG);
if (ret > 0) { if (ret > 0) {
break; break;
} else if (ret == -1) { } else if (ret == -1) {
@@ -765,10 +773,22 @@ nm_dhcp_manager_cancel_transaction_real (NMDHCPDevice *device, gboolean blocking
} }
if (i <= 0) { if (i <= 0) {
nm_warning ("%s: dhclient pid %d didn't exit, will kill it.", nm_warning ("%s: dhclient pid %d didn't exit, will kill it.", iface, pid);
device->iface, device->dhclient_pid); kill (pid, SIGKILL);
kill (device->dhclient_pid, SIGKILL);
} }
}
static void
nm_dhcp_manager_cancel_transaction_real (NMDHCPDevice *device, gboolean blocking)
{
char * pidfile;
char * leasefile;
if (!device->dhclient_pid)
return;
stop_dhclient (device->iface, device->dhclient_pid, blocking);
nm_info ("%s: canceled DHCP transaction, dhclient pid %d", nm_info ("%s: canceled DHCP transaction, dhclient pid %d",
device->iface, device->iface,
device->dhclient_pid); device->dhclient_pid);