NetworkManager r3695 - in trunk: . src/dhcp-manager src/ppp-manager

[tambeti svn gnome org]

Author: tambeti
Date: Wed May 28 14:03:35 2008
New Revision: 3695
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3695&view=rev

Log:
    2008-05-28  Tambet Ingo  <tambet gmail com>

    	* src/ppp-manager/nm-ppp-manager.c (nm_ppp_manager_stop): Make sure
    	pppd gets killed, if SIGTERM doesn't do it's job, SIGKILL it.

    	* src/dhcp-manager/nm-dhcp-manager.c (nm_dhcp_manager_get_ip4_config):
    	Use inet_aton() everywhere to improve error detection.
    	Don't fall back to 'dhcp_server_identifier' if the gateway is not
    	provided.


Modified:
   trunk/ChangeLog
   trunk/src/dhcp-manager/nm-dhcp-manager.c
   trunk/src/ppp-manager/nm-ppp-manager.c

Modified: trunk/src/dhcp-manager/nm-dhcp-manager.c
==============================================================================
--- trunk/src/dhcp-manager/nm-dhcp-manager.c	(original)
+++ trunk/src/dhcp-manager/nm-dhcp-manager.c	Wed May 28 14:03:35 2008
@@ -1,3 +1,5 @@
+/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
+
 /* nm-dhcp-manager.c - Handle the DHCP daemon for NetworkManager
  *
  * Copyright (C) 2005 Dan Williams
@@ -835,8 +837,8 @@
 	NMDHCPManagerPrivate *priv;
 	NMDHCPDevice *device;
 	NMIP4Config *ip4_config = NULL;
-	NMSettingIP4Address *addr;
-	guint32 ip4_num = 0;
+	struct in_addr tmp_addr;
+	NMSettingIP4Address *addr = NULL;
 	char *str = NULL;
 
 	g_return_val_if_fail (NM_IS_DHCP_MANAGER (manager), NULL);
@@ -868,36 +870,26 @@
 	}
 
 	str = g_hash_table_lookup (device->options, "new_ip_address");
-	if (str != NULL) {
-		addr->address = inet_addr (str);
-		nm_info("  address %s", str);
-	}
-	if (!addr->address) {
-		g_free (addr);
+	if (str && inet_aton (str, &tmp_addr)) {
+		addr->address = tmp_addr.s_addr;
+		nm_info ("  address %s", str);
+	} else
 		goto error;
-	}
 
 	str = g_hash_table_lookup (device->options, "new_subnet_mask");
-	if (str != NULL) {
-		addr->netmask = inet_addr (str);
-		nm_info("  netmask %s", str);
+	if (str && inet_aton (str, &tmp_addr)) {
+		addr->netmask = tmp_addr.s_addr;
+		nm_info ("  netmask %s", str);
 	}
 
 	str = g_hash_table_lookup (device->options, "new_routers");
-	if (str != NULL) {
-		addr->gateway = inet_addr (str);
-	} else { /* If DHCP doesn't have a 'routers', just use the DHCP server's address as our gateway for now */
-		str = g_hash_table_lookup (device->options, "new_dhcp_server_identifier");
-		if (str != NULL)
-			addr->gateway = inet_addr (str);
-		else {
-			g_free (addr);
-			return NULL;
-		}
+	if (str && inet_aton (str, &tmp_addr)) {
+		addr->gateway = tmp_addr.s_addr;
+		nm_info("  gateway %s", str);
 	}
-	nm_info("  gateway %s", str);
 
 	nm_ip4_config_take_address (ip4_config, addr);
+	addr = NULL;
 
 	str = g_hash_table_lookup (device->options, "new_host_name");
 	if (str) {
@@ -911,10 +903,11 @@
 		char **s;
 
 		for (s = searches; *s; s++) {
-			// FIXME: use inet_aton
-			ip4_num = inet_addr (*s);
-			nm_ip4_config_add_nameserver (ip4_config, ip4_num);
-			nm_info ("  nameserver '%s'", *s);
+			if (inet_aton (*s, &tmp_addr)) {
+				nm_ip4_config_add_nameserver (ip4_config, tmp_addr.s_addr);
+				nm_info ("  nameserver '%s'", *s);
+			} else
+				nm_warning ("Ignoring invalid nameserver '%s'", *s);
 		}
 		g_strfreev (searches);
 	}
@@ -955,10 +948,11 @@
 		char **s;
 
 		for (s = searches; *s; s++) {
-			// FIXME: use inet_aton
-			ip4_num = inet_addr (*s);
-			nm_ip4_config_add_nis_server (ip4_config, ip4_num);
-			nm_info ("  nis server '%s'", *s);
+			if (inet_aton (*s, &tmp_addr)) {
+				nm_ip4_config_add_nis_server (ip4_config, tmp_addr.s_addr);
+				nm_info ("  nis server '%s'", *s);
+			} else
+				nm_warning ("Ignoring invalid nis server '%s'", *s);
 		}
 		g_strfreev (searches);
 	}
@@ -1006,6 +1000,10 @@
 	return ip4_config;
 
 error:
+	if (addr)
+		g_free (addr);
+
 	g_object_unref (ip4_config);
+
 	return NULL;
 }

Modified: trunk/src/ppp-manager/nm-ppp-manager.c
==============================================================================
--- trunk/src/ppp-manager/nm-ppp-manager.c	(original)
+++ trunk/src/ppp-manager/nm-ppp-manager.c	Wed May 28 14:03:35 2008
@@ -733,6 +733,17 @@
 	priv->pending_secrets_context = NULL;
 }
 
+static gboolean
+ensure_killed (gpointer data)
+{
+	int pid = GPOINTER_TO_INT (data);
+
+	if (kill (pid, 0) == 0)
+		kill (pid, SIGKILL);
+
+	return FALSE;
+}
+
 void
 nm_ppp_manager_stop (NMPPPManager *manager)
 {
@@ -753,7 +764,11 @@
 	}
 
 	if (priv->pid) {
-		kill (priv->pid, SIGTERM);
+		if (kill (priv->pid, SIGTERM) == 0)
+			g_timeout_add (2000, ensure_killed, GINT_TO_POINTER (priv->pid));
+		else
+			kill (priv->pid, SIGKILL);
+
 		priv->pid = 0;
 	}
 }