fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 12:50:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns: split out domains retrieval

Browse source
This commit is contained in:
Beniamino Galvani 2018-01-10 11:21:27 +01:00
parent d3dfadf639
commit e78bfb63cd
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/dns/nm-dns-manager.c
View file

@ -376,15 +376,37 @@ add_dns_option_item (GPtrArray *array, const char *str)
g_ptr_array_add (array, g_strdup (str));
}
static void
add_dns_domains (GPtrArray *array, const NMIPConfig *ip_config)
{
guint num_domains, num_searches, i;
const char *str;
num_domains = nm_ip_config_get_num_domains (ip_config);
num_searches = nm_ip_config_get_num_searches (ip_config);
for (i = 0; i < num_searches; i++) {
str = nm_ip_config_get_search (ip_config, i);
if (domain_is_valid (str, FALSE))
add_string_item (array, str);
}
if (num_domains > 1 || !num_searches) {
for (i = 0; i < num_domains; i++) {
str = nm_ip_config_get_domain (ip_config, i);
if (domain_is_valid (str, FALSE))
add_string_item (array, str);
}
}
}
static void
merge_one_ip_config (NMResolvConfData *rc,
int ifindex,
const NMIPConfig *ip_config)
{
int addr_family;
guint num, num_domains, num_searches, i;
guint num, i;
char buf[NM_UTILS_INET_ADDRSTRLEN + 50];
const char *str;
addr_family = nm_ip_config_get_addr_family (ip_config);
@ -417,20 +439,7 @@ merge_one_ip_config (NMResolvConfData *rc,
add_string_item (rc->nameservers, buf);
}
num_domains = nm_ip_config_get_num_domains (ip_config);
num_searches = nm_ip_config_get_num_searches (ip_config);
for (i = 0; i < num_searches; i++) {
str = nm_ip_config_get_search (ip_config, i);
if (domain_is_valid (str, FALSE))
add_string_item (rc->searches, str);
}
if (num_domains > 1 || !num_searches) {
for (i = 0; i < num_domains; i++) {
str = nm_ip_config_get_domain (ip_config, i);
if (domain_is_valid (str, FALSE))
add_string_item (rc->searches, str);
}
}
add_dns_domains (rc->searches, ip_config);
num = nm_ip_config_get_num_dns_options (ip_config);
for (i = 0; i < num; i++) {