fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-30 23:48:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

initrd: cleanup parsing DNS in reader_parse_ip()

Browse source 
(cherry picked from commit e258410c87)
This commit is contained in:
Thomas Haller 2021-02-16 21:23:37 +01:00 • committed by Beniamino Galvani
parent ce02f56356
commit f8645d6a86
1 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/core/initrd/nmi-cmdline-reader.c
View file

@ -411,10 +411,12 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
int client_ip_family = AF_UNSPEC;
int client_ip_prefix = -1;
const char * dns[2] = {
0,
NULL,
NULL,
};
int dns_addr_family[2] = {
0,
AF_UNSPEC,
AF_UNSPEC,
};
int i;
GError *error = NULL;
@ -472,11 +474,15 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
tmp = get_word(&argument, ':');
dns_addr_family[0] = get_ip_address_family(tmp, FALSE);
if (dns_addr_family[0] != AF_UNSPEC) {
dns[0] = tmp;
dns[1] = get_word(&argument, ':');
dns_addr_family[1] = get_ip_address_family(dns[1], FALSE);
if (*argument)
_LOGW(LOGD_CORE, "Ignoring extra: '%s'.", argument);
dns[0] = tmp;
dns[1] = get_word(&argument, ':');
if (dns[1]) {
dns_addr_family[1] = get_ip_address_family(dns[1], FALSE);
if (dns_addr_family[1] == AF_UNSPEC)
_LOGW(LOGD_CORE, "Ignoring invalid DNS server: '%s'.", dns[1]);
if (*argument)
_LOGW(LOGD_CORE, "Ignoring extra: '%s'.", argument);
}
} else {
mtu = tmp;
macaddr = argument;
@ -698,21 +704,8 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
for (i = 0; i < 2; i++) {
if (dns_addr_family[i] == AF_UNSPEC)
break;
if (nm_utils_ipaddr_is_valid(dns_addr_family[i], dns[i])) {
switch (dns_addr_family[i]) {
case AF_INET:
nm_setting_ip_config_add_dns(s_ip4, dns[i]);
break;
case AF_INET6:
nm_setting_ip_config_add_dns(s_ip6, dns[i]);
break;
default:
_LOGW(LOGD_CORE, "Unknown address family: %s", dns[i]);
break;
}
} else {
_LOGW(LOGD_CORE, "Invalid name server: %s", dns[i]);
}
nm_assert(nm_utils_ipaddr_is_valid(dns_addr_family[i], dns[i]));
nm_setting_ip_config_add_dns(NM_IS_IPv4(dns_addr_family[i]) ? s_ip4 : s_ip6, dns[i]);
}
if (mtu && *mtu)