diff options
| author |   otto <otto@openbsd.org> | 2019-11-03 09:49:02 +0000 |
|---|---|---|
| committer | otto <otto@openbsd.org> | 2019-11-03 09:49:02 +0000 |
| commit | 1d722b0676b0b0cd2b409c86228e4ca94e4b4456 (patch) | |
| tree | b51638dfc87b76cde521a96bcd37f21438b3cfa1 | |
| parent | *** empty log message *** (diff) | |
| download | wireguard-openbsd-1d722b0676b0b0cd2b409c86228e4ca94e4b4456.tar.xz wireguard-openbsd-1d722b0676b0b0cd2b409c86228e4ca94e4b4456.zip | |
Opportunistic DoT support and name forwarder "forwarder" instead of "static;
joint work and ok florian@
| -rw-r--r-- | usr.sbin/unwindctl/parser.c | 4 | ||||
| -rw-r--r-- | usr.sbin/unwindctl/unwindctl.8 | 8 | ||||
| -rw-r--r-- | usr.sbin/unwindctl/unwindctl.c | 7 |
3 files changed, 10 insertions, 9 deletions
diff --git a/usr.sbin/unwindctl/parser.c b/usr.sbin/unwindctl/parser.c index 3b5fde12bc4..da1b1a9174b 100644 --- a/usr.sbin/unwindctl/parser.c +++ b/usr.sbin/unwindctl/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.4 2019/10/31 12:51:43 florian Exp $ */ +/* $OpenBSD: parser.c,v 1.5 2019/11/03 09:49:02 otto Exp $ */ /* * Copyright (c) 2004 Esben Norby <norby@openbsd.org> @@ -72,7 +72,7 @@ static const struct token t_status[] = { {NOTOKEN, "", NONE, NULL}, {KEYWORD, "recursor", STATUS_RECURSOR, NULL}, {KEYWORD, "dhcp", STATUS_DHCP, NULL}, - {KEYWORD, "static", STATUS_STATIC, NULL}, + {KEYWORD, "forwarder", STATUS_STATIC, NULL}, {KEYWORD, "DoT", STATUS_DOT, NULL}, {KEYWORD, "asr", STATUS_ASR, NULL}, {ENDTOKEN, "", STATUS, NULL} diff --git a/usr.sbin/unwindctl/unwindctl.8 b/usr.sbin/unwindctl/unwindctl.8 index a898d1cdc9b..8e714a62ecf 100644 --- a/usr.sbin/unwindctl/unwindctl.8 +++ b/usr.sbin/unwindctl/unwindctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: unwindctl.8,v 1.4 2019/02/05 20:41:12 jmc Exp $ +.\" $OpenBSD: unwindctl.8,v 1.5 2019/11/03 09:49:02 otto Exp $ .\" .\" Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: February 5 2019 $ +.Dd $Mdocdate: November 3 2019 $ .Dt UNWINDCTL 8 .Os .Sh NAME @@ -55,14 +55,14 @@ Enable very noisy debug logging. Reload the configuration file. .It Cm recheck portal Run the captive portal detection. -.It Cm status Op Cm recursor | dhcp | DoT | static +.It Cm status Op Cm recursor | dhcp | DoT | forwarder Show a status summary. If one of .Cm recursor , .Cm dhcp , .Cm DoT , or -.Cm static +.Cm forwarder is specified, more detailed information about that type of resolver is given including reasons why DNSSEC validation might be failing and a query time histogram. diff --git a/usr.sbin/unwindctl/unwindctl.c b/usr.sbin/unwindctl/unwindctl.c index 2622c16fcdd..ce7bed1ae56 100644 --- a/usr.sbin/unwindctl/unwindctl.c +++ b/usr.sbin/unwindctl/unwindctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unwindctl.c,v 1.8 2019/11/01 18:15:28 florian Exp $ */ +/* $OpenBSD: unwindctl.c,v 1.9 2019/11/03 09:49:02 otto Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -247,9 +247,10 @@ show_status_msg(struct imsg *imsg) break; case IMSG_CTL_RESOLVER_INFO: cri = imsg->data; - printf("%8s %16s %s\n", cri->selected ? "*" : " ", + printf("%8s %16s %s%s\n", cri->selected ? "*" : " ", uw_resolver_type_str[cri->type], - uw_resolver_state_str[cri->state]); + uw_resolver_state_str[cri->state], + cri->oppdot ? " (opportunistic DoT)" : ""); break; case IMSG_CTL_RESOLVER_WHY_BOGUS: /* make sure this is a string */ |