diff options
| -rw-r--r-- | ui/confview.go | 9 | ||||
| -rw-r--r-- | ui/syntax/highlighter.c | 12 | ||||
| -rw-r--r-- | ui/syntax/highlighter.h | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/ui/confview.go b/ui/confview.go index d080db30..67f1bdf5 100644 --- a/ui/confview.go +++ b/ui/confview.go @@ -388,11 +388,12 @@ func (iv *interfaceView) apply(c *conf.Interface) { iv.addresses.hide() } - if len(c.DNS) > 0 { - addrStrings := make([]string, len(c.DNS)) - for i, address := range c.DNS { - addrStrings[i] = address.String() + if len(c.DNS) + len(c.DNSSearch) > 0 { + addrStrings := make([]string, 0, len(c.DNS) + len(c.DNSSearch)) + for _, address := range c.DNS { + addrStrings = append(addrStrings, address.String()) } + addrStrings = append(addrStrings, c.DNSSearch...) iv.dns.show(strings.Join(addrStrings[:], l18n.EnumerationSeparator())) } else { iv.dns.hide() diff --git a/ui/syntax/highlighter.c b/ui/syntax/highlighter.c index e0d4e04e..d89feda1 100644 --- a/ui/syntax/highlighter.c +++ b/ui/syntax/highlighter.c @@ -337,11 +337,6 @@ static bool is_valid_network(string_span_t s) return is_valid_ipv4(s) || is_valid_ipv6(s); } -static bool is_valid_dns(string_span_t s) -{ - return is_valid_ipv4(s) || is_valid_ipv6(s); -} - enum field { InterfaceSection, PrivateKey, @@ -451,7 +446,12 @@ static void highlight_multivalue_value(struct highlight_span_array *ret, const s { switch (section) { case DNS: - append_highlight_span(ret, parent.s, s, is_valid_dns(s) ? HighlightIP : HighlightError); + if (is_valid_ipv4(s) || is_valid_ipv6(s)) + append_highlight_span(ret, parent.s, s, HighlightIP); + else if (is_valid_hostname(s)) + append_highlight_span(ret, parent.s, s, HighlightHost); + else + append_highlight_span(ret, parent.s, s, HighlightError); break; case Address: case AllowedIPs: { diff --git a/ui/syntax/highlighter.h b/ui/syntax/highlighter.h index c6c8b5d5..0a86de78 100644 --- a/ui/syntax/highlighter.h +++ b/ui/syntax/highlighter.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* - * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. + * Copyright (C) 2015-2020 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */ #include <sys/types.h> |