From d1be3793a159f4e2c2a21b5f67b38704f3900cee Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Sat, 1 May 2010 08:10:49 -0700
Subject: [PATCH] dhcp6: info-only requests don't require addresses

They aren't actual leases so an info-only request doesn't return
an address.
---
 src/dhcp-manager/nm-dhcp-client.c | 59 +++++++++++++++++++++++--------
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c
index 9f9719473a..30d5c7504e 100644
--- a/src/dhcp-manager/nm-dhcp-client.c
+++ b/src/dhcp-manager/nm-dhcp-client.c
@@ -44,6 +44,7 @@ typedef struct {
 	guint        timeout_id;
 	guint        watch_id;
 	GHashTable * options;
+	gboolean     info_only;
 } NMDHCPClientPrivate;
 
 #define NM_DHCP_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_CLIENT, NMDHCPClientPrivate))
@@ -186,6 +187,8 @@ real_stop (NMDHCPClient *self)
 	watch_cleanup (self);
 
 	stop_process (priv->pid, priv->iface);
+
+	priv->info_only = FALSE;
 }
 
 static gboolean
@@ -278,6 +281,8 @@ nm_dhcp_client_start_ip6 (NMDHCPClient *self,
 	g_return_val_if_fail (priv->ipv6 == TRUE, FALSE);
 	g_return_val_if_fail (priv->uuid != NULL, FALSE);
 
+	priv->info_only = info_only;
+
 	nm_log_info (LOGD_DHCP, "Activation (%s) Beginning DHCPv6 transaction (timeout in %d seconds)",
 	             priv->iface, priv->timeout);
 
@@ -894,6 +899,8 @@ ip6_options_to_config (NMDHCPClient *self)
 	struct in6_addr tmp_addr;
 	NMIP6Address *addr = NULL;
 	char *str = NULL;
+	GHashTableIter iter;
+	gpointer key, value;
 
 	g_return_val_if_fail (self != NULL, NULL);
 	g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL);
@@ -901,6 +908,12 @@ ip6_options_to_config (NMDHCPClient *self)
 	priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
 	g_return_val_if_fail (priv->options != NULL, NULL);
 
+	g_hash_table_iter_init (&iter, priv->options);
+	while (g_hash_table_iter_next (&iter, &key, &value)) {
+		nm_log_dbg (LOGD_DHCP6, "(%s): option '%s'=>'%s'",
+		            priv->iface, (const char *) key, (const char *) value);
+	}
+
 	ip6_config = nm_ip6_config_new ();
 	if (!ip6_config) {
 		nm_log_warn (LOGD_DHCP6, "(%s): couldn't allocate memory for an IP6Config!", priv->iface);
@@ -914,27 +927,43 @@ ip6_options_to_config (NMDHCPClient *self)
 	}
 
 	str = g_hash_table_lookup (priv->options, "new_ip6_address");
-	if (str && (inet_pton (AF_INET6, str, &tmp_addr) > 0)) {
+	if (str) {
+		if (!inet_pton (AF_INET6, str, &tmp_addr)) {
+			nm_log_warn (LOGD_DHCP6, "(%s): DHCP returned invalid address '%s'",
+			             priv->iface);
+			goto error;
+		}
+
 		nm_ip6_address_set_address (addr, &tmp_addr);
 		nm_log_info (LOGD_DHCP6, "  address %s", str);
-	} else
-		goto error;
-
-	str = g_hash_table_lookup (priv->options, "new_ip6_prefixlen");
-	if (str) {
-		long unsigned int prefix;
-
-		errno = 0;
-		prefix = strtoul (str, NULL, 10);
-		if (errno != 0 || prefix > 128)
+	} else {
+		/* No address in managed mode is a hard error */
+		if (priv->info_only == FALSE)
 			goto error;
 
-		nm_ip6_address_set_prefix (addr, (guint32) prefix);
-		nm_log_info (LOGD_DHCP6, "  prefix %lu", prefix);
+		/* But "info-only" setups don't necessarily need an address */
+		nm_ip6_address_unref (addr);
+		addr = NULL;
 	}
 
-	nm_ip6_config_take_address (ip6_config, addr);
-	addr = NULL;
+	/* Only care about prefix if we got an address */
+	if (addr) {
+		str = g_hash_table_lookup (priv->options, "new_ip6_prefixlen");
+		if (str) {
+			long unsigned int prefix;
+
+			errno = 0;
+			prefix = strtoul (str, NULL, 10);
+			if (errno != 0 || prefix > 128)
+				goto error;
+
+			nm_ip6_address_set_prefix (addr, (guint32) prefix);
+			nm_log_info (LOGD_DHCP6, "  prefix %lu", prefix);
+		}
+
+		nm_ip6_config_take_address (ip6_config, addr);
+		addr = NULL;
+	}
 
 	str = g_hash_table_lookup (priv->options, "new_host_name");
 	if (str)