system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2008-08-07 Dan Williams <dcbw@redhat.com>

Browse source 
* src/dhcp-manager/nm-dhcp-manager.c
		- (nm_dhcp_manager_get_ip4_config): fix regression which caused
			mis-handling of DHCP responses that returned more than one router
			(found by Grant Williamson)



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3908 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-08-07 17:59:16 +00:00
parent 641a7072b8
commit 1fa6715103
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-08-07 Dan Williams <dcbw@redhat.com>
* src/dhcp-manager/nm-dhcp-manager.c
- (nm_dhcp_manager_get_ip4_config): fix regression which caused
mis-handling of DHCP responses that returned more than one router
(found by Grant Williamson)
2008-08-07 Dan Williams <dcbw@redhat.com>
* callouts/nm-dispatcher-action.c

17
src/dhcp-manager/nm-dhcp-manager.c
View file

@ -747,9 +747,20 @@ nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager,
}
str = g_hash_table_lookup (device->options, "new_routers");
if (str && (inet_pton (AF_INET, str, &tmp_addr) > 0)) {
addr->gateway = tmp_addr.s_addr;
nm_info(" gateway %s", str);
if (str) {
char **routers = g_strsplit (str, " ", 0);
char **s;
for (s = routers; *s; s++) {
/* FIXME: how to handle multiple routers? */
if (inet_pton (AF_INET, *s, &tmp_addr) > 0) {
addr->gateway = tmp_addr.s_addr;
nm_info (" gateway %s", *s);
break;
} else
nm_warning ("Ignoring invalid gateway '%s'", *s);
}
g_strfreev (routers);
}
nm_ip4_config_take_address (ip4_config, addr);