From 196e306489da3d0f7f34fb9765f272a837b7727c Mon Sep 17 00:00:00 2001 From: Dimitry Kolyshev Date: Wed, 27 Apr 2022 14:26:35 +0300 Subject: [PATCH] Pull request: 4463 ddr flag Merge in DNS/adguard-home-wiki from 4463-ddr-support to master Squashed commit of the following: commit 19993d5396915fcc36181dfa3ef410f4969e3364 Merge: a6d703f 1171f98 Author: Dimitry Kolyshev Date: Wed Apr 27 10:38:43 2022 +0200 Merge remote-tracking branch 'origin/master' into 4463-ddr-support commit a6d703f925e5bce81d042c263be368fe00346287 Author: Dimitry Kolyshev Date: Tue Apr 26 15:31:02 2022 +0200 4463 ddr flag commit a50ba8abc8fba21558e3f6a0841699b40139eab2 Author: Dimitry Kolyshev Date: Tue Apr 26 12:35:40 2022 +0200 4463 ddr flag commit d371e090c81bd397c14720ccf35a0666a76d9221 Author: Dimitry Kolyshev Date: Fri Apr 22 13:48:13 2022 +0200 4463 ddr flag commit c62946e82e0973eb3a16bb70fd48f49bfe07365c Author: Dimitry Kolyshev Date: Wed Apr 20 23:27:46 2022 +0200 4463 ddr flag --- Configuration.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Configuration.md b/Configuration.md index e863196..c586eb5 100644 --- a/Configuration.md +++ b/Configuration.md @@ -428,6 +428,7 @@ Settings are stored in [YAML format](https://en.wikipedia.org/wiki/YAML), possib - `parental_cache_size` — Parental Control cache size (in bytes) - `cache_time` — Safe Browsing, Safe Search, Parental Control cache TTL - `max_goroutines` — Max. number of parallel goroutines for processing incoming requests + - `handle_ddr` — Handle [Discovery of Designated Resolvers (DDR)][DDR] requests. - `ipset` — List of domain-ipset_name associations for adding IP addresses of the specified domain names to an ipset list. Syntax: `DOMAIN[,DOMAIN].../IPSET_NAME[,IPSET_NAME]...`. IPv4 addresses are added to an ipset list with `ipv4` family, IPv6 addresses - to `ipv6` ipset list. ipset list must exist. This setting is supported on Linux only. This feature is similar to `--ipset` in dnsmasq. - `upstream_timeout` (**since v0.107.0**) — The timeout for querying upstream servers. Zero value will be rewritten with default one which is @@ -520,6 +521,7 @@ Removing an entry from settings file will reset it to the default value. Deletin [DHCP]: https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP [DNSCrypt]: https://github.com/AdguardTeam/AdGuardHome/wiki/DNSCrypt [`dnscrypt`]: https://github.com/ameshkov/dnscrypt +[DDR]: https://www.ietf.org/archive/id/draft-ietf-add-ddr-06.html