Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

netconfig: Allow to override IPv6 DHCP DNSs with static addresses

This commit is contained in:
Tim Kourt 2019-10-03 13:48:51 -07:00 committed by Denis Kenzior
parent 0fdd27463e
commit e0651cf25b
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/netconfig.c
View File

@ -345,23 +345,14 @@ static char **netconfig_ipv6_get_dns(struct netconfig *netconfig, uint8_t proto)
char **dns_list; char **dns_list;
char **p; char **p;
switch (proto) { p = dns_list = l_settings_get_string_list(netconfig->active_settings,
case RTPROT_STATIC:
p = dns_list =
l_settings_get_string_list(netconfig->active_settings,
"IPv6", "dns", ' '); "IPv6", "dns", ' ');
if (dns_list && *dns_list) {
if (!dns_list || !*dns_list) {
l_strv_free(dns_list);
return NULL;
}
for (; *p; p++) { for (; *p; p++) {
if (inet_pton(AF_INET6, *p, &in6_addr) == 1) if (inet_pton(AF_INET6, *p, &in6_addr) == 1)
continue; continue;
l_error("netconfig: Invalid IPv6 DNS address %s is " l_error("netconfig: Invalid IPv6 DNS address '%s' is "
"provided in network configuration file.", *p); "provided in network configuration file.", *p);
l_strv_free(dns_list); l_strv_free(dns_list);
@ -369,9 +360,18 @@ static char **netconfig_ipv6_get_dns(struct netconfig *netconfig, uint8_t proto)
return NULL; return NULL;
} }
/* Allow to override the DHCP DNSs with static addressing. */
return dns_list; return dns_list;
} else if (dns_list) {
l_error("netconfig: No IPv6 DNS address is provided in network "
"configuration file.");
case RTPROT_DHCP: l_strv_free(dns_list);
return NULL;
}
if (proto == RTPROT_DHCP) {
/* TODO */ /* TODO */
return NULL; return NULL;