colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dhcp: suppress warning about invalid DNS servers

Browse Source 
If the DHCP server happens to send "0.0.0.0", which you see with
some consumer gear that only has one nameserver set, don't warn
because we know it's bogus.

Also rename the copy & pasted 'searches' variable to what it's
actually used for.
This commit is contained in:
Dan Williams
2014-10-27 15:44:46 -05:00
parent 4ae958757b
commit e01e43cd2f
1 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/dhcp-manager/nm-dhcp-utils.c
View File

@@ -488,17 +488,19 @@ nm_dhcp_utils_ip4_config_from_options (const char *iface,
str = g_hash_table_lookup (options, "domain_name_servers"); str = g_hash_table_lookup (options, "domain_name_servers");
if (str) { if (str) {
char **searches = g_strsplit (str, " ", 0); char **dns = g_strsplit (str, " ", 0);
char **s; char **s;
for (s = searches; *s; s++) { for (s = dns; *s; s++) {
if (inet_pton (AF_INET, *s, &tmp_addr) > 0) { if (inet_pton (AF_INET, *s, &tmp_addr) > 0) {
nm_ip4_config_add_nameserver (ip4_config, tmp_addr); if (tmp_addr) {
nm_log_info (LOGD_DHCP4, " nameserver '%s'", *s); nm_ip4_config_add_nameserver (ip4_config, tmp_addr);
nm_log_info (LOGD_DHCP4, " nameserver '%s'", *s);
}
} else } else
nm_log_warn (LOGD_DHCP4, "ignoring invalid nameserver '%s'", *s); nm_log_warn (LOGD_DHCP4, "ignoring invalid nameserver '%s'", *s);
} }
g_strfreev (searches); g_strfreev (dns);
} }
str = g_hash_table_lookup (options, "domain_name"); str = g_hash_table_lookup (options, "domain_name");
@@ -519,17 +521,19 @@ nm_dhcp_utils_ip4_config_from_options (const char *iface,
str = g_hash_table_lookup (options, "netbios_name_servers"); str = g_hash_table_lookup (options, "netbios_name_servers");
if (str) { if (str) {
char **searches = g_strsplit (str, " ", 0); char **nbns = g_strsplit (str, " ", 0);
char **s; char **s;
for (s = searches; *s; s++) { for (s = nbns; *s; s++) {
if (inet_pton (AF_INET, *s, &tmp_addr) > 0) { if (inet_pton (AF_INET, *s, &tmp_addr) > 0) {
nm_ip4_config_add_wins (ip4_config, tmp_addr); if (tmp_addr) {
nm_log_info (LOGD_DHCP4, " wins '%s'", *s); nm_ip4_config_add_wins (ip4_config, tmp_addr);
nm_log_info (LOGD_DHCP4, " wins '%s'", *s);
}
} else } else
nm_log_warn (LOGD_DHCP4, "ignoring invalid WINS server '%s'", *s); nm_log_warn (LOGD_DHCP4, "ignoring invalid WINS server '%s'", *s);
} }
g_strfreev (searches); g_strfreev (nbns);
} }
str = g_hash_table_lookup (options, "interface_mtu"); str = g_hash_table_lookup (options, "interface_mtu");
@@ -553,17 +557,19 @@ nm_dhcp_utils_ip4_config_from_options (const char *iface,
str = g_hash_table_lookup (options, "nis_servers"); str = g_hash_table_lookup (options, "nis_servers");
if (str) { if (str) {
char **searches = g_strsplit (str, " ", 0); char **nis = g_strsplit (str, " ", 0);
char **s; char **s;
for (s = searches; *s; s++) { for (s = nis; *s; s++) {
if (inet_pton (AF_INET, *s, &tmp_addr) > 0) { if (inet_pton (AF_INET, *s, &tmp_addr) > 0) {
nm_ip4_config_add_nis_server (ip4_config, tmp_addr); if (tmp_addr) {
nm_log_info (LOGD_DHCP4, " nis '%s'", *s); nm_ip4_config_add_nis_server (ip4_config, tmp_addr);
nm_log_info (LOGD_DHCP4, " nis '%s'", *s);
}
} else } else
nm_log_warn (LOGD_DHCP4, "ignoring invalid NIS server '%s'", *s); nm_log_warn (LOGD_DHCP4, "ignoring invalid NIS server '%s'", *s);
} }
g_strfreev (searches); g_strfreev (nis);
} }
return ip4_config; return ip4_config;
@@ -643,17 +649,19 @@ nm_dhcp_utils_ip6_config_from_options (const char *iface,
str = g_hash_table_lookup (options, "dhcp6_name_servers"); str = g_hash_table_lookup (options, "dhcp6_name_servers");
if (str) { if (str) {
char **searches = g_strsplit (str, " ", 0); char **dns = g_strsplit (str, " ", 0);
char **s; char **s;
for (s = searches; *s; s++) { for (s = dns; *s; s++) {
if (inet_pton (AF_INET6, *s, &tmp_addr) > 0) { if (inet_pton (AF_INET6, *s, &tmp_addr) > 0) {
nm_ip6_config_add_nameserver (ip6_config, &tmp_addr); if (!IN6_IS_ADDR_UNSPECIFIED (&tmp_addr)) {
nm_log_info (LOGD_DHCP6, " nameserver '%s'", *s); nm_ip6_config_add_nameserver (ip6_config, &tmp_addr);
nm_log_info (LOGD_DHCP6, " nameserver '%s'", *s);
}
} else } else
nm_log_warn (LOGD_DHCP6, "ignoring invalid nameserver '%s'", *s); nm_log_warn (LOGD_DHCP6, "ignoring invalid nameserver '%s'", *s);
} }
g_strfreev (searches); g_strfreev (dns);
} }
str = g_hash_table_lookup (options, "dhcp6_domain_search"); str = g_hash_table_lookup (options, "dhcp6_domain_search");