diff options
| author | Antti Kaijanmäki <antti@kaijanmaki.net> | 2008-08-18 08:30:28 +0000 |
|---|---|---|
| committer | Antti Kaijanmäki <antti@kaijanmaki.net> | 2008-08-18 08:30:28 +0000 |
| commit | 2c21a2fe6b0498585fba0beb003ac8aa6351803c (patch) | |
| tree | 9544edfe2ed9a6c96eda933c35fb5110f1d666c6 /src/dhcp-manager | |
| parent | e04934d93efba622123809cc767488af673b2967 (diff) | |
| download | NetworkManager-mbca.tar.gz | |
keep up with trunkmbca
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/branches/mbca@3981 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'src/dhcp-manager')
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-manager.c | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 94c4a65c61..c4087e682b 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -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); @@ -800,27 +811,6 @@ nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, g_strfreev (searches); } - str = g_hash_table_lookup (device->options, "new_nis_domain"); - if (str) { - nm_ip4_config_set_nis_domain (ip4_config, str); - nm_info (" nis domain '%s'", str); - } - - str = g_hash_table_lookup (device->options, "new_nis_servers"); - if (str) { - char **searches = g_strsplit (str, " ", 0); - char **s; - - for (s = searches; *s; s++) { - if (inet_pton (AF_INET, *s, &tmp_addr) > 0) { - 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); - } - str = g_hash_table_lookup (device->options, "new_static_routes"); if (str) { char **searches = g_strsplit (str, " ", 0); @@ -894,7 +884,7 @@ copy_dhcp4_config_option (gpointer key, char *tmp_key = NULL; const char **p; static const char *filter_options[] = { - "interface", "pid", "reason", NULL + "interface", "pid", "reason", "dhcp_message_type", NULL }; /* Filter out stuff that's not actually new DHCP options */ |