Attachment 846878 Details for Bug 983325 – Patch to add route for dhcp4-server if needed

[patch] Patch to add route for dhcp4-server if needed

rh983325-dhcp4-server-route.patch (text/plain), 1.40 KB, created by Scott Shambarger on 2014-01-08 00:27:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott Shambarger

Created: 2014-01-08 00:27:05 UTC

Size: 1.40 KB

patch

obsolete

>--- a/src/dhcp-manager/nm-dhcp-client.c
>+++ b/src/dhcp-manager/nm-dhcp-client.c
>@@ -1194,8 +1194,8 @@
> 
> 			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
>@@ -1205,6 +1205,28 @@
> 		}
> 	}
> 
>+	if (gwaddr) {
>+		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)) {
>+					/* Add host route for dhcp server (in case this
>+					   interface is not the default gateway) */
>+					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);

Actions: View | Diff

Attachments on bug 983325: 846878 | 847421 | 847935