Attachment 847421 Details for Bug 983325 – Updated patch with comment

[patch] Updated patch with comment

rh983325-dhcp4-server-route.patch (text/plain), 2.67 KB, created by Scott Shambarger on 2014-01-09 00:34:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott Shambarger

Created: 2014-01-09 00:34:17 UTC

Size: 2.67 KB

patch

obsolete

>From 519ba0340149b5c7d5d8212d99630161c980aa71 Mon Sep 17 00:00:00 2001
>From: Scott Shambarger <devel@shambarger.net>
>Date: Wed, 8 Jan 2014 15:58:48 -0800
>Subject: [PATCH 1/1] core: Add host route for DHCP4 server if outside assigned
> subnet (bgo #721767)
>
>Some ISP's provide leases from central servers that are on different
>subnets that the address offered.  If the host does not configure the
>interface as the default route, the dhcp server may not be reachable
>via unicast, and a host specific route is needed.
>---
> src/dhcp-manager/nm-dhcp-client.c | 37 +++++++++++++++++++++++++++++++++++--
> 1 file changed, 35 insertions(+), 2 deletions(-)
>
>diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c
>index 56f9e6b..583a0c1 100644
>--- a/src/dhcp-manager/nm-dhcp-client.c
>+++ b/src/dhcp-manager/nm-dhcp-client.c
>@@ -1199,8 +1199,8 @@ ip4_options_to_config (NMDHCPClient *self)
> 
> 			for (s = routers; *s; s++) {
> 				/* FIXME: how to handle multiple routers? */
>-				if (inet_pton (AF_INET, *s, &tmp_addr) > 0) {
>-					nm_ip4_config_set_gateway (ip4_config, tmp_addr);
>+				if (inet_pton (AF_INET, *s, &gwaddr) > 0) {
>+					nm_ip4_config_set_gateway (ip4_config, gwaddr);
> 					nm_log_info (LOGD_DHCP4, "  gateway %s", *s);
> 					break;
> 				} else
>@@ -1210,6 +1210,39 @@ ip4_options_to_config (NMDHCPClient *self)
> 		}
> 	}
> 
>+	if (gwaddr) {
>+		/*
>+		  RFC 2132, section 9.7
>+		    DHCP clients use the contents of the 'server identifier' field
>+		    as the destination address for any DHCP messages unicast to
>+		    the DHCP server.
>+
>+		  Some ISP's provide leases from central servers that are on
>+		  different subnets that the address offered.  If the host
>+		  does not configure the interface as the default route, the
>+		  dhcp server may not be reachable via unicast, and a host
>+		  specific route is needed.
>+		*/
>+		str = g_hash_table_lookup (priv->options, "new_dhcp_server_identifier");
>+		if (str) {
>+			if (inet_pton (AF_INET, str, &tmp_addr) > 0) {
>+				NMPlatformIP4Route route;
>+				guint32 mask = nm_utils_ip4_prefix_to_netmask(address.plen);
>+				if ((tmp_addr & mask) != (address.address & mask)) {
>+					/* DHCP server not on assigned subnet, route needed */
>+					memset (&route, 0, sizeof (route));
>+					route.network = tmp_addr;
>+					route.plen = 32;
>+					route.gateway = gwaddr;
>+					nm_ip4_config_add_route (ip4_config, &route);
>+					nm_log_info (LOGD_DHCP4, "  dhcp_server_identifier %s", str);
>+				}
>+			}
>+			else
>+				nm_log_warn (LOGD_DHCP4, "ignoring invalid dhcp_server_identifier '%s'", str);
>+		}
>+	}
>+
> 	str = g_hash_table_lookup (priv->options, "new_dhcp_lease_time");
> 	if (str) {
> 		address.lifetime = address.preferred = strtoul (str, NULL, 10);
>-- 
>1.8.4.2
>

Actions: View | Diff

Attachments on bug 983325: 846878 | 847421 | 847935