Pull request: 2662 dnscrypt logs
Merge in DNS/adguard-home from 2662-dnscrypt-logs to master
Closes #2662.
Squashed commit of the following:
commit 05f6742b5c73e1d150834965ae3a54ca06ef8e24
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 12:58:08 2021 +0300
all: imp docs
commit ee0b8c574c1cb5302a5ffb62d2fec4126509b2e8
Merge: aaa8c6b8 e64df20e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 12:56:44 2021 +0300
Merge branch 'master' into 2662-dnscrypt-logs
commit aaa8c6b8085679f4acd234527bd03cb0b2520b4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 12:38:49 2021 +0300
all: document changes
commit 57b6a4d8e95e87d928274d095dc2004f1591d940
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 11 12:36:22 2021 +0300
all: fix dnscrypt in logs
This commit is contained in:
parent
e64df20e74
commit
44168292d5
|
@ -20,9 +20,13 @@ and this project adheres to
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Incorrect version tag in the Docker release ([#2663]).
|
- Incorrect version tag in the Docker release ([#2663]).
|
||||||
|
- DNSCrypt queries weren't marked as such in logs ([#2662]).
|
||||||
|
|
||||||
|
[#2662]: https://github.com/AdguardTeam/AdGuardHome/issues/2662
|
||||||
[#2663]: https://github.com/AdguardTeam/AdGuardHome/issues/2663
|
[#2663]: https://github.com/AdguardTeam/AdGuardHome/issues/2663
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [v0.105.0] - 2021-02-10
|
## [v0.105.0] - 2021-02-10
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
|
@ -248,6 +248,7 @@
|
||||||
"custom_ip": "Custom IP",
|
"custom_ip": "Custom IP",
|
||||||
"blocking_ipv4": "Blocking IPv4",
|
"blocking_ipv4": "Blocking IPv4",
|
||||||
"blocking_ipv6": "Blocking IPv6",
|
"blocking_ipv6": "Blocking IPv6",
|
||||||
|
"dnscrypt": "DNSCrypt",
|
||||||
"dns_over_https": "DNS-over-HTTPS",
|
"dns_over_https": "DNS-over-HTTPS",
|
||||||
"dns_over_tls": "DNS-over-TLS",
|
"dns_over_tls": "DNS-over-TLS",
|
||||||
"dns_over_quic": "DNS-over-QUIC",
|
"dns_over_quic": "DNS-over-QUIC",
|
||||||
|
|
|
@ -534,6 +534,7 @@ export const BLOCK_ACTIONS = {
|
||||||
};
|
};
|
||||||
|
|
||||||
export const SCHEME_TO_PROTOCOL_MAP = {
|
export const SCHEME_TO_PROTOCOL_MAP = {
|
||||||
|
dnscrypt: 'dnscrypt',
|
||||||
doh: 'dns_over_https',
|
doh: 'dns_over_https',
|
||||||
dot: 'dns_over_tls',
|
dot: 'dns_over_tls',
|
||||||
doq: 'dns_over_quic',
|
doq: 'dns_over_quic',
|
||||||
|
|
|
@ -53,6 +53,7 @@ func NewClientProto(s string) (cp ClientProto, err error) {
|
||||||
ClientProtoDOH,
|
ClientProtoDOH,
|
||||||
ClientProtoDOQ,
|
ClientProtoDOQ,
|
||||||
ClientProtoDOT,
|
ClientProtoDOT,
|
||||||
|
ClientProtoDNSCrypt,
|
||||||
ClientProtoPlain:
|
ClientProtoPlain:
|
||||||
|
|
||||||
return cp, nil
|
return cp, nil
|
||||||
|
|
Loading…
Reference in New Issue