From c2a4393e7068e0c56e723bd17225223324ea2c0e Mon Sep 17 00:00:00 2001 From: Eugene Burkov Date: Fri, 26 Aug 2022 14:30:44 +0300 Subject: [PATCH] Pull request: 4337 DHCP: del option Merge in DNS/adguard-home-wiki from 4337-del-option to master Squashed commit of the following: commit 58c39532439a9db8fa5de5fbba8fb390dcd04ff6 Author: Eugene Burkov Date: Fri Aug 26 13:12:29 2022 +0300 DHCP: imp wording commit 2bafa9263e60d0b3a3e924dcc6ebff9caa7a73bb Author: Eugene Burkov Date: Fri Aug 26 12:39:23 2022 +0300 DHCP: desc del option --- DHCP.md | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/DHCP.md b/DHCP.md index 8bb7c40..4df18f1 100644 --- a/DHCP.md +++ b/DHCP.md @@ -43,10 +43,16 @@ The `options` field accepts four types of values: `hex`, `ip`, `ips`, and 255] range. See also [RFC 2132, sec. 3][rfc-2132]. In accordance with [RFC 2131, sec. 4.3.1][rfc-2131], these options override the -default options set by Adguard Home. Which means that if you want to set DNS -server addresses using option `6`, you should also add Adguard Home's own -addresses there. Otherwise, AdGuard Home's filtering won't work for the DHCP -clients who receive these DNS server addresses. +default options' values set by Adguard Home and requested by a client. Which +means that if you want to set DNS server addresses using option `6`, you should +also add Adguard Home's own addresses there. Otherwise, AdGuard Home's +filtering won't work for the DHCP clients who receive these DNS server +addresses. + +Option `del` has been added in **v0.107.12**. It is used to unconditionally +remove options from the server's responses, which may lead to weird behaviors. +Use with caution. On example where this option is useful is when a client +doesn't accept a lease because of an option, see [issue 4337]. * The `hex` format is: @@ -112,6 +118,21 @@ clients who receive these DNS server addresses. - '252 text http://example.com' ``` + * The `del` format (since **v0.107.12**) allows you to remove an option. For + example: + + ```yaml + # … + 'dhcp': + # … + 'dhcpv4': + # … + 'options': + - '61 del' + ``` + +[issue 4337]: https://github.com/adguardTeam/adGuardHome/issues/4337 + ### DHCPv6 Options