all: github action for potential dups and improved issue forms

Merge in DNS/adguard-home from upd-proxy to master

Updates #5872.

Squashed commit of the following:

commit fac8d1cdeb53cb5cfe867c7a3521bb5ca76331ef
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Jun 9 19:18:35 2023 +0300

    all: fix chlog

commit 10f64ba5683422ecc3cb5d0bd6c679ed4e80e0cc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Jun 9 19:14:07 2023 +0300

    all: log changes

commit 14410c4997c674a4f8a4adf8b77c1cf692131d24
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Jun 9 18:48:09 2023 +0300

    all: upd proxy

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,109 +1,142 @@
 'body':
   - 'attributes':
-        'description': >
+      'description': >
-            Please make sure that the issue is not a duplicate or a question.
+        Please make sure that the issue is not a duplicate or a question.
-            If it's a duplicate, please react to the original issue with a
+        If it's a duplicate, please react to the original issue with a
-            thumbs up.  If it's a question, please post it to the GitHub
+        thumbs up.  If it's a question, please post it to the GitHub
-            Discussions page.
+        Discussions page.
-        'label': 'Prerequisites'
+      'label': 'Prerequisites'
-        'options':
+      'options':
-          - 'label': >
+        - 'label': >
-                I have checked the
+            I have checked the
-                [Wiki](https://github.com/AdguardTeam/AdGuardHome/wiki) and
+            [Wiki](https://github.com/AdguardTeam/AdGuardHome/wiki) and
-                [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions)
+            [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions)
-                and found no answer
+            and found no answer
-            'required': true
+          'required': true
-          - 'label': >
+        - 'label': >
-                I have searched other issues and found no duplicates
+            I have searched other issues and found no duplicates
-            'required': true
+          'required': true
-          - 'label': >
+        - 'label': >
-                I want to report a bug and not ask a question
+            I want to report a bug and not ask a question
-            'required': true
+          'required': true
     'id': 'prerequisites'
     'type': 'checkboxes'
   - 'attributes':
-        'description': 'On which operating system type does the issue occur?'
+      'description': 'On which operating system type does the issue occur?'
-        'label': 'Operating system type'
+      'label': 'Operating system type'
-        'options':
+      'options':
-          - 'FreeBSD'
+        - 'FreeBSD'
-          - 'Linux, OpenWrt'
+        - 'Linux, OpenWrt'
-          - 'Linux, Other (please mention the version in the description)'
+        - 'Linux, Other (please mention the version in the description)'
-          - 'macOS (aka Darwin)'
+        - 'macOS (aka Darwin)'
-          - 'OpenBSD'
+        - 'OpenBSD'
-          - 'Windows'
+        - 'Windows'
-          - 'Other (please mention in the description)'
+        - 'Other (please mention in the description)'
     'id': 'os'
     'type': 'dropdown'
     'validations':
-        'required': true
+      'required': true
   - 'attributes':
-        'description': 'On which CPU architecture does the issue occur?'
+      'description': 'On which CPU architecture does the issue occur?'
-        'label': 'CPU architecture'
+      'label': 'CPU architecture'
-        'options':
+      'options':
-          - 'AMD64'
+        - 'AMD64'
-          - 'x86'
+        - 'x86'
-          - '64-bit ARM'
+        - '64-bit ARM'
-          - 'ARMv5'
+        - 'ARMv5'
-          - 'ARMv6'
+        - 'ARMv6'
-          - 'ARMv7'
+        - 'ARMv7'
-          - '64-bit MIPS'
+        - '64-bit MIPS'
-          - '64-bit MIPS LE'
+        - '64-bit MIPS LE'
-          - '32-bit MIPS'
+        - '32-bit MIPS'
-          - '32-bit MIPS LE'
+        - '32-bit MIPS LE'
-          - '64-bit PowerPC LE'
+        - '64-bit PowerPC LE'
-          - 'Other (please mention in the description)'
+        - 'Other (please mention in the description)'
     'id': 'arch'
     'type': 'dropdown'
     'validations':
-        'required': true
+      'required': true
   - 'attributes':
-        'description': 'How did you install AdGuard Home?'
+      'description': 'How did you install AdGuard Home?'
-        'label': 'Installation'
+      'label': 'Installation'
-        'options':
+      'options':
-          - 'GitHub releases or script from README'
+        - 'GitHub releases or script from README'
-          - 'Docker'
+        - 'Docker'
-          - 'Snapcraft'
+        - 'Snapcraft'
-          - 'Custom port'
+        - 'Custom port'
-          - 'Other (please mention in the description)'
+        - 'Other (please mention in the description)'
     'id': 'install'
     'type': 'dropdown'
     'validations':
-        'required': true
+      'required': true
   - 'attributes':
-        'description': 'How did you setup AdGuard Home?'
+      'description': 'How did you setup AdGuard Home?'
-        'label': 'Setup'
+      'label': 'Setup'
-        'options':
+      'options':
-          - 'On one machine'
+        - 'On one machine'
-          - 'On a router, DHCP is handled by the router'
+        - 'On a router, DHCP is handled by the router'
-          - 'On a router, DHCP is handled by AdGuard Home'
+        - 'On a router, DHCP is handled by AdGuard Home'
-          - 'Other (please mention in the description)'
+        - 'Other (please mention in the description)'
     'id': 'setup'
     'type': 'dropdown'
     'validations':
-        'required': true
+      'required': true
   - 'attributes':
-        'description': 'What version of AdGuard Home are you using?'
+      'description': 'What version of AdGuard Home are you using?'
-        'label': 'AdGuard Home version'
+      'label': 'AdGuard Home version'
     'id': 'version'
     'type': 'input'
     'validations':
-        'required': true
+      'required': true
   - 'attributes':
-        'description': 'Please describe the bug'
+      'description': 'Please provide a set of steps to reproduce the issue'
-        'label': 'Description'
+      'label': 'Issue Details'
-        'value': |
+      'placeholder':
-            #### What did you do?
+      'value': |
-
+        Steps to reproduce:
-            #### Expected result
+        1.
-
+        2.
-            #### Actual result
+        3.
-
+    'id': 'what-happened'
-            #### Screenshots (if applicable)
-
-            #### Additional information
-    'id': 'description'
     'type': 'textarea'
     'validations':
-        'required': true
+      'required': true
-'description': 'File a bug report'
+  - 'attributes':
-'name': 'Bug'
+      'label': 'Expected Behavior'
+      'description': 'Describe the expected behavior'
+      'placeholder': |
+        A clear and concise description of what you expected to happen.
+    'id': 'expected-behavior'
+    'type': 'textarea'
+    'validations':
+      'required': false
+  - 'attributes':
+      'label': 'Actual Behavior'
+      'description': 'Describe the actual behavior'
+      'placeholder': 'A clear description of what happened instead.'
+    'id': 'actual-behavior'
+    'type': 'textarea'
+    'validations':
+      'required': true
+  - 'attributes':
+      'label': 'Screenshots'
+      'description': |
+        If applicable add screenshots explaining your problem.
+        You can drag and drop images or paste them from clipboard.
+        Use `<details> </details>` tag to hide screenshots under the spoiler.
+      'placeholder': 'If applicable add screenshots explaining your problem.'
+      'value': |
+        <details><summary>Screenshot 1:</summary>
+        
+        <!-- paste screenshot here -->
+        
+        </details>
+    'id': 'screenshots'
+    'type': 'textarea'
+    'validations':
+      'required': false
+'description': >
+  Open a bug report. Please do not open bug reports for questions. If you
+  want to ask a question, ask in in the Discussions section.
+'name': 'Bug report'
+'labels': [ 'bug' ]

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,41 +1,54 @@
 'body':
   - 'attributes':
-        'description': >
+      'description': >
-            Please make sure that the issue is not a duplicate or a question.
+        Please make sure that the issue is not a duplicate or a question.
-            If it's a duplicate, please react to the original issue with a
+        If it's a duplicate, please react to the original issue with a
-            thumbs up.  If it's a question, please post it to the GitHub
+        thumbs up.  If it's a question, please post it to the GitHub
-            Discussions page.
+        Discussions page.
-        'label': 'Prerequisites'
+      'label': 'Prerequisites'
-        'options':
+      'options':
-          - 'label': >
+        - 'label': >
-                I have checked the
+            I have checked the
-                [Wiki](https://github.com/AdguardTeam/AdGuardHome/wiki) and
+            [Wiki](https://github.com/AdguardTeam/AdGuardHome/wiki) and
-                [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions)
+            [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions)
-                and found no answer
+            and found no answer
-            'required': true
+          'required': true
-          - 'label': >
+        - 'label': >
-                I have searched other issues and found no duplicates
+            I have searched other issues and found no duplicates
-            'required': true
+          'required': true
-          - 'label': >
+        - 'label': >
-                I want to request a feature or enhancement and not ask a
+            I want to request a feature or enhancement and not ask a
-                question
+            question
-            'required': true
+          'required': true
     'id': 'prerequisites'
     'type': 'checkboxes'
   - 'attributes':
-        'description': 'Please describe the request'
+      'description': 'What happened?'
-        'label': 'Description'
+      'placeholder': |
-        'value': |
+        Is your feature request related to a problem? Please add a clear and 
-            #### What problem are you trying to solve?
+        concise description of what the problem is.
-
+      'label': 'Issue Details'
-            #### Proposed solution
+    'id': 'what-happened'
-
-            #### Alternatives considered
-
-            #### Additional information
-    'id': 'description'
     'type': 'textarea'
     'validations':
-        'required': true
+      'required': true
+  - 'attributes':
+      'description': 'What do you propose to change in AdGuard Home?'
+      'placeholder': |
+        Describe the solution you'd like in a clear and concise manner.
+      'label': 'Proposed solution'
+    'id': 'proposed-solution'
+    'type': 'textarea'
+    'validations':
+      'required': true
+  - 'attributes':
+      'description': 'Are there any other ways to solve the problem?'
+      'placeholder': |
+        A clear and concise description of any alternative solutions or features
+        you've considered.
+      'label': 'Alternative solution'
+    'id': 'alternative-solution'
+    'type': 'textarea'
 'description': 'Suggest a feature or an enhancement for AdGuard Home'
 'name': 'Feature request or enhancement'
+'labels': [ 'feature request' ]

.github/workflows/build.yml

@@ -1,7 +1,7 @@
 'name': 'build'
 
 'env':
-  'GO_VERSION': '1.19.7'
+  'GO_VERSION': '1.19.10'
   'NODE_VERSION': '14'
 
 'on':

.github/workflows/lint.yml

@@ -1,7 +1,7 @@
 'name': 'lint'
 
 'env':
-  'GO_VERSION': '1.19.7'
+  'GO_VERSION': '1.19.10'
 
 'on':
   'push':

.github/workflows/potential-duplicates.yml

@@ -0,0 +1,34 @@
+'name': 'potential-duplicates'
+'on':
+  'issues':
+    'types': [ 'opened', 'edited' ]
+'jobs':
+  'run':
+    'runs-on': 'ubuntu-latest'
+    'steps':
+      - 'uses': 'wow-actions/potential-duplicates@v1'
+        'with':
+          'GITHUB_TOKEN': ${{ secrets.GITHUB_TOKEN }}
+          # Issue title filter work with https://www.npmjs.com/package/anymatch.
+          # Any matched issue will stop detection immediately.
+          # You can specify multi filters in each line.
+          # 'filter': ''
+          # Exclude keywords in title before detecting.
+          # 'exclude': ''
+          # Label to set, when potential duplicates are detected.
+          'label': 'potential-duplicate'
+          # Get issues with state to compare. Supported state: 'all', 'closed',
+          # 'open'.
+          'state': 'all'
+          # If similarity is higher than this threshold([0,1]), issue will be
+          # marked as duplicate.
+          'threshold': 0.6
+          # Reactions to be add to comment when potential duplicates are
+          # detected. Available reactions: "-1", "+1", "confused", "laugh",
+          # "heart", "hooray", "rocket", "eyes".
+          # 'reactions': 'eyes, confused'
+          # Comment to post when potential duplicates are detected.
+          'comment': >
+            Potential duplicates: {{#issues}}
+              - [#{{ number }}] {{ title }} ({{ accuracy }}%)
+            {{/issues}}

.gitignore

@@ -21,7 +21,6 @@
 /snapcraft_login
 AdGuardHome*
 coverage.txt
-leases.db
 node_modules/
 
 !/build/gitkeep

CHANGELOG.md

@@ -14,35 +14,145 @@ and this project adheres to
 <!--
 ## [v0.108.0] - TBA
 
-## [v0.107.27] - 2023-03-29 (APPROX.)
+## [v0.107.32] - 2023-06-28 (APPROX.)
 
-See also the [v0.107.27 GitHub milestone][ms-v0.107.27].
+See also the [v0.107.32 GitHub milestone][ms-v0.107.32].
 
-[ms-v0.107.27]: https://github.com/AdguardTeam/AdGuardHome/milestone/63?closed=1
+[ms-v0.107.32]: https://github.com/AdguardTeam/AdGuardHome/milestone/68?closed=1
 
 NOTE: Add new changes BELOW THIS COMMENT.
 -->
 
 ### Added
 
+- The ability to edit rewrite rules via `PUT /control/rewrite/update` HTTP API
+  ([#1577]).
+
+### Fixed
+
+ - DNSCrypt upstream not resetting the client and resolver information on
+   dialing errors ([#5872]).
+
+[#1577]: https://github.com/AdguardTeam/AdGuardHome/issues/1577
+
+<!--
+NOTE: Add new changes ABOVE THIS COMMENT.
+-->
+
+
+
+## [v0.107.31] - 2023-06-08
+
+See also the [v0.107.31 GitHub milestone][ms-v0.107.31].
+
+### Fixed
+
+- Startup errors on OpenWrt ([#5872]).
+- Plain-UDP upstreams always falling back to TCP, causing outages and slowdowns
+  ([#5873], [#5874]).
+
+[#5872]: https://github.com/AdguardTeam/AdGuardHome/issues/5872
+[#5873]: https://github.com/AdguardTeam/AdGuardHome/issues/5873
+[#5874]: https://github.com/AdguardTeam/AdGuardHome/issues/5874
+
+[ms-v0.107.31]: https://github.com/AdguardTeam/AdGuardHome/milestone/67?closed=1
+
+
+
+## [v0.107.30] - 2023-06-07
+
+See also the [v0.107.30 GitHub milestone][ms-v0.107.30].
+
+### Security
+
+- Go version has been updated to prevent the possibility of exploiting the
+  CVE-2023-29402, CVE-2023-29403, and CVE-2023-29404 Go vulnerabilities fixed in
+  [Go 1.19.10][go-1.19.10].
+
+### Fixed
+
+- Unquoted IPv6 bind hosts with trailing colons erroneously considered
+  unspecified addresses are now properly validated ([#5752]).
+
+  **NOTE:** the Docker healthcheck script now also doesn't interpret the `""`
+  value as unspecified address.
+- Incorrect `Content-Type` header value in `POST /control/version.json` and `GET
+  /control/dhcp/interfaces` HTTP APIs ([#5716]).
+- Provided bootstrap servers are now used to resolve the hostnames of plain
+  UDP/TCP upstream servers.
+
+[#5716]: https://github.com/AdguardTeam/AdGuardHome/issues/5716
+
+[go-1.19.10]:   https://groups.google.com/g/golang-announce/c/q5135a9d924/m/j0ZoAJOHAwAJ
+[ms-v0.107.30]: https://github.com/AdguardTeam/AdGuardHome/milestone/66?closed=1
+
+
+
+## [v0.107.29] - 2023-04-18
+
+See also the [v0.107.29 GitHub milestone][ms-v0.107.29].
+
+### Added
+
+- The ability to exclude client activity from the query log or statistics by
+  editing client's settings on the respective page in the UI ([#1717], [#4299]).
+
+### Changed
+
+- Stored DHCP leases moved from `leases.db` to `data/leases.json`.  The file
+  format has also been optimized.
+
+### Fixed
+
+- The `github.com/mdlayher/raw` dependency has been temporarily returned to
+  support raw connections on Darwin ([#5712]).
+- Incorrect recording of blocked results as “Blocked by CNAME or IP” in the
+  query log ([#5725]).
+- All Safe Search services being unchecked by default.
+- Panic when a DNSCrypt stamp is invalid ([#5721]).
+
+[#5712]: https://github.com/AdguardTeam/AdGuardHome/issues/5712
+[#5721]: https://github.com/AdguardTeam/AdGuardHome/issues/5721
+[#5725]: https://github.com/AdguardTeam/AdGuardHome/issues/5725
+[#5752]: https://github.com/AdguardTeam/AdGuardHome/issues/5752
+
+[ms-v0.107.29]: https://github.com/AdguardTeam/AdGuardHome/milestone/65?closed=1
+
+
+
+## [v0.107.28] - 2023-04-12
+
+See also the [v0.107.28 GitHub milestone][ms-v0.107.28].
+
+### Added
+
+- The ability to exclude client activity from the query log or statistics by
+  using the new properties `ignore_querylog` and `ignore_statistics` of the
+  items of the `clients.persistent` array ([#1717], [#4299]).  The UI changes
+  are coming in the upcoming releases.
+- Better profiling information when `debug_pprof` is set to `true`.
+- IPv6 support in Safe Search for some services.
+- The ability to make bootstrap DNS lookups prefer IPv6 addresses to IPv4 ones
+  using the new `dns.bootstrap_prefer_ipv6` configuration file property
+  ([#4262]).
 - Docker container's healthcheck ([#3290]).
 - The new HTTP API `POST /control/protection`, that updates protection state
   and adds an optional pause duration ([#1333]).  The format of request body
   is described in `openapi/openapi.yaml`.  The duration of this pause could
-  also be set with the config field `protection_disabled_until` in `dns`
+  also be set with the property `protection_disabled_until` in the `dns` object
-  section of the YAML configuration file.
+  of the YAML configuration file.
-- Ability to create a static DHCP lease from a dynamic one more easily
+- The ability to create a static DHCP lease from a dynamic one more easily
   ([#3459]).
 - Two new HTTP APIs, `PUT /control/stats/config/update` and `GET
   control/stats/config`, which can be used to set and receive the query log
-  configuration.  See openapi/openapi.yaml for the full description.
+  configuration.  See `openapi/openapi.yaml` for the full description.
 - Two new HTTP APIs, `PUT /control/querylog/config/update` and `GET
   control/querylog/config`, which can be used to set and receive the statistics
-  configuration.  See openapi/openapi.yaml for the full description.
+  configuration.  See `openapi/openapi.yaml` for the full description.
 - The ability to set custom IP for EDNS Client Subnet by using the DNS-server
   configuration section on the DNS settings page in the UI ([#1472]).
-- The ability to manage safesearch for each service by using the new
+- The ability to manage Safe Search for each service by using the new
-  `safe_search` field ([#1163]).
+  `safe_search` property ([#1163]).
 
 ### Changed
 
@@ -71,9 +181,9 @@ In this release, the schema version has changed from 17 to 20.
 
   To rollback this change, convert the property back into days and change the
   `schema_version` back to `19`.
-- The `dns.safesearch_enabled` field has been replaced with `safe_search`
+- The `dns.safesearch_enabled` property has been replaced with `safe_search`
   object containing per-service settings.
-- The `clients.persistent.safesearch_enabled` field has been replaced with
+- The `clients.persistent.safesearch_enabled` property has been replaced with
   `safe_search` object containing per-service settings.
 
   ```yaml
@@ -92,7 +202,7 @@ In this release, the schema version has changed from 17 to 20.
   ```
 
   To rollback this change, move the value of `dns.safe_search.enabled` into the
-  `dns.safesearch_enabled`, then remove `dns.safe_search` field.  Do the same
+  `dns.safesearch_enabled`, then remove `dns.safe_search` property.  Do the same
   client's specific `clients.persistent.safesearch` and then change the
   `schema_version` back to `17`.
 
@@ -102,51 +212,71 @@ In this release, the schema version has changed from 17 to 20.
   `PUT /control/safesearch/settings` API.
 - The `POST /control/safesearch/disable` HTTP API is deprecated.  Use the new
   `PUT /control/safesearch/settings` API
-- The `safesearch_enabled` field is deprecated in the following HTTP APIs:
+- The `safesearch_enabled` property is deprecated in the following HTTP APIs:
-  - `GET /control/clients`
+  - `GET /control/clients`;
-  - `POST /control/clients/add`
+  - `POST /control/clients/add`;
-  - `POST /control/clients/update`
+  - `POST /control/clients/update`;
-  - `GET /control/clients/find?ip0=...&ip1=...&ip2=...`
+  - `GET /control/clients/find?ip0=...&ip1=...&ip2=...`.
 
   Check `openapi/openapi.yaml` for more details.
 - The `GET /control/stats_info` HTTP API; use the new `GET
   /control/stats/config` API instead.
 
   **NOTE:** If interval is custom then it will be equal to `90` days for
-  compatibility reasons.  See openapi/openapi.yaml and `openapi/CHANGELOG.md`.
+  compatibility reasons.  See `openapi/openapi.yaml` and `openapi/CHANGELOG.md`.
 - The `POST /control/stats_config` HTTP API; use the new `PUT
   /control/stats/config/update` API instead.
 - The `GET /control/querylog_info` HTTP API; use the new `GET
   /control/querylog/config` API instead.
 
   **NOTE:** If interval is custom then it will be equal to `90` days for
-  compatibility reasons.  See openapi/openapi.yaml and `openapi/CHANGELOG.md`.
+  compatibility reasons.  See `openapi/openapi.yaml` and `openapi/CHANGELOG.md`.
 - The `POST /control/querylog_config` HTTP API; use the new `PUT
   /control/querylog/config/update` API instead.
 
 ### Fixed
 
+- Logging of the client's IP address after failed login attempts ([#5701]).
+
+[#1163]: https://github.com/AdguardTeam/AdGuardHome/issues/1163
+[#1333]: https://github.com/AdguardTeam/AdGuardHome/issues/1333
+[#1472]: https://github.com/AdguardTeam/AdGuardHome/issues/1472
+[#3290]: https://github.com/AdguardTeam/AdGuardHome/issues/3290
+[#3459]: https://github.com/AdguardTeam/AdGuardHome/issues/3459
+[#4262]: https://github.com/AdguardTeam/AdGuardHome/issues/4262
+[#5567]: https://github.com/AdguardTeam/AdGuardHome/issues/5567
+[#5701]: https://github.com/AdguardTeam/AdGuardHome/issues/5701
+
+[ms-v0.107.28]: https://github.com/AdguardTeam/AdGuardHome/milestone/64?closed=1
+[rfc6761]:      https://www.rfc-editor.org/rfc/rfc6761
+
+
+
+
+## [v0.107.27] - 2023-04-05
+
+See also the [v0.107.27 GitHub milestone][ms-v0.107.27].
+
+### Security
+
+- Go version has been updated to prevent the possibility of exploiting the
+  CVE-2023-24534, CVE-2023-24536, CVE-2023-24537, and CVE-2023-24538 Go
+  vulnerabilities fixed in [Go 1.19.8][go-1.19.8].
+
+### Fixed
+
 - Query log not showing all filtered queries when the “Filtered” log filter is
   selected ([#5639]).
 - Panic in empty hostname in the filter's URL ([#5631]).
 - Panic caused by empty top-level domain name label in `/etc/hosts` files
   ([#5584]).
 
-[#1163]: https://github.com/AdguardTeam/AdGuardHome/issues/1163
-[#1333]: https://github.com/AdguardTeam/AdGuardHome/issues/1333
-[#1472]: https://github.com/AdguardTeam/AdGuardHome/issues/1472
-[#3290]: https://github.com/AdguardTeam/AdGuardHome/issues/3290
-[#3459]: https://github.com/AdguardTeam/AdGuardHome/issues/3459
-[#5567]: https://github.com/AdguardTeam/AdGuardHome/issues/5567
 [#5584]: https://github.com/AdguardTeam/AdGuardHome/issues/5584
 [#5631]: https://github.com/AdguardTeam/AdGuardHome/issues/5631
 [#5639]: https://github.com/AdguardTeam/AdGuardHome/issues/5639
 
-[rfc6761]: https://www.rfc-editor.org/rfc/rfc6761
+[go-1.19.8]:    https://groups.google.com/g/golang-announce/c/Xdv6JL9ENs8/m/OV40vnafAwAJ
-
+[ms-v0.107.27]: https://github.com/AdguardTeam/AdGuardHome/milestone/63?closed=1
-<!--
-NOTE: Add new changes ABOVE THIS COMMENT.
--->
 
 
 
@@ -163,7 +293,7 @@ See also the [v0.107.26 GitHub milestone][ms-v0.107.26].
 
 - The ability to set custom IP for EDNS Client Subnet by using the new
   `dns.edns_client_subnet.use_custom` and `dns.edns_client_subnet.custom_ip`
-  fields ([#1472]).  The UI changes are coming in the upcoming releases.
+  properties ([#1472]).  The UI changes are coming in the upcoming releases.
 - The ability to use `dnstype` rules in the disallowed domains list ([#5468]).
   This allows dropping requests based on their question types.
 
@@ -191,7 +321,7 @@ See also the [v0.107.26 GitHub milestone][ms-v0.107.26].
   ```
 
   To rollback this change, move the value of `dns.edns_client_subnet.enabled`
-  into the `dns.edns_client_subnet`, remove the fields
+  into the `dns.edns_client_subnet`, remove the properties
   `dns.edns_client_subnet.enabled`, `dns.edns_client_subnet.use_custom`,
   `dns.edns_client_subnet.custom_ip`, and change the `schema_version` back to
   `16`.
@@ -251,11 +381,11 @@ See also the [v0.107.24 GitHub milestone][ms-v0.107.24].
 ### Added
 
 - The ability to disable statistics by using the new `statistics.enabled`
-  field.  Previously it was necessary to set the `statistics_interval` to 0,
+  property.  Previously it was necessary to set the `statistics_interval` to 0,
   losing the previous value ([#1717], [#4299]).
 - The ability to exclude domain names from the query log or statistics by using
-  the new `querylog.ignored` or `statistics.ignored` fields ([#1717], [#4299]).
+  the new `querylog.ignored` or `statistics.ignored` properties ([#1717],
-  The UI changes are coming in the upcoming releases.
+  [#4299]).  The UI changes are coming in the upcoming releases.
 
 ### Changed
 
@@ -280,7 +410,7 @@ In this release, the schema version has changed from 14 to 16.
 
   To rollback this change, move the property back into the `dns` object and
   change the `schema_version` back to `15`.
-- The fields `dns.querylog_enabled`, `dns.querylog_file_enabled`,
+- The properties `dns.querylog_enabled`, `dns.querylog_file_enabled`,
   `dns.querylog_interval`, and `dns.querylog_size_memory` have been moved to the
   new `querylog` object.
 
@@ -338,8 +468,8 @@ See also the [v0.107.23 GitHub milestone][ms-v0.107.23].
 ### Added
 
 - DNS64 support ([#5117]).  The function may be enabled with new `use_dns64`
-  field under `dns` object in the configuration along with `dns64_prefixes`, the
+  property under `dns` object in the configuration along with `dns64_prefixes`,
-  set of exclusion prefixes to filter AAAA responses.  The Well-Known Prefix
+  the set of exclusion prefixes to filter AAAA responses.  The Well-Known Prefix
   (`64:ff9b::/96`) is used if no custom prefixes are specified.
 
 ### Fixed
@@ -997,7 +1127,7 @@ In this release, the schema version has changed from 12 to 14.
       hosts: true
   ```
 
-  The value for `clients.runtime_sources.rdns` field is taken from
+  The value for `clients.runtime_sources.rdns` property is taken from
   `dns.resolve_clients` property.  To rollback this change, remove the
   `runtime_sources` property, move the contents of `persistent` into the
   `clients` itself, the value of `clients.runtime_sources.rdns` into the
@@ -1247,7 +1377,7 @@ See also the [v0.107.0 GitHub milestone][ms-v0.107.0].
   log entries concerning cached responses won't include that information.
 - Finnish and Ukrainian localizations.
 - Setting the timeout for IP address pinging in the "Fastest IP address" mode
-  through the new `fastest_timeout` field in the configuration file ([#1992]).
+  through the new `fastest_timeout` property in the configuration file ([#1992]).
 - Static IP address detection on FreeBSD ([#3289]).
 - Optimistic cache ([#2145]).
 - New possible value of `6h` for `querylog_interval` property ([#2504]).
@@ -1663,7 +1793,7 @@ See also the [v0.105.2 GitHub milestone][ms-v0.105.2].
 - Inconsistent responses for messages with EDNS0 and AD when DNS caching is
   enabled ([#2600]).
 - Incomplete OpenWrt detection ([#2757]).
-- DHCP lease's `expired` field incorrect time format ([#2692]).
+- DHCP lease's `expired` property incorrect time format ([#2692]).
 - Incomplete DNS upstreams validation ([#2674]).
 - Wrong parsing of DHCP options of the `ip` type ([#2688]).
 
@@ -1700,8 +1830,8 @@ See also the [v0.105.1 GitHub milestone][ms-v0.105.1].
   the machine has a static IP.
 - Optical issue on custom rules ([#2641]).
 - Occasional crashes during startup.
-- The field `"range_start"` in the `GET /control/dhcp/status` HTTP API response
+- The property `"range_start"` in the `GET /control/dhcp/status` HTTP API
-  is now correctly named again ([#2678]).
+  response is now correctly named again ([#2678]).
 - DHCPv6 server's `ra_slaac_only` and `ra_allow_slaac` properties aren't reset
   to `false` on update anymore ([#2653]).
 - The `Vary` header is now added along with `Access-Control-Allow-Origin` to
@@ -1771,7 +1901,7 @@ See also the [v0.105.0 GitHub milestone][ms-v0.105.0].
 
 - Go 1.14 support.  v0.106.0 will require at least Go 1.15 to build.
 - The `darwin/386` port.  It will be removed in v0.106.0.
-- The `"rule"` and `"filter_id"` fields in `GET /filtering/check_host` and
+- The `"rule"` and `"filter_id"` property in `GET /filtering/check_host` and
   `GET /querylog` responses.  They will be removed in v0.106.0 ([#2102]).
 
 ### Fixed
@@ -1879,11 +2009,16 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2].
 
 
 <!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.27...HEAD
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.32...HEAD
-[v0.107.27]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.26...v0.107.27
+[v0.107.32]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.31...v0.107.32
 -->
 
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.26...HEAD
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.31...HEAD
+[v0.107.31]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.30...v0.107.31
+[v0.107.30]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.29...v0.107.30
+[v0.107.29]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.28...v0.107.29
+[v0.107.28]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.27...v0.107.28
+[v0.107.27]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.26...v0.107.27
 [v0.107.26]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.25...v0.107.26
 [v0.107.25]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.24...v0.107.25
 [v0.107.24]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.23...v0.107.24

README.md

@@ -466,6 +466,10 @@ bug or implementing the feature.
     Home](https://github.com/ebrianne/adguard-exporter) by
     [@ebrianne](https://github.com/ebrianne).
 
+ *  [Terminal-based, real-time traffic monitoring and statistics for your AdGuard Home
+    instance](https://github.com/Lissy93/AdGuardian-Term) by
+    [@Lissy93](https://github.com/Lissy93)
+
  *  [AdGuard Home on GLInet
     routers](https://forum.gl-inet.com/t/adguardhome-on-gl-routers/10664) by
     [Gl-Inet](https://gl-inet.com/).

bamboo-specs/release.yaml

@@ -7,7 +7,7 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
   'channel': 'edge'
-  'dockerGo': 'adguard/golang-ubuntu:6.2'
+  'dockerGo': 'adguard/golang-ubuntu:6.7'
 
 'stages':
 - 'Build frontend':
@@ -232,25 +232,24 @@
         case "$channel"
         in
         ('release')
-              snapchannel='candidate'
+                snapchannel='candidate'
-              ;;
+                ;;
         ('beta')
-              snapchannel='beta'
+                snapchannel='beta'
-              ;;
+                ;;
         ('edge')
-              snapchannel='edge'
+                snapchannel='edge'
-              ;;
+                ;;
         (*)
-              echo "invalid channel '$channel'"
+                echo "invalid channel '$channel'"
-              exit 1
+                exit 1
-              ;;
+                ;;
         esac
 
         env\
                 SNAPCRAFT_CHANNEL="$snapchannel"\
                 SNAPCRAFT_EMAIL="${bamboo.snapcraftEmail}"\
-                SNAPCRAFT_MACAROON="${bamboo.snapcraftMacaroonPassword}"\
+                SNAPCRAFT_STORE_CREDENTIALS="${bamboo.snapcraftMacaroonPassword}"\
-                SNAPCRAFT_UBUNTU_DISCHARGE="${bamboo.snapcraftUbuntuDischargePassword}"\
                 ../bamboo-deploy-publisher/deploy.sh adguard-home-snap
   'final-tasks':
   - 'clean'
@@ -280,9 +279,9 @@
 
         if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
         then
-              echo "don't publish to GitHub Releases for this channel"
+                echo "don't publish to GitHub Releases for this channel"
 
-              exit 0
+                exit 0
         fi
 
         cd ./dist/
@@ -331,7 +330,7 @@
     # need to build a few of these.
     'variables':
       'channel': 'beta'
-      'dockerGo': 'adguard/golang-ubuntu:6.2'
+      'dockerGo': 'adguard/golang-ubuntu:6.7'
 # release-vX.Y.Z branches are the branches from which the actual final release
 # is built.
 - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -346,4 +345,4 @@
     # are the ones that actually get released.
     'variables':
       'channel': 'release'
-      'dockerGo': 'adguard/golang-ubuntu:6.2'
+      'dockerGo': 'adguard/golang-ubuntu:6.7'

bamboo-specs/test.yaml

@@ -5,7 +5,7 @@
   'key': 'AHBRTSPECS'
   'name': 'AdGuard Home - Build and run tests'
 'variables':
-  'dockerGo': 'adguard/golang-ubuntu:6.2'
+  'dockerGo': 'adguard/golang-ubuntu:6.7'
 
 'stages':
 - 'Tests':

client/dev.eslintrc

@@ -3,4 +3,4 @@
     "rules": {
         "no-debugger":"warn",
     }
-}
+}

client/public/index.html

@@ -12,11 +12,40 @@
         <link rel="mask-icon" href="assets/safari-pinned-tab.svg" color="#67B279">
         <link rel="icon" type="image/png" href="assets/favicon.png" sizes="48x48">
         <title>AdGuard Home</title>
+        <style>
+            .wrapper {
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                justify-content: center;
+                min-height: 100vh;
+            }
+
+            [data-theme="DARK"] .wrapper {
+                background-color: #f5f7fb;
+            }
+        </style>
     </head>
     <body>
         <noscript>
             You need to enable JavaScript to run this app.
         </noscript>
-        <div id="root"></div>
+        <div id="root">
+            <div class="wrapper"></div>
+        </div>
+        <script>
+            (function() {
+                var LOCAL_STORAGE_THEME_KEY = 'account_theme';
+                var theme = 'light';
+
+                try {
+                    theme = window.localStorage.getItem(LOCAL_STORAGE_THEME_KEY);
+                } catch(e) {
+                    console.error(e);
+                }
+
+                document.body.dataset.theme = theme;
+            })();
+        </script>
     </body>
 </html>

client/public/login.html

@@ -17,5 +17,12 @@
             You need to enable JavaScript to run this app.
         </noscript>
         <div id="root"></div>
+        <script>
+            (function() {
+                var prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
+                var currentTheme = prefersDark ? 'dark' : 'light';
+                document.body.dataset.theme = currentTheme;
+            })();
+        </script>
     </body>
 </html>

client/src/__locales/ar.json

@@ -635,5 +635,6 @@
     "parental_control": "الرقابة الابويه",
     "safe_browsing": "تصفح آمن",
     "served_from_cache": "{{value}} <i>(يتم تقديمه من ذاكرة التخزين المؤقت)</i>",
-    "form_error_password_length": "يجب أن تتكون كلمة المرور من {{value}} من الأحرف على الأقل"
+    "form_error_password_length": "يجب أن تتكون كلمة المرور من {{value}} من الأحرف على الأقل",
+    "protection_section_label": "الحماية"
 }

client/src/__locales/be.json

@@ -150,7 +150,7 @@
     "dns_allowlists": "Белыя спісы DNS",
     "dns_blocklists_desc": "AdGuard Home будзе блакаваць дамены з чорных спісаў.",
     "dns_allowlists_desc": "Дамены з белых спісаў DNS будуць дазволены, нават калі яны знаходзяцца ў любым з чорных спісаў.",
-    "custom_filtering_rules": "Карыстацкія правілы фільтрацыі",
+    "custom_filtering_rules": "Карыстальніцкія правілы фільтрацыі",
     "encryption_settings": "Налады шыфравання",
     "dhcp_settings": "Налады DHCP",
     "upstream_dns": "Upstream DNS-серверы",
@@ -247,7 +247,7 @@
     "loading_table_status": "Загрузка...",
     "page_table_footer_text": "Старонка",
     "rows_table_footer_text": "радкоў",
-    "updated_custom_filtering_toast": "Занесены змены ў карыстацкія правілы",
+    "updated_custom_filtering_toast": "Карыстальніцкія правілы паспяхова захаваны",
     "rule_removed_from_custom_filtering_toast": "Карыстацкае правіла выдалена: {{rule}}",
     "rule_added_to_custom_filtering_toast": "Карыстацкае правіла дададзена: {{rule}}",
     "query_log_response_status": "Статус: {{value}}",
@@ -568,7 +568,7 @@
     "check_desc": "Праверыць фільтрацыю імя хаста",
     "check": "Праверыць",
     "form_enter_host": "Увядзіце імя хаста",
-    "filtered_custom_rules": "Адфільтраваны з дапамогай карыстацкіх правілаў фільтрацыі",
+    "filtered_custom_rules": "Адфільтраваны з дапамогай карыстальніцкіх правіл фільтрацыі",
     "choose_from_list": "Абраць са спіса",
     "add_custom_list": "Дадаць свой спіс",
     "host_whitelisted": "Хост занесены ў белы спіс",
@@ -642,5 +642,6 @@
     "anonymizer_notification": "<0>Заўвага:</0> Ананімізацыя IP уключана. Вы можаце адключыць яе ў <1>Агульных наладах</1>.",
     "confirm_dns_cache_clear": "Вы ўпэўнены, што хочаце ачысціць кэш DNS?",
     "cache_cleared": "Кэш DNS паспяхова ачышчаны",
-    "clear_cache": "Ачысціць кэш"
+    "clear_cache": "Ачысціць кэш",
+    "protection_section_label": "Ахова"
 }

client/src/__locales/cs.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "Protokol dotazů byl úspěšně vymazán",
     "query_log_updated": "Protokol dotazů byl úspěšně aktualizován",
     "query_log_clear": "Vymazat protokoly dotazů",
-    "query_log_retention": "Uchování protokolů dotazů",
+    "query_log_retention": "Rotace protokolů dotazů",
     "query_log_enable": "Povolit protokol",
     "query_log_configuration": "Konfigurace protokolů",
     "query_log_disabled": "Protokol dotazu je zakázán a lze jej nakonfigurovat v <0>nastavení</0>",
     "query_log_strict_search": "Pro striktní vyhledávání použijte dvojité uvozovky",
-    "query_log_retention_confirm": "Opravdu chcete změnit uchovávání protokolu dotazů? Pokud snížíte hodnotu intervalu, některá data budou ztracena",
+    "query_log_retention_confirm": "Opravdu chcete změnit rotaci protokolu dotazů? Pokud snížíte hodnotu intervalu, některá data budou ztracena",
     "anonymize_client_ip": "Anonymizovat IP klienta",
     "anonymize_client_ip_desc": "Neukládat úplnou IP adresu klienta do protokolů a statistik",
     "dns_config": "Konfigurace DNS serveru",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "Vypnout ochranu na {{count}} hod.",
     "disable_notify_for_hours_plural": "Vypnout ochranu na {{count}} hod.",
     "disable_notify_until_tomorrow": "Vypnout ochranu do zítřka",
-    "enable_protection_timer": "Ochrana bude zapnuta za {{time}}"
+    "enable_protection_timer": "Ochrana bude zapnuta za {{time}}",
+    "custom_retention_input": "Zadejte retenci v hodinách",
+    "custom_rotation_input": "Zadejte rotaci v hodinách",
+    "protection_section_label": "Ochrana",
+    "log_and_stats_section_label": "Protokol dotazů a statistiky",
+    "ignore_query_log": "Ignorovat tohoto klienta v protokolu dotazů",
+    "ignore_statistics": "Ignorovat tohoto klienta ve statistikách"
 }

client/src/__locales/da.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "Forespørgselsloggen er blevet ryddet",
     "query_log_updated": "Forespørgselsloggen er blevet opdateret",
     "query_log_clear": "Ryd forespørgselslogfiler",
-    "query_log_retention": "Opbevar forespørgselslogger i",
+    "query_log_retention": "Rotation af forespørgselslog",
     "query_log_enable": "Aktivér log",
     "query_log_configuration": "Opsætning af logger",
     "query_log_disabled": "Forespørgselsloggen er deaktiveret og kan opsættes i <0>indstillingerne</0>",
     "query_log_strict_search": "Brug dobbelt anførselstegn til stringent søgning",
-    "query_log_retention_confirm": "Sikker på, at du vil ændre forespørgselsloggens opbevaringperiode? Mindskes intervalværdien, mistes data",
+    "query_log_retention_confirm": "Sikker på, at forespørgselsloggens rotationstid skal ændres? Mindskes intervalværdien, mistes nogle data",
     "anonymize_client_ip": "Anonymisér klient-IP",
     "anonymize_client_ip_desc": "Gem ikke fuld klient IP-adresse i logfiler eller statistikker",
     "dns_config": "DNS-serveropsætning",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "Deaktivere beskyttelse i {{count}} time",
     "disable_notify_for_hours_plural": "Deaktivere beskyttelse i {{count}} timer",
     "disable_notify_until_tomorrow": "Deaktiver beskyttelse indtil i morgen",
-    "enable_protection_timer": "Beskyttelse deaktiveres om {{time}}"
+    "enable_protection_timer": "Beskyttelse deaktiveres om {{time}}",
+    "custom_retention_input": "Angiv opbevaringstid i timer",
+    "custom_rotation_input": "Angiv rotationstid i timer",
+    "protection_section_label": "Beskyttelse",
+    "log_and_stats_section_label": "Forespørgselslog og statistik",
+    "ignore_query_log": "Ignorér denne klient i forespørgselslog",
+    "ignore_statistics": "Ignorér denne klient i statistik"
 }

client/src/__locales/de.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "Das Abfrageprotokoll wurde erfolgreich gelöscht",
     "query_log_updated": "Das Abfrageprotokoll wurde erfolgreich aktualisiert",
     "query_log_clear": "Abfrageprotokolle leeren",
-    "query_log_retention": "Abfrageprotokolle aufbewahren",
+    "query_log_retention": "Rotation der Abfrageprotokolle",
     "query_log_enable": "Protokoll aktivieren",
     "query_log_configuration": "Konfiguration der Protokolle",
     "query_log_disabled": "Das Abfrageprotokoll ist deaktiviert und kann in den <0>Einstellungen</0> konfiguriert werden.",
     "query_log_strict_search": "Doppelte Anführungszeichen für die strikte Suche verwenden",
-    "query_log_retention_confirm": "Möchten Sie die Aufbewahrung des Abfrageprotokolls wirklich ändern? Wenn Sie den Zeitabstand verringern, gehen einige Daten verloren.",
+    "query_log_retention_confirm": "Möchten Sie die Abfrageprotokollrotation wirklich ändern? Wenn Sie den Intervallwert verringern, gehen einige Daten verloren",
     "anonymize_client_ip": "Client-IP anonymisieren",
     "anonymize_client_ip_desc": "Vollständige IP-Adresse des Clients nicht in Protokollen und Statistiken speichern",
     "dns_config": "DNS-Serverkonfiguration",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "Schutz für {{count}} Stunde deaktivieren",
     "disable_notify_for_hours_plural": "Schutz für {{count}} Stunden deaktivieren",
     "disable_notify_until_tomorrow": "Schutz bis morgen deaktivieren",
-    "enable_protection_timer": "Der Schutz wird in {{time}} wieder aktiviert"
+    "enable_protection_timer": "Der Schutz wird in {{time}} wieder aktiviert",
+    "custom_retention_input": "Rückhaltezeit in Stunden eingeben",
+    "custom_rotation_input": "Rotation in Stunden eingeben",
+    "protection_section_label": "Schutz",
+    "log_and_stats_section_label": "Abfrageprotokoll und Statistik",
+    "ignore_query_log": "Diesen Client im Abfrageprotokoll ignorieren",
+    "ignore_statistics": "Diesen Client in der Statistik ignorieren"
 }

client/src/__locales/en.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "The query log has been successfully cleared",
     "query_log_updated": "The query log has been successfully updated",
     "query_log_clear": "Clear query logs",
-    "query_log_retention": "Query logs retention",
+    "query_log_retention": "Query logs rotation",
     "query_log_enable": "Enable log",
     "query_log_configuration": "Logs configuration",
     "query_log_disabled": "The query log is disabled and can be configured in the <0>settings</0>",
     "query_log_strict_search": "Use double quotes for strict search",
-    "query_log_retention_confirm": "Are you sure you want to change query log retention? If you decrease the interval value, some data will be lost",
+    "query_log_retention_confirm": "Are you sure you want to change query log rotation? If you decrease the interval value, some data will be lost",
     "anonymize_client_ip": "Anonymize client IP",
     "anonymize_client_ip_desc": "Don't save the client's full IP address to logs or statistics",
     "dns_config": "DNS server configuration",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "Disable protection for {{count}} hour",
     "disable_notify_for_hours_plural": "Disable protection for {{count}} hours",
     "disable_notify_until_tomorrow": "Disable protection until tomorrow",
-    "enable_protection_timer": "Protection will be enabled in {{time}}"
+    "enable_protection_timer": "Protection will be enabled in {{time}}",
+    "custom_retention_input": "Enter retention in hours",
+    "custom_rotation_input": "Enter rotation in hours",
+    "protection_section_label": "Protection",
+    "log_and_stats_section_label": "Query log and statistics",
+    "ignore_query_log": "Ignore this client in query log",
+    "ignore_statistics": "Ignore this client in statistics"
 }

client/src/__locales/es.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "El registro de consultas se ha borrado correctamente",
     "query_log_updated": "El registro de consultas se ha actualizado correctamente",
     "query_log_clear": "Borrar registros de consultas",
-    "query_log_retention": "Retención de registros de consultas",
+    "query_log_retention": "Rotanción de registros de consultas",
     "query_log_enable": "Habilitar registro",
     "query_log_configuration": "Configuración de registros",
     "query_log_disabled": "El registro de consultas está deshabilitado y se puede configurar en la <0>configuración</0>",
     "query_log_strict_search": "Usar comillas dobles para una búsqueda estricta",
-    "query_log_retention_confirm": "¿Estás seguro de que deseas cambiar la retención del registro de consultas? Si disminuye el valor del intervalo, se perderán algunos datos",
+    "query_log_retention_confirm": "¿Está seguro de que deseas cambiar la rotación del registro de consultas? Si reduces el valor del intervalo, se perderán algunos datos",
     "anonymize_client_ip": "Anonimizar IP del cliente",
     "anonymize_client_ip_desc": "No guarda la dirección IP completa del cliente en registros o estadísticas",
     "dns_config": "Configuración del servidor DNS",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "Desactivar la protección por {{count}} hora",
     "disable_notify_for_hours_plural": "Desactivar la protección por {{count}} horas",
     "disable_notify_until_tomorrow": "Desactivar la protección hasta mañana",
-    "enable_protection_timer": "La protección se activará en {{time}}"
+    "enable_protection_timer": "La protección se activará en {{time}}",
+    "custom_retention_input": "Ingresa la retención en horas",
+    "custom_rotation_input": "Ingresa la rotación en horas",
+    "protection_section_label": "Protección",
+    "log_and_stats_section_label": "Registro de consultas y estadísticas",
+    "ignore_query_log": "Ignorar este cliente en el registro de consultas",
+    "ignore_statistics": "Ignorar este cliente en las estadísticas"
 }

client/src/__locales/fa.json

@@ -268,6 +268,8 @@
     "blocking_mode_nxdomain": "NXDOMAIN: پاسخ با کُد NXDOMAIN",
     "blocking_mode_null_ip": "Null IP: پاسخ با آدرس آی پی صفر(0.0.0.0 برای A; :: برای AAAA)",
     "blocking_mode_custom_ip": "آی پی دستی: پاسخ با آدرس آی پی دستی تنظیم شده",
+    "theme_light": "پوسته روشن",
+    "theme_dark": "پوسته تیره",
     "upstream_dns_client_desc": "اگر این فیلد را خالی نگه دارید، AdGuard Home از سرور پیکربندی شده در <0> تنظیماتDNS </0> استفاده می کند.",
     "tracker_source": "منبع ردیاب",
     "source_label": "منبع",
@@ -567,5 +569,6 @@
     "use_saved_key": "از کلید ذخیره شده قبلی استفاده کنید",
     "parental_control": "نظارت والدین",
     "safe_browsing": "وب گردی اَمن",
-    "form_error_password_length": "رمزعبور باید حداقل {{value}} کاراکتر باشد."
+    "form_error_password_length": "رمزعبور باید حداقل {{value}} کاراکتر باشد.",
+    "protection_section_label": "حفاظت"
 }

client/src/__locales/fi.json

@@ -86,7 +86,7 @@
     "request_details": "Pyynnön tiedot",
     "client_details": "Päätelaitteen tiedot",
     "details": "Yksityiskohdat",
-    "back": "Takaisin",
+    "back": "Palaa takaisin",
     "dashboard": "Tila",
     "settings": "Asetukset",
     "filters": "Suodattimet",
@@ -146,8 +146,8 @@
     "no_servers_specified": "Palvelimia ei ole määritetty",
     "general_settings": "Yleiset asetukset",
     "dns_settings": "DNS-asetukset",
-    "dns_blocklists": "DNS-estolistat",
+    "dns_blocklists": "DNS-estot",
-    "dns_allowlists": "DNS-sallittujen listat",
+    "dns_allowlists": "DNS-sallinnat",
     "dns_blocklists_desc": "AdGuard Home estää estolistalla olevat verkkotunnukset.",
     "dns_allowlists_desc": "DNS-sallittujen listalla olevat verkkotunnukset sallitaan myös silloin, jos ne ovat jollain muulla estolistalla.",
     "custom_filtering_rules": "Omat suodatussäännöt",
@@ -257,12 +257,12 @@
     "query_log_cleared": "Pyyntöhistorian tyhjennys onnistui",
     "query_log_updated": "Pyyntöhistorian päivitys onnistui",
     "query_log_clear": "Tyhjennä pyyntöhistoria",
-    "query_log_retention": "Pyyntöhistorian säilytys",
+    "query_log_retention": "Kyselylokien kierto",
     "query_log_enable": "Käytä historiaa",
     "query_log_configuration": "Historian määritys",
     "query_log_disabled": "Pyyntöhistoria ei ole käytössä. Voit ottaa sen käyttöön <0>asetuksissa</0>",
     "query_log_strict_search": "Käytä tarkalle haulle lainausmerkkejä",
-    "query_log_retention_confirm": "Haluatko varmasti muuttaa pyyntöhistoriasi säilytysaikaa? Jos lyhennät aikaa, joitakin tietoja menetetään",
+    "query_log_retention_confirm": "Haluatko varmasti muuttaa kyselylokin kiertoa? Jos pienennät intervalliarvoa, osa tiedoista menetetään",
     "anonymize_client_ip": "Piilota päätelaitteen IP-osoite",
     "anonymize_client_ip_desc": "Älä tallenna päätelaitteen täydellistä IP-osoitetta historiaan ja tilastoihin.",
     "dns_config": "DNS-palvelimen määritys",
@@ -627,7 +627,7 @@
     "cache_optimistic": "Optimistinen välimuisti",
     "cache_optimistic_desc": "Pakota AdGuard Home vastaamaan välimuistista vaikka tiedot olisivat vanhentuneet. Pyri samalla myös päivittämään tiedot.",
     "filter_category_general": "Yleiset",
-    "filter_category_security": "Turvallisuus",
+    "filter_category_security": "Tietoturva",
     "filter_category_regional": "Alueelliset",
     "filter_category_other": "Muut",
     "filter_category_general_desc": "Listat, jotka estävät seurannan ja mainokset useimmilla laitteilla",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "Poista suojaus käytöstä {{count}} tunniksi",
     "disable_notify_for_hours_plural": "Poista suojaus käytöstä {{count}} tunniksi",
     "disable_notify_until_tomorrow": "Poista suojaus käytöstä huomiseen asti",
-    "enable_protection_timer": "Suojaus otetaan käyttöön {{time}} kuluttua"
+    "enable_protection_timer": "Suojaus otetaan käyttöön {{time}} kuluttua",
+    "custom_retention_input": "Syötä säilytysaika tunteina",
+    "custom_rotation_input": "Syötä uudistusaika tunteina",
+    "protection_section_label": "Suojaus",
+    "log_and_stats_section_label": "Kyselyhistoria ja tilastot",
+    "ignore_query_log": "Älä huomioi tätä päätettä kyselyhistoriassa",
+    "ignore_statistics": "Älä huomioi tätä päätettä tilastoissa"
 }

client/src/__locales/fr.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "Le journal des requêtes a été effacé",
     "query_log_updated": "Le journal des requêtes a été mis à jour",
     "query_log_clear": "Effacer journal des requêtes",
-    "query_log_retention": "Rétention du journal des requêtes",
+    "query_log_retention": "Rotation des journaux de requêtes",
     "query_log_enable": "Activer le journal",
     "query_log_configuration": "Configuration du journal",
     "query_log_disabled": "Le journal des requêtes est désactivé et peut être configuré dans les <0>paramètres</0>",
     "query_log_strict_search": "Utilisez les doubles guillemets pour une recherche stricte",
-    "query_log_retention_confirm": "Êtes-vous sûr de vouloir modifier la rétention des journaux de requêtes ? Si vous diminuez la valeur de l'intervalle, certaines données seront perdues",
+    "query_log_retention_confirm": "Êtes-vous sûr de souhaiter modifier la rotation des journaux de requêtes ? Si vous diminuez la valeur de l'intervalle, certaines données seront perdues",
     "anonymize_client_ip": "Anonymiser l’IP du client",
     "anonymize_client_ip_desc": "Ne pas enregistrer l’adresse IP complète du client dans les journaux et statistiques",
     "dns_config": "Configuration du serveur DNS",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "Désactiver la protection pendant {{count}} heure",
     "disable_notify_for_hours_plural": "Désactiver la protection pendant {{count}} heures",
     "disable_notify_until_tomorrow": "Désactiver la protection jusqu'à demain",
-    "enable_protection_timer": "La protection sera activée dans {{time}}"
+    "enable_protection_timer": "La protection sera activée dans {{time}}",
+    "custom_retention_input": "Saisir la rétention en heures",
+    "custom_rotation_input": "Saisir la rotation en heures",
+    "protection_section_label": "Protection",
+    "log_and_stats_section_label": "Journal des requêtes et statistiques",
+    "ignore_query_log": "Ignorer ce client dans le journal des requêtes",
+    "ignore_statistics": "Ignorer ce client dans les statistiques"
 }

client/src/__locales/hr.json

@@ -167,6 +167,7 @@
     "enabled_parental_toast": "Omogućen roditeljski nadzor",
     "disabled_safe_search_toast": "Onemogućeno sigurno pretraživanje",
     "enabled_save_search_toast": "Omogućeno sigurno pretraživanje",
+    "updated_save_search_toast": "Ažurirane postavke sigurnog pretraživanja",
     "enabled_table_header": "Omogućeno",
     "name_table_header": "Naziv",
     "list_url_table_header": "URL popisa",
@@ -256,12 +257,12 @@
     "query_log_cleared": "Zapisnik upita je uspješno uklonjen",
     "query_log_updated": "Zapisnik upita je uspješno ažuriran",
     "query_log_clear": "Očisti zapisnik upita",
-    "query_log_retention": "Spremanje zapisnika upita",
+    "query_log_retention": "Rotacija dnevnika upita",
     "query_log_enable": "Omogući zapise",
     "query_log_configuration": "Postavke zapisa",
     "query_log_disabled": "Zapisnik upita je onemogućen i može se postaviti u <0>postavkama</0>",
     "query_log_strict_search": "Koristite dvostruke navodnike za strogo pretraživanje",
-    "query_log_retention_confirm": "Jeste li sigurni da želite promijeniti zadržavanje zapisnika upita? Ako smanjite vrijednost intervala, neki će podaci biti izgubljeni",
+    "query_log_retention_confirm": "Jeste li sigurni da želite promijeniti rotaciju dnevnika upita? Ako smanjite vrijednost intervala, neki će se podaci izgubiti",
     "anonymize_client_ip": "Anonimiraj IP klijenta",
     "anonymize_client_ip_desc": "Ne spremajte cijelu IP adresu klijenta u zapisnike i statistike",
     "dns_config": "DNS postavke poslužitelja",
@@ -290,6 +291,8 @@
     "rate_limit": "Ograničenje",
     "edns_enable": "Omogući podmrežu klijenta EDNS-a",
     "edns_cs_desc": "Dodajte opciju EDNS klijentske podmreže (ECS) uzvodnim zahtjevima i zabilježite vrijednosti koje su klijenti poslali u dnevnik upita.",
+    "edns_use_custom_ip": "Koristi prilagođeni IP za EDNS",
+    "edns_use_custom_ip_desc": "Dopusti korištenje prilagođenog IP-a za EDNS",
     "rate_limit_desc": "Broj zahtjeva u sekundi koji su dopušteni po jednom klijentu. Postavljanje na 0 znači neograničeno.",
     "blocking_ipv4_desc": "Povratna IP adresa za blokirane A zahtjeve",
     "blocking_ipv6_desc": "Povratna IP adresa za blokirane AAAA zahtjeve",
@@ -523,6 +526,10 @@
     "statistics_retention_confirm": "Jeste li sigurni da želite promijeniti zadržavanje statistike? Ako smanjite vrijednost intervala, neki će podaci biti izgubljeni",
     "statistics_cleared": "Statistika je uspješno uklonjenja",
     "statistics_enable": "Omogući statistiku",
+    "ignore_domains": "Zanemarene domene (odvojene novim retkom)",
+    "ignore_domains_title": "Zanemarene domene",
+    "ignore_domains_desc_stats": "Upiti za ove domene ne upisuju se u statistiku",
+    "ignore_domains_desc_query": "Upiti za te domene nisu zapisani u zapisnik upita",
     "interval_hours": "{{count}} sata/i",
     "interval_hours_plural": "{{count}} sata/i",
     "filters_configuration": "Postavke filtara",
@@ -642,5 +649,30 @@
     "anonymizer_notification": "<0>Napomena:</0>IP anonimizacija je omogućena. Možete ju onemogućiti u <1>općim postavkama</1>.",
     "confirm_dns_cache_clear": "Jeste li sigurni da želite očistiti DNS predmemoriju?",
     "cache_cleared": "DNS predmemorija je uspješno izbrisana",
-    "clear_cache": "Očisti predmemoriju"
+    "clear_cache": "Očisti predmemoriju",
+    "make_static": "Učini statičnim",
+    "theme_auto_desc": "Automatski (na temelju sheme boja vašeg uređaja)",
+    "theme_dark_desc": "Tamna tema",
+    "theme_light_desc": "Svijetla tema",
+    "disable_for_seconds": "Za {{count}} sekundi",
+    "disable_for_seconds_plural": "Za {{count}} sekundi",
+    "disable_for_minutes": "Za {{count}} minuta",
+    "disable_for_minutes_plural": "Za {{count}} minuta",
+    "disable_for_hours": "Za {{count}} sati",
+    "disable_for_hours_plural": "Za {{count}} sati",
+    "disable_until_tomorrow": "Do sutra",
+    "disable_notify_for_seconds": "Isključi zaštitu na {{count}} sekundi",
+    "disable_notify_for_seconds_plural": "Onemogući zaštitu na {{count}} sekundi",
+    "disable_notify_for_minutes": "Isključi zaštitu na {{count}} minuta",
+    "disable_notify_for_minutes_plural": "Isključi zaštitu na {{count}} minuta",
+    "disable_notify_for_hours": "Isključi zaštitu na {{count}} sati",
+    "disable_notify_for_hours_plural": "Isključi zaštitu na {{count}} sati",
+    "disable_notify_until_tomorrow": "Isključi zaštitu do sutra",
+    "enable_protection_timer": "Zaštita će biti omogućena u {{time}}",
+    "custom_retention_input": "Unesite zadržavanje u satima",
+    "custom_rotation_input": "Unesite rotaciju u satima",
+    "protection_section_label": "Zaštita",
+    "log_and_stats_section_label": "Zapisnik upita i statistika",
+    "ignore_query_log": "Zanemari ovog klijenta u zapisniku upita",
+    "ignore_statistics": "Ignorirajte ovog klijenta u statistici"
 }

client/src/__locales/hu.json

@@ -642,5 +642,6 @@
     "anonymizer_notification": "<0>Megjegyzés:</0> Az IP anonimizálás engedélyezve van. Az <1>Általános beállításoknál letilthatja</1> .",
     "confirm_dns_cache_clear": "Biztos benne, hogy törölni szeretné a DNS-gyorsítótárat?",
     "cache_cleared": "A DNS gyorsítótár sikeresen törlődött",
-    "clear_cache": "Gyorsítótár törlése"
+    "clear_cache": "Gyorsítótár törlése",
+    "protection_section_label": "Védelem"
 }

client/src/__locales/id.json

@@ -641,5 +641,6 @@
     "anonymizer_notification": "<0>Catatan:</0> Anonimisasi IP diaktifkan. Anda dapat menonaktifkannya di <1>Pengaturan umum</1> .",
     "confirm_dns_cache_clear": "Apakah Anda yakin ingin menghapus cache DNS?",
     "cache_cleared": "Cache DNS berhasil dibersihkan",
-    "clear_cache": "Hapus cache"
+    "clear_cache": "Hapus cache",
+    "protection_section_label": "Perlindungan"
 }

client/src/__locales/it.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "Il registro richieste è stato correttamente cancellato",
     "query_log_updated": "Il registro richieste è stato correttamente aggiornato",
     "query_log_clear": "Cancella registri richieste",
-    "query_log_retention": "Conservazione dei registri richieste",
+    "query_log_retention": "Rotazione dei registri richieste",
     "query_log_enable": "Attiva registro",
     "query_log_configuration": "Configurazione registri",
     "query_log_disabled": "Il registro richieste è stato disattivato e può essere configurata dalle <0>impostazioni</0>",
     "query_log_strict_search": "Utilizzare le doppie virgolette per una ricerca precisa",
-    "query_log_retention_confirm": "Sei sicuro di voler modificare il registro delle richieste? Se il valore di intervallo dovesse diminuire, alcuni dati andranno persi",
+    "query_log_retention_confirm": "Sei sicuro di voler modificare il registro delle richieste? Se si riduce il valore dell'intervallo, alcuni dati andranno persi",
     "anonymize_client_ip": "Anonimizza client IP",
     "anonymize_client_ip_desc": "Non salvare l'indirizzo IP completo del client nel registro o nelle statistiche",
     "dns_config": "Configurazione server DNS",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "Disattiva la protezione per {{count}} ora",
     "disable_notify_for_hours_plural": "Disattiva la protezione per {{count}} ore",
     "disable_notify_until_tomorrow": "Disattiva la protezione fino a domani",
-    "enable_protection_timer": "La protezione verrà attivata in {{time}}"
+    "enable_protection_timer": "La protezione verrà attivata in {{time}}",
+    "custom_retention_input": "Inserisci la conservazione in ore",
+    "custom_rotation_input": "Inserisci la rotazione in ore",
+    "protection_section_label": "Protezione",
+    "log_and_stats_section_label": "Registro richieste e statistiche",
+    "ignore_query_log": "Ignora questo client nel registro delle richieste",
+    "ignore_statistics": "Ignora questo cliente nelle statistiche"
 }

client/src/__locales/ja.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "クエリ・ログの消去に成功しました",
     "query_log_updated": "クエリ・ログの更新が成功しました",
     "query_log_clear": "クエリ・ログを消去する",
-    "query_log_retention": "クエリ・ログの保持",
+    "query_log_retention": "クエリ・ログのローテーション",
     "query_log_enable": "ログを有効にする",
     "query_log_configuration": "ログ設定",
     "query_log_disabled": "クエリ・ログは無効になっており、<0>設定</0>で構成できます",
     "query_log_strict_search": "完全一致検索には二重引用符を使用します",
-    "query_log_retention_confirm": "クエリ・ログの保持を変更してもよろしいですか？ 期間を短くすると、一部のデータが失われます",
+    "query_log_retention_confirm": "クエリ・ログのローテーションを変更してもよろしいですか？ 間隔の値を減らすと、一部のデータが失われます",
     "anonymize_client_ip": "クライアントIPを匿名化する",
     "anonymize_client_ip_desc": "ログと統計にクライアントのフルIPアドレスを保存しないようにします。",
     "dns_config": "DNSサーバ設定",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "保護を {{count}} 時間無効にする",
     "disable_notify_for_hours_plural": "保護を {{count}} 時間無効にする",
     "disable_notify_until_tomorrow": "明日まで保護を無効にする",
-    "enable_protection_timer": "保護は後 {{time}} で有効になります"
+    "enable_protection_timer": "保護は後 {{time}} で有効になります",
+    "custom_retention_input": "保持期間を入力してください（時間単位）",
+    "custom_rotation_input": "ローテーションを入力してください（時間単位）",
+    "protection_section_label": "AdGuardによる保護",
+    "log_and_stats_section_label": "クエリ・ログと統計情報",
+    "ignore_query_log": "クエリ・ログでこのクライアントを無視する",
+    "ignore_statistics": "統計でこのクライアントを無視する"
 }

client/src/__locales/ko.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "쿼리 로그를 성공적으로 초기화했습니다",
     "query_log_updated": "질의 로그가 성공적으로 업데이트되었습니다",
     "query_log_clear": "쿼리 로그 비우기",
-    "query_log_retention": "쿼리 로그 저장 기간",
+    "query_log_retention": "쿼리 로그 로테이션",
     "query_log_enable": "로그 활성화",
     "query_log_configuration": "로그 구성",
     "query_log_disabled": "쿼리 로그가 비활성화되어 있으며 <0>설정</0>에서 설정할 수 있습니다",
     "query_log_strict_search": "검색을 제한하려면 쌍따옴표를 사용해주세요",
-    "query_log_retention_confirm": "정말로 쿼리 로그 저장 기간을 변경하시겠습니까? 저장 주기를 낮출 경우, 일부 데이터가 손실됩니다",
+    "query_log_retention_confirm": "쿼리 로그 로테이션을 변경하시겠습니까? 간격 값을 줄이면 일부 데이터가 손실됩니다.",
     "anonymize_client_ip": "클라이언트 IP 익명화",
     "anonymize_client_ip_desc": "클라이언트의 전체 IP 주소를 로그와 통계에 저장하저장하지 마세요",
     "dns_config": "DNS 서버 설정",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "{{count}}시간 동안 보호 기능 비활성화",
     "disable_notify_for_hours_plural": "{{count}}시간 동안 보호 기능 비활성화",
     "disable_notify_until_tomorrow": "내일까지 보호 기능 비활성화",
-    "enable_protection_timer": "{{time}}에 보호 기능이 활성화됩니다."
+    "enable_protection_timer": "{{time}}에 보호 기능이 활성화됩니다.",
+    "custom_retention_input": "시간 단위로 보존 기간 입력",
+    "custom_rotation_input": "시간 단위로 로테이션 입력",
+    "protection_section_label": "보호",
+    "log_and_stats_section_label": "쿼리 로그 및 통계",
+    "ignore_query_log": "쿼리 로그에서 이 클라이언트 무시",
+    "ignore_statistics": "통계에서 이 클라이언트 무시"
 }

client/src/__locales/nl.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "Het query logboek is succesvol geleegd",
     "query_log_updated": "Het query logboek is succesvol bijgewerkt",
     "query_log_clear": "Leeg query logs",
-    "query_log_retention": "Query logs bewaartermijn",
+    "query_log_retention": "Query logs rotatie",
     "query_log_enable": "Log bestanden inschakelen",
     "query_log_configuration": "Logbestanden instellingen",
     "query_log_disabled": "Het query logboek is uitgeschakeld en kan worden geconfigureerd in de <0>instellingen</0>",
     "query_log_strict_search": "Gebruik dubbele aanhalingstekens voor strikt zoeken",
-    "query_log_retention_confirm": "Weet u zeker dat u de bewaartermijn van het query logboek wilt wijzigen? Als u de intervalwaarde verlaagt, gaan sommige gegevens verloren",
+    "query_log_retention_confirm": "Weet u zeker dat u de rotatie van het querylogboek wilt wijzigen? Als u de intervalwaarde verlaagt, gaan sommige gegevens verloren",
     "anonymize_client_ip": "Cliënt IP anonimiseren",
     "anonymize_client_ip_desc": "Het volledige IP-adres van de cliënt niet opnemen in logboeken en statistiekbestanden",
     "dns_config": "DNS-server configuratie",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "Beveiliging uitschakelen voor {{count}} uur",
     "disable_notify_for_hours_plural": "Beveiliging uitschakelen voor {{count}} uren",
     "disable_notify_until_tomorrow": "Beveiliging uitschakelen tot morgen",
-    "enable_protection_timer": "Bescherming wordt ingeschakeld over {{time}}"
+    "enable_protection_timer": "Bescherming wordt ingeschakeld over {{time}}",
+    "custom_retention_input": "Voer retentie in uren in",
+    "custom_rotation_input": "Voer rotatie in uren in",
+    "protection_section_label": "Bescherming",
+    "log_and_stats_section_label": "Aanvragenlogboek en statistieken",
+    "ignore_query_log": "Deze client negeren in het aanvragenlogboek",
+    "ignore_statistics": "Deze client negeren in de statistieken"
 }

client/src/__locales/no.json

@@ -282,6 +282,8 @@
     "blocking_mode_null_ip": "Null IP: Svar med en 0-IP-adresse (0.0.0.0 for A; :: for AAAA)",
     "blocking_mode_custom_ip": "Tilpasset IP: Svar med en manuelt valgt IP-adresse",
     "theme_auto": "Auto",
+    "theme_light": "Lyst tema",
+    "theme_dark": "Mørkt tema",
     "upstream_dns_client_desc": "Hvis dette feltet holdes tomt, vil AdGuard Home bruke tjenerne som er satt opp i <0>DNS-innstillingene</0>.",
     "tracker_source": "Sporerkilde",
     "source_label": "Kilde",
@@ -614,5 +616,6 @@
     "use_saved_key": "Bruk den tidligere lagrede nøkkelen",
     "parental_control": "Foreldrekontroll",
     "safe_browsing": "Sikker surfing",
-    "served_from_cache": "{{value}} <i>(formidlet fra mellomlageret)</i>"
+    "served_from_cache": "{{value}} <i>(formidlet fra mellomlageret)</i>",
+    "protection_section_label": "Beskyttelse"
 }

client/src/__locales/pl.json

@@ -167,6 +167,7 @@
     "enabled_parental_toast": "Włączona Kontrola Rodzicielska",
     "disabled_safe_search_toast": "Wyłączone bezpieczne wyszukiwanie",
     "enabled_save_search_toast": "Włączone bezpieczne wyszukiwanie",
+    "updated_save_search_toast": "Zaktualizowano ustawienia bezpiecznego wyszukiwania",
     "enabled_table_header": "Włączone",
     "name_table_header": "Nazwa",
     "list_url_table_header": "Adres URL listy",
@@ -221,7 +222,7 @@
     "all_lists_up_to_date_toast": "Wszystkie listy są już aktualne",
     "updated_upstream_dns_toast": "Serwery nadrzędne zostały pomyślnie zapisane",
     "dns_test_ok_toast": "Określone serwery DNS działają poprawnie",
-    "dns_test_not_ok_toast": "Serwer \"{{key}}\": nie można go użyć, sprawdź, czy napisałeś go poprawnie",
+    "dns_test_not_ok_toast": "Serwer \"{{key}}\": nie może być użyte, sprawdź, czy zapisano go poprawnie",
     "dns_test_warning_toast": "Upstream \"{{key}}\" nie odpowiada na zapytania testowe i może nie działać prawidłowo",
     "unblock": "Odblokuj",
     "block": "Zablokuj",
@@ -256,12 +257,12 @@
     "query_log_cleared": "Dziennik zapytań został pomyślnie wyczyszczony",
     "query_log_updated": "Dziennik zapytań został zaktualizowany",
     "query_log_clear": "Wyczyść dzienniki zapytań",
-    "query_log_retention": "Przechowywanie dzienników zapytań",
+    "query_log_retention": "Rotacja dzienników zapytań",
     "query_log_enable": "Włącz dziennik",
     "query_log_configuration": "Konfiguracja dzienników",
     "query_log_disabled": "Dziennik zapytań jest wyłączony i można go skonfigurować w <0>ustawieniach</0>",
     "query_log_strict_search": "Używaj podwójnych cudzysłowów do ścisłego wyszukiwania",
-    "query_log_retention_confirm": "Czy na pewno chcesz zmienić sposób przechowywania dziennika zapytań? Jeśli zmniejszysz wartość interwału, niektóre dane zostaną utracone",
+    "query_log_retention_confirm": "Czy na pewno chcesz zmienić rotację dziennika zapytań? Jeśli zmniejszysz wartość interwału, niektóre dane zostaną utracone",
     "anonymize_client_ip": "Anonimizuj adres IP klienta",
     "anonymize_client_ip_desc": "Nie zapisuj pełnego adresu IP w dziennikach i statystykach",
     "dns_config": "Konfiguracja serwera DNS",
@@ -290,6 +291,8 @@
     "rate_limit": "Limit ilościowy",
     "edns_enable": "Włącz podsieć klienta EDNS",
     "edns_cs_desc": "Dodaj opcję podsieci klienta EDNS (ECS) do żądań nadrzędnych i rejestruj wartości wysyłane przez klientów w dzienniku zapytań.",
+    "edns_use_custom_ip": "Użyj niestandardowego adresu IP dla EDNS",
+    "edns_use_custom_ip_desc": "Zezwól na użycie niestandardowego adresu IP dla EDNS",
     "rate_limit_desc": "Liczba żądań na sekundę dozwolona na klienta. Ustawienie wartości 0 oznacza brak ograniczeń.",
     "blocking_ipv4_desc": "Adres IP, który ma zostać zwrócony w przypadku zablokowanego żądania A",
     "blocking_ipv6_desc": "Adres IP, który ma zostać zwrócony w przypadku zablokowanego żądania AAAA",
@@ -343,7 +346,7 @@
     "install_devices_windows_list_2": "Przejdź do kategorii Sieć i Internet, a następnie do Centrum sieci i udostępniania.",
     "install_devices_windows_list_3": "W lewym panelu kliknij \"Zmień ustawienia adaptera\".",
     "install_devices_windows_list_4": "Kliknij prawym przyciskiem myszy aktywne połączenie i wybierz Właściwości.",
-    "install_devices_windows_list_5": "Znajdź na liście \"Protokół internetowy w wersji 4 (TCP/IPv4)\" (lub w przypadku IPv6 \"Protokół internetowy w wersji 6 (TCP/IPv6)\"), zaznacz go i ponownie kliknij na Właściwości.",
+    "install_devices_windows_list_5": "Znajdź na liście \"Protokół internetowy w wersji 4 (TCP/IPv4)\" (lub w przypadku IPv6 \"Protokół internetowy w wersji 6 (TCP/IPv6)\"), zaznacz go i ponownie kliknij Właściwości.",
     "install_devices_windows_list_6": "Wybierz opcję \"Użyj następujących adresów serwerów DNS\" i wprowadź adresy serwerów AdGuard Home.",
     "install_devices_macos_list_1": "Kliknij ikonę Apple i przejdź do Preferencje systemowe.",
     "install_devices_macos_list_2": "Kliknij Sieć.",
@@ -393,7 +396,7 @@
     "encryption_issuer": "Zgłaszający",
     "encryption_hostnames": "Nazwy hostów",
     "encryption_reset": "Czy na pewno chcesz zresetować ustawienia szyfrowania?",
-    "encryption_warning": "Uwaga!",
+    "encryption_warning": "Uwaga",
     "topline_expiring_certificate": "Twój certyfikat SSL wkrótce wygaśnie. Zaktualizuj <0>Ustawienia szyfrowania</0>.",
     "topline_expired_certificate": "Twój certyfikat SSL wygasł. Zaktualizuj <0>Ustawienia szyfrowania</0>.",
     "form_error_port_range": "Wpisz numer portu z zakresu 80-65535",
@@ -523,6 +526,10 @@
     "statistics_retention_confirm": "Czy chcesz zmienić sposób przechowania statystyk? Jeżeli obniżysz wartość interwału, niektóre dane będą utracone",
     "statistics_cleared": "Statystyki zostały pomyślnie wyczyszczone",
     "statistics_enable": "Włącz statystyki",
+    "ignore_domains": "Ignorowane domeny (każda w nowym wierszu)",
+    "ignore_domains_title": "Ignorowane domeny",
+    "ignore_domains_desc_stats": "Zapytania dla tych domen nie są zapisywane do statystyk",
+    "ignore_domains_desc_query": "Zapytania dla tych domen nie są zapisywane do dziennika",
     "interval_hours": "{{count}} godzina",
     "interval_hours_plural": "{{count}} godziny",
     "filters_configuration": "Konfiguracja filtrów",
@@ -535,7 +542,7 @@
     "password_placeholder": "Wpisz hasło",
     "sign_in": "Zaloguj się",
     "sign_out": "Wyloguj się",
-    "forgot_password": "Zapomniałeś hasła?",
+    "forgot_password": "Zapomniano hasła?",
     "forgot_password_desc": "Wykonaj <0>te kroki</0>, aby utworzyć nowe hasło do konta użytkownika.",
     "location": "Lokalizacja",
     "orgname": "Nazwa firmy",
@@ -642,5 +649,30 @@
     "anonymizer_notification": "<0>Uwaga:</0> Anonimizacja IP jest włączona. Możesz ją wyłączyć w <1>Ustawieniach ogólnych</1>.",
     "confirm_dns_cache_clear": "Czy na pewno chcesz wyczyścić pamięć podręczną DNS?",
     "cache_cleared": "Pamięć podręczna DNS została pomyślnie wyczyszczona",
-    "clear_cache": "Wyczyść pamięć podręczną"
+    "clear_cache": "Wyczyść pamięć podręczną",
+    "make_static": "Ustaw adres statyczny",
+    "theme_auto_desc": "Automatycznie (na podstawie schematu kolorów Twojego urządzenia)",
+    "theme_dark_desc": "Ciemny motyw",
+    "theme_light_desc": "Jasny motyw",
+    "disable_for_seconds": "Na {{count}} sekundę",
+    "disable_for_seconds_plural": "Na {{count}} sekund",
+    "disable_for_minutes": "Na {{count}} minutę",
+    "disable_for_minutes_plural": "Na {{count}} minut",
+    "disable_for_hours": "Na {{count}} godzinę",
+    "disable_for_hours_plural": "Na {{count}} godziny",
+    "disable_until_tomorrow": "Do jutra",
+    "disable_notify_for_seconds": "Wyłącz ochronę na {{count}} sekundę",
+    "disable_notify_for_seconds_plural": "Wyłącz ochronę na {{count}} sekund",
+    "disable_notify_for_minutes": "Wyłącz ochronę na {{count}} minutę",
+    "disable_notify_for_minutes_plural": "Wyłącz ochronę na {{count}} minut",
+    "disable_notify_for_hours": "Wyłącz ochronę na {{count}} godzinę",
+    "disable_notify_for_hours_plural": "Wyłącz ochronę na {{count}} godziny",
+    "disable_notify_until_tomorrow": "Wyłącz ochronę do jutra",
+    "enable_protection_timer": "Ochrona zostanie włączona za {{time}}",
+    "custom_retention_input": "Wprowadź retencję w godzinach",
+    "custom_rotation_input": "Wprowadź rotację w godzinach",
+    "protection_section_label": "Ochrona",
+    "log_and_stats_section_label": "Dziennik zapytań i statystyki",
+    "ignore_query_log": "Zignoruj tego klienta w dzienniku zapytań",
+    "ignore_statistics": "Ignoruj tego klienta w statystykach"
 }

client/src/__locales/pt-br.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "O registro de consulta foi limpo com sucesso",
     "query_log_updated": "O registro da consulta foi atualizado com sucesso",
     "query_log_clear": "Limpar registros de consulta",
-    "query_log_retention": "Arquivamento de registros de consultas",
+    "query_log_retention": "Rotação de registros de consulta",
     "query_log_enable": "Ativar registro",
     "query_log_configuration": "Configuração de registros",
     "query_log_disabled": "O registro de consulta está desativado e pode ser configurado em <0>configurações</0>",
     "query_log_strict_search": "Use aspas duplas para uma pesquisa mais criteriosa",
-    "query_log_retention_confirm": "Você tem certeza de que deseja alterar o arquivamento do registro de consulta? Se diminuir o valor de intervalo, alguns dados serão perdidos",
+    "query_log_retention_confirm": "Tem a certeza de que quer alterar a rotação do registo de consulta? Se diminuir o valor do intervalo, alguns dados serão perdidos",
     "anonymize_client_ip": "Tornar anônimo o IP do cliente",
     "anonymize_client_ip_desc": "Não salva o endereço de IP completo do cliente em registros ou estatísticas",
     "dns_config": "Configuração do servidor DNS",
@@ -529,7 +529,7 @@
     "ignore_domains": "Domínios ignorados (separados por nova linha)",
     "ignore_domains_title": "Domínios ignorados",
     "ignore_domains_desc_stats": "As consultas para esses domínios não são gravadas nas estatísticas",
-    "ignore_domains_desc_query": "As consultas para esses domínios não são gravadas no log de consulta",
+    "ignore_domains_desc_query": "As consultas para esses domínios não são gravadas no registro de consulta",
     "interval_hours": "{{count}} hora",
     "interval_hours_plural": "{{count}} horas",
     "filters_configuration": "Configuração de filtros",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "Desativar proteção por {{count}} hora",
     "disable_notify_for_hours_plural": "Desativar proteção por {{count}} horas",
     "disable_notify_until_tomorrow": "Desativar a proteção até amanhã",
-    "enable_protection_timer": "A proteção será ativada em {{time}}"
+    "enable_protection_timer": "A proteção será ativada em {{time}}",
+    "custom_retention_input": "Insira a retenção em horas",
+    "custom_rotation_input": "Insira a rotação em horas",
+    "protection_section_label": "Proteção",
+    "log_and_stats_section_label": "Registro de consultas e estatísticas",
+    "ignore_query_log": "Ignorar este cliente no registo de consultas",
+    "ignore_statistics": "Ignorar este cliente nas estatísticas"
 }

client/src/__locales/pt-pt.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "O registo de consulta foi limpo com sucesso",
     "query_log_updated": "O registo da consulta foi atualizado com sucesso",
     "query_log_clear": "Limpar registos de consulta",
-    "query_log_retention": "Retenção de registos de consulta",
+    "query_log_retention": "Rotação de registros de consulta",
     "query_log_enable": "Ativar registo",
     "query_log_configuration": "Definições do registo",
     "query_log_disabled": "O registo de consulta está desativado e pode ser configurado em <0>definições</0>",
     "query_log_strict_search": "Usar aspas duplas para uma pesquisa rigorosa",
-    "query_log_retention_confirm": "Tem a certeza de que deseja alterar a retenção do registo de consulta? Se diminuir o valor do intervalo, alguns dados serão perdidos",
+    "query_log_retention_confirm": "Tem a certeza de que quer alterar a rotação do registo de consulta? Se diminuir o valor do intervalo, alguns dados serão perdidos",
     "anonymize_client_ip": "Tornar anónimo o IP do cliente",
     "anonymize_client_ip_desc": "Não gurda o endereço de IP completo do cliente em registo ou estatísticas",
     "dns_config": "Definição do servidor DNS",
@@ -529,7 +529,7 @@
     "ignore_domains": "Domínios ignorados (separados por nova linha)",
     "ignore_domains_title": "Domínios ignorados",
     "ignore_domains_desc_stats": "As consultas para estes domínios não aparecem nas estatísticas",
-    "ignore_domains_desc_query": "As consultas para estes domínios nãoaparecem no registo de consultas",
+    "ignore_domains_desc_query": "As consultas para estes domínios não aparecem no registo de consultas",
     "interval_hours": "{{count}} hora",
     "interval_hours_plural": "{{count}} horas",
     "filters_configuration": "Definição dos filtros",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "Desativar proteção por {{count}} hora",
     "disable_notify_for_hours_plural": "Desativar proteção por {{count}} horas",
     "disable_notify_until_tomorrow": "Desativar a proteção até amanhã",
-    "enable_protection_timer": "A proteção será habilitada em {{time}}"
+    "enable_protection_timer": "A proteção será habilitada em {{time}}",
+    "custom_retention_input": "Insira a retenção em horas",
+    "custom_rotation_input": "Insira a rotação em horas",
+    "protection_section_label": "Proteção",
+    "log_and_stats_section_label": "Log de consulta e estatísticas",
+    "ignore_query_log": "Ignorar este cliente no log de consulta",
+    "ignore_statistics": "Ignorar este cliente nas estatísticas"
 }

client/src/__locales/ro.json

@@ -642,5 +642,6 @@
     "anonymizer_notification": "<0>Nota:</0> Anonimizarea IP este activată. Puteți să o dezactivați în <1>Setări generale</1>.",
     "confirm_dns_cache_clear": "Sunteți sigur că doriți să ștergeți memoria cache DNS?",
     "cache_cleared": "Cache-ul DNS a fost golit cu succes",
-    "clear_cache": "Goliți memoria cache"
+    "clear_cache": "Goliți memoria cache",
+    "protection_section_label": "Protecție"
 }

client/src/__locales/ru.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "Журнал запросов успешно очищен",
     "query_log_updated": "Журнал запросов успешно обновлён",
     "query_log_clear": "Очистить журнал запросов",
-    "query_log_retention": "Сохранение журнала запросов",
+    "query_log_retention": "Частота ротации журнала запросов",
     "query_log_enable": "Включить журнал",
     "query_log_configuration": "Настройка журнала",
     "query_log_disabled": "Журнал запросов выключен, его можно включить в <0>настройках</0>",
     "query_log_strict_search": "Используйте двойные кавычки для строгого поиска",
-    "query_log_retention_confirm": "Вы уверены, что хотите изменить срок хранения запросов? При сокращении интервала данные могут быть утеряны",
+    "query_log_retention_confirm": "Вы уверены, что хотите изменить частоту ротации журнала запросов? При сокращении срока данные могут быть утеряны",
     "anonymize_client_ip": "Анонимизировать IP-адрес клиента",
     "anonymize_client_ip_desc": "Не сохранять полный IP-адрес клиента в журналах и статистике",
     "dns_config": "Настройки DNS-сервера",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "Отключить защиту на {{count}} час",
     "disable_notify_for_hours_plural": "Отключить защиту на {{count}} часов",
     "disable_notify_until_tomorrow": "Отключить защиту до завтра",
-    "enable_protection_timer": "Защита будет включена в {{time}}"
+    "enable_protection_timer": "Защита будет включена в {{time}}",
+    "custom_retention_input": "Введите срок хранения в часах",
+    "custom_rotation_input": "Введите частоту ротации в часах",
+    "protection_section_label": "Защита",
+    "log_and_stats_section_label": "Журнал запросов и статистика",
+    "ignore_query_log": "Игнорировать этого клиента в журнале запросов",
+    "ignore_statistics": "Игнорировать этого клиента в статистике"
 }

client/src/__locales/sk.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "Denník dopytov bol úspešne vymazaný",
     "query_log_updated": "Denník dopytov bol úspešne aktualizovaný",
     "query_log_clear": "Vymazať denníky dopytov",
-    "query_log_retention": "Obdobie záznamu denníka dopytov",
+    "query_log_retention": "Rotácia denníkov dopytov",
     "query_log_enable": "Zapnúť denník",
     "query_log_configuration": "Konfigurácia denníka",
     "query_log_disabled": "Protokol dopytov je vypnutý a možno ho nakonfigurovať v <0>nastaveniach</0>",
     "query_log_strict_search": "Na prísne vyhľadávanie použite dvojité úvodzovky",
-    "query_log_retention_confirm": "Naozaj chcete zmeniť uchovávanie denníku dopytov? Ak znížite hodnotu intervalu, niektoré údaje sa stratia",
+    "query_log_retention_confirm": "Naozaj chcete zmeniť rotáciu denníka dopytov? Ak znížite hodnotu intervalu, niektoré údaje sa stratia",
     "anonymize_client_ip": "Anonymizujte IP klienta",
     "anonymize_client_ip_desc": "Neukladať úplnú IP adresu klienta do protokolov a štatistík",
     "dns_config": "Konfigurácia DNS servera",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "Vypnite ochranu na {{count}} hodinu",
     "disable_notify_for_hours_plural": "Vypnite ochranu na {{count}} hodín",
     "disable_notify_until_tomorrow": "Vypnúť ochranu do zajtra",
-    "enable_protection_timer": "Ochrana bude zapnutá o {{time}}"
+    "enable_protection_timer": "Ochrana bude zapnutá o {{time}}",
+    "custom_retention_input": "Zadajte retenciu v hodinách",
+    "custom_rotation_input": "Zadajte rotáciu v hodinách",
+    "protection_section_label": "Ochrana",
+    "log_and_stats_section_label": "Protokol dopytov a štatistiky",
+    "ignore_query_log": "Ignorovať tohto klienta v denníku dopytov",
+    "ignore_statistics": "Ignorovanie tohto klienta v štatistikách"
 }

client/src/__locales/sl.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "Dnevnik poizvedb je uspešno izbrisan",
     "query_log_updated": "Dnevnik poizvedb je bil uspešno posodobljen",
     "query_log_clear": "Počisti dnevnike poizvedb",
-    "query_log_retention": "Zadrževanje dnevnikov poizvedb",
+    "query_log_retention": "Rotacija dnevnikov poizvedb",
     "query_log_enable": "Omogoči dnevni",
     "query_log_configuration": "Konfiguracija dnevnikov",
     "query_log_disabled": "Dnevnik poizvedb je onemogočen in ga je mogoče konfigurirati v <0>nastavitvah</0>",
     "query_log_strict_search": "Za strogo iskanje uporabite dvojne narekovaje",
-    "query_log_retention_confirm": "Ali ste prepričani, da želite spremeniti zadrževanje dnevnika poizvedb? Če zmanjšate vrednost intervala, bodo nekateri podatki izgubljeni",
+    "query_log_retention_confirm": "Ali ste prepričani, da želite spremeniti rotacijo dnevnika poizvedb? Če zmanjšate vrednost intervala, bodo nekateri podatki izgubljeni",
     "anonymize_client_ip": "Anonimiziraj odjemalca IP",
     "anonymize_client_ip_desc": "Ne shrani celotnega naslova IP odjemalca v dnevnikih ali statistiki",
     "dns_config": "Konfiguracija strežnika DNS",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "Onemogoči zaščito za {{count}} uro",
     "disable_notify_for_hours_plural": "Onemogoči zaščito za {{count}} ur",
     "disable_notify_until_tomorrow": "Onemogoči zaščito do jutri",
-    "enable_protection_timer": "Zaščita bo omogočena ob {{time}}"
+    "enable_protection_timer": "Zaščita bo omogočena ob {{time}}",
+    "custom_retention_input": "Vnesite zadrževanje v urah",
+    "custom_rotation_input": "Vnesite rotacijo v urah",
+    "protection_section_label": "Zaščita",
+    "log_and_stats_section_label": "Dnevnik poizvedb in statistika",
+    "ignore_query_log": "Ignorirajte tega odjemalca v dnevniku poizvedb",
+    "ignore_statistics": "Ignoriranje tega odjemalca v statistiki"
 }

client/src/__locales/sr-cs.json

@@ -642,5 +642,6 @@
     "anonymizer_notification": "<0>Nota:</0> IP prepoznavanje je omogućeno. Možete ga onemogućiti u opštim <1>postavkama</1>.",
     "confirm_dns_cache_clear": "Želite li zaista da obrišite DNS keš?",
     "cache_cleared": "DNS keš je uspešno očišćen",
-    "clear_cache": "Obriši keš memoriju"
+    "clear_cache": "Obriši keš memoriju",
+    "protection_section_label": "Zaštita"
 }

client/src/__locales/tr.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "Sorgu günlüğü başarıyla temizlendi",
     "query_log_updated": "Sorgu günlüğü başarıyla güncellendi",
     "query_log_clear": "Sorgu günlüklerini temizle",
-    "query_log_retention": "Sorgu günlüklerini sakla",
+    "query_log_retention": "Sorgu günlükleri rotasyonu",
     "query_log_enable": "Günlüğü etkinleştir",
     "query_log_configuration": "Günlük yapılandırması",
     "query_log_disabled": "Sorgu günlüğü devre dışı bırakıldı, bunu <0>ayarlar</0> kısmından yapılandırılabilirsiniz",
     "query_log_strict_search": "Tam arama için çift tırnak işareti kullanın",
-    "query_log_retention_confirm": "Sorgu günlüğü saklama süresini değiştirmek istediğinize emin misiniz? Aralık değerini azaltırsanız, bazı veriler kaybolacaktır",
+    "query_log_retention_confirm": "Sorgu günlüğü rotasyonunu değiştirmek istediğinizden emin misiniz? Aralık değerini düşürürseniz, bazı veriler kaybolacaktır.",
     "anonymize_client_ip": "İstemcinin IP adresini gizle",
     "anonymize_client_ip_desc": "İstemcinin tam IP adresini günlüklere veya istatistiklere kaydetmeyin",
     "dns_config": "DNS sunucu yapılandırması",
@@ -413,7 +413,7 @@
     "fix": "Düzelt",
     "dns_providers": "Aralarından seçim yapabileceğiniz, bilinen <0>DNS sağlayıcıların listesi</0>.",
     "update_now": "Şimdi güncelle",
-    "update_failed": "Otomatik güncelleme başarısız oldu. Elle güncellemek için lütfen <a>bu adımları izleyin</a>.",
+    "update_failed": "Otomatik güncellenemedi. Elle güncellemek için lütfen <a>bu adımları izleyin</a>.",
     "manual_update": "Elle güncellemek için lütfen <a>bu adımları uygulayın</a>.",
     "processing_update": "Lütfen bekleyin, AdGuard Home güncelleniyor",
     "clients_title": "Kalıcı istemciler",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "Korumayı {{count}} saatliğine devre dışı bırak",
     "disable_notify_for_hours_plural": "Korumayı {{count}} saatliğine devre dışı bırak",
     "disable_notify_until_tomorrow": "Korumayı yarına kadar devre dışı bırak",
-    "enable_protection_timer": "Koruma {{time}} içinde etkinleştirilecektir"
+    "enable_protection_timer": "Koruma {{time}} içinde etkinleştirilecektir",
+    "custom_retention_input": "Saklama süresini saat olarak girin",
+    "custom_rotation_input": "Rotasyonu saat cinsinden girin",
+    "protection_section_label": "Koruma",
+    "log_and_stats_section_label": "Sorgu günlüğü ve istatistikler",
+    "ignore_query_log": "Sorgu günlüğünde bu istemciyi yoksay",
+    "ignore_statistics": "İstatistiklerde bu istemciyi yoksay"
 }

client/src/__locales/uk.json

@@ -167,6 +167,7 @@
     "enabled_parental_toast": "«Батьківський контроль» увімкнено",
     "disabled_safe_search_toast": "Безпечний пошук вимкнено",
     "enabled_save_search_toast": "Безпечний пошук увімкнено",
+    "updated_save_search_toast": "Налаштування Безпечного пошуку оновлено",
     "enabled_table_header": "Увімкнено",
     "name_table_header": "Назва",
     "list_url_table_header": "URL списку",
@@ -290,6 +291,8 @@
     "rate_limit": "Обмеження швидкості",
     "edns_enable": "Увімкнути відправку EDNS Client Subnet",
     "edns_cs_desc": "Додавати параметр EDNS Client Subnet (ECS) до запитів до upstream-серверів, а також записувати в журнал значення, що надсилаються клієнтами.",
+    "edns_use_custom_ip": "Використання користувацької IP-адреси для EDNS",
+    "edns_use_custom_ip_desc": "Дозволити використовувати користувацьку IP-адресу для EDNS",
     "rate_limit_desc": "Кількість запитів в секунду, які може робити один клієнт. Встановлене значення «0» означатиме необмежену кількість.",
     "blocking_ipv4_desc": "IP-адреса, яку потрібно видати для заблокованого A запиту",
     "blocking_ipv6_desc": "IP-адреса, яку потрібно видати для заблокованого АААА запиту",
@@ -523,6 +526,10 @@
     "statistics_retention_confirm": "Ви впевнені, що хочете змінити тривалість статистики? Якщо зменшити значення інтервалу, деякі дані будуть втрачені",
     "statistics_cleared": "Статистику успішно очищено",
     "statistics_enable": "Увімкнути статистику",
+    "ignore_domains": "Ігноровані домени (по одному на рядок)",
+    "ignore_domains_title": "Ігноровані домени",
+    "ignore_domains_desc_stats": "Запити для цих доменів в статистику не пишуться",
+    "ignore_domains_desc_query": "Запити для цих доменів не записуються до журналу запитів",
     "interval_hours": "{{count}} година",
     "interval_hours_plural": "{{count}} годин(и)",
     "filters_configuration": "Конфігурація фільтрів",
@@ -642,5 +649,30 @@
     "anonymizer_notification": "<0>Примітка:</0> IP-анонімізацію ввімкнено. Ви можете вимкнути його в <1>Загальні налаштування</1> .",
     "confirm_dns_cache_clear": "Ви впевнені, що бажаєте очистити кеш DNS?",
     "cache_cleared": "Кеш DNS успішно очищено",
-    "clear_cache": "Очистити кеш"
+    "clear_cache": "Очистити кеш",
+    "make_static": "Зробити статичним",
+    "theme_auto_desc": "Автоматична (на основі теми вашого пристрою)",
+    "theme_dark_desc": "Темна тема",
+    "theme_light_desc": "Світла тема",
+    "disable_for_seconds": "На {{count}} секунду",
+    "disable_for_seconds_plural": "На {{count}} секунд",
+    "disable_for_minutes": "На {{count}} хвилину",
+    "disable_for_minutes_plural": "На {{count}} хвилин",
+    "disable_for_hours": "На {{count}} годину",
+    "disable_for_hours_plural": "На {{count}} годин",
+    "disable_until_tomorrow": "До завтра",
+    "disable_notify_for_seconds": "Вимкнення захисту на {{count}} секунду",
+    "disable_notify_for_seconds_plural": "Вимкнення захисту на {{count}} секунд",
+    "disable_notify_for_minutes": "Вимкнення захисту на {{count}} хвилину",
+    "disable_notify_for_minutes_plural": "Вимкнення захисту на {{count}} хвилин",
+    "disable_notify_for_hours": "Вимкнення захисту на {{count}} годину",
+    "disable_notify_for_hours_plural": "Вимкнення захисту на {{count}} годин",
+    "disable_notify_until_tomorrow": "Відключення захисту до завтра",
+    "enable_protection_timer": "Захист буде ввімкнено о {{time}}",
+    "custom_retention_input": "Введіть час в годинах",
+    "custom_rotation_input": "Введіть час в годинах",
+    "protection_section_label": "Захист",
+    "log_and_stats_section_label": "Журнал запитів і статистика",
+    "ignore_query_log": "Ігнорувати цей клієнт у журналі запитів",
+    "ignore_statistics": "Ігноруйте цей клієнт в статистиці"
 }

client/src/__locales/vi.json

@@ -642,5 +642,6 @@
     "anonymizer_notification": "<0> Lưu ý:</0> Tính năng ẩn danh IP được bật. Bạn có thể tắt nó trong <1> Cài đặt chung</1>.",
     "confirm_dns_cache_clear": "Bạn có chắc chắn muốn xóa bộ đệm ẩn DNS không?",
     "cache_cleared": "Đã xóa thành công bộ đệm DNS",
-    "clear_cache": "Xóa bộ nhớ cache"
+    "clear_cache": "Xóa bộ nhớ cache",
+    "protection_section_label": "Sự bảo vệ"
 }

client/src/__locales/zh-cn.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "查询日志已成功清除",
     "query_log_updated": "已成功更新查询日志",
     "query_log_clear": "清除查询日志",
-    "query_log_retention": "查询记录保留时间",
+    "query_log_retention": "查询日志保留时间",
     "query_log_enable": "启用日志",
     "query_log_configuration": "日志配置",
     "query_log_disabled": "查询日志已禁用，在<0>这些设置</0>中能配置它们",
     "query_log_strict_search": "使用双引号进行严谨搜索",
-    "query_log_retention_confirm": "您确定要更改查询记录保留时间吗？ 如果您减少间隔时间的值， 某些数据可能会丢失。",
+    "query_log_retention_confirm": "您确定要更改查询记录保留时间吗？如果减少时间间隔数值，某些数据可能会丢失",
     "anonymize_client_ip": "匿名化客户端IP",
     "anonymize_client_ip_desc": "不要在日志和统计信息中保存客户端的完整 IP 地址",
     "dns_config": "DNS 服务配置",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "禁用保护 {{count}} 小时",
     "disable_notify_for_hours_plural": "禁用保护 {{count}} 小时",
     "disable_notify_until_tomorrow": "禁用保护直到明天",
-    "enable_protection_timer": "保护将于 {{time}} 启用"
+    "enable_protection_timer": "保护将于 {{time}} 启用",
+    "custom_retention_input": "输入保留时间（小时）",
+    "custom_rotation_input": "输入旋转时间（小时）",
+    "protection_section_label": "防护",
+    "log_and_stats_section_label": "查询日志和统计数据",
+    "ignore_query_log": "在查询日志中忽略此客户端",
+    "ignore_statistics": "在统计数据中忽略此客户端"
 }

client/src/__locales/zh-tw.json

@@ -257,12 +257,12 @@
     "query_log_cleared": "該查詢記錄已被成功地清除",
     "query_log_updated": "該查詢記錄已被成功地更新",
     "query_log_clear": "清除查詢記錄",
-    "query_log_retention": "查詢記錄保留",
+    "query_log_retention": "查詢記錄保留時間",
     "query_log_enable": "啟用記錄",
     "query_log_configuration": "記錄配置",
     "query_log_disabled": "查詢記錄被禁用並可在<0>設定</0>中被配置",
     "query_log_strict_search": "使用雙引號於嚴謹的搜尋",
-    "query_log_retention_confirm": "您確定您想要更改查詢記錄保留嗎？如果您減少該間隔值，某些資料將被丟失",
+    "query_log_retention_confirm": "您確定要更改記錄檔保存期限嗎？如果您縮短期限部分資料可能將會遺失",
     "anonymize_client_ip": "將用戶端 IP 匿名",
     "anonymize_client_ip_desc": "不要儲存用戶端之完整的 IP 位址到記錄或統計資料裡",
     "dns_config": "DNS 伺服器配置",
@@ -668,5 +668,11 @@
     "disable_notify_for_hours": "計 {{count}} 小時禁用防護",
     "disable_notify_for_hours_plural": "計 {{count}} 小時禁用防護",
     "disable_notify_until_tomorrow": "禁用防護直到明天",
-    "enable_protection_timer": "防護將於 {{time}} 被啟用"
+    "enable_protection_timer": "防護將於 {{time}} 被啟用",
+    "custom_retention_input": "輸入保留時間（小時）",
+    "custom_rotation_input": "輸入旋轉時間（小時）",
+    "protection_section_label": "防護",
+    "log_and_stats_section_label": "查詢記錄和統計資料",
+    "ignore_query_log": "在查詢記錄中忽略此用戶端",
+    "ignore_statistics": "在統計資料中忽略此用戶端"
 }

client/src/actions/encryption.js

@@ -49,6 +49,9 @@ export const setTlsConfig = (config) => async (dispatch, getState) => {
 
         const dnsStatus = await apiClient.getGlobalStatus();
         if (dnsStatus) {
+            if (dnsStatus.protection_disabled_duration === 0) {
+                dnsStatus.protection_disabled_duration = null;
+            }
             dispatch(dnsStatusSuccess(dnsStatus));
         }
 

client/src/actions/services.js

@@ -2,21 +2,6 @@ import { createAction } from 'redux-actions';
 import apiClient from '../api/Api';
 import { addErrorToast, addSuccessToast } from './toasts';
 
-export const getBlockedServicesAvailableServicesRequest = createAction('GET_BLOCKED_SERVICES_AVAILABLE_SERVICES_REQUEST');
-export const getBlockedServicesAvailableServicesFailure = createAction('GET_BLOCKED_SERVICES_AVAILABLE_SERVICES_FAILURE');
-export const getBlockedServicesAvailableServicesSuccess = createAction('GET_BLOCKED_SERVICES_AVAILABLE_SERVICES_SUCCESS');
-
-export const getBlockedServicesAvailableServices = () => async (dispatch) => {
-    dispatch(getBlockedServicesAvailableServicesRequest());
-    try {
-        const data = await apiClient.getBlockedServicesAvailableServices();
-        dispatch(getBlockedServicesAvailableServicesSuccess(data));
-    } catch (error) {
-        dispatch(addErrorToast({ error }));
-        dispatch(getBlockedServicesAvailableServicesFailure());
-    }
-};
-
 export const getBlockedServicesRequest = createAction('GET_BLOCKED_SERVICES_REQUEST');
 export const getBlockedServicesFailure = createAction('GET_BLOCKED_SERVICES_FAILURE');
 export const getBlockedServicesSuccess = createAction('GET_BLOCKED_SERVICES_SUCCESS');

client/src/api/Api.js

@@ -479,19 +479,12 @@ class Api {
     }
 
     // Blocked services
-    BLOCKED_SERVICES_SERVICES = { path: 'blocked_services/services', method: 'GET' };
-
     BLOCKED_SERVICES_LIST = { path: 'blocked_services/list', method: 'GET' };
 
     BLOCKED_SERVICES_SET = { path: 'blocked_services/set', method: 'POST' };
 
     BLOCKED_SERVICES_ALL = { path: 'blocked_services/all', method: 'GET' };
 
-    getBlockedServicesAvailableServices() {
-        const { path, method } = this.BLOCKED_SERVICES_SERVICES;
-        return this.makeRequest(path, method);
-    }
-
     getAllBlockedServices() {
         const { path, method } = this.BLOCKED_SERVICES_ALL;
         return this.makeRequest(path, method);

client/src/components/App/index.js

@@ -165,8 +165,7 @@ const App = () => {
         }
 
         const colorSchemeMedia = window.matchMedia('(prefers-color-scheme: dark)');
-        const prefersDark = colorSchemeMedia.matches;
+        setUITheme(theme);
-        setUITheme(prefersDark ? THEMES.dark : THEMES.light);
 
         if (colorSchemeMedia.addEventListener !== undefined) {
             colorSchemeMedia.addEventListener('change', (e) => {

client/src/components/Filters/DnsBlocklist.js

@@ -12,7 +12,6 @@ import { MODAL_TYPE } from '../../helpers/constants';
 
 import {
     getCurrentFilter,
-    getObjDiff,
 } from '../../helpers/helpers';
 
 import filtersCatalog from '../../helpers/filters/filters';
@@ -22,7 +21,7 @@ class DnsBlocklist extends Component {
         this.props.getFilteringStatus();
     }
 
-    handleSubmit = (values, _, { initialValues }) => {
+    handleSubmit = (values) => {
         const { modalFilterUrl, modalType } = this.props.filtering;
 
         switch (modalType) {
@@ -35,7 +34,12 @@ class DnsBlocklist extends Component {
                 break;
             }
             case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
-                const changedValues = getObjDiff(initialValues, values);
+                const changedValues = Object.entries(values)?.reduce((acc, [key, value]) => {
+                    if (value && key in filtersCatalog.filters) {
+                        acc[key] = value;
+                    }
+                    return acc;
+                }, {});
 
                 Object.keys(changedValues)
                     .forEach((fieldName) => {

client/src/components/Settings/Clients/Form.js

@@ -41,6 +41,17 @@ const settingsCheckboxes = [
         placeholder: 'use_adguard_parental',
     },
 ];
+
+const logAndStatsCheckboxes = [
+    {
+        name: 'ignore_querylog',
+        placeholder: 'ignore_query_log',
+    },
+    {
+        name: 'ignore_statistics',
+        placeholder: 'ignore_statistics',
+    },
+];
 const validate = (values) => {
     const errors = {};
     const { name, ids } = values;
@@ -148,6 +159,9 @@ let Form = (props) => {
         settings: {
             title: 'settings',
             component: <div label="settings" title={props.t('main_settings')}>
+                <div className="form__label--bot form__label--bold">
+                    {t('protection_section_label')}
+                </div>
                 {settingsCheckboxes.map((setting) => (
                     <div className="form__group" key={setting.name}>
                         <Field
@@ -185,6 +199,19 @@ let Form = (props) => {
                         </div>
                     ))}
                 </div>
+                <div className="form__label--bold form__label--top form__label--bot">
+                    {t('log_and_stats_section_label')}
+                </div>
+                {logAndStatsCheckboxes.map((setting) => (
+                    <div className="form__group" key={setting.name}>
+                        <Field
+                            name={setting.name}
+                            type="checkbox"
+                            component={CheckboxField}
+                            placeholder={t(setting.placeholder)}
+                        />
+                    </div>
+                ))}
             </div>,
         },
         block_services: {

client/src/components/Settings/LogsConfig/Form.js

@@ -1,25 +1,37 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { Field, reduxForm } from 'redux-form';
+import {
+    change,
+    Field,
+    formValueSelector,
+    reduxForm,
+} from 'redux-form';
+import { connect } from 'react-redux';
 import { Trans, withTranslation } from 'react-i18next';
 import flow from 'lodash/flow';
 
 import {
     CheckboxField,
-    renderRadioField,
     toFloatNumber,
-    renderTextareaField,
+    renderTextareaField, renderInputField, renderRadioField,
 } from '../../../helpers/form';
 import {
     FORM_NAME,
     QUERY_LOG_INTERVALS_DAYS,
     HOUR,
     DAY,
+    RETENTION_CUSTOM,
+    RETENTION_CUSTOM_INPUT,
+    RETENTION_RANGE,
+    CUSTOM_INTERVAL,
 } from '../../../helpers/constants';
 import '../FormButton.css';
 
+
 const getIntervalTitle = (interval, t) => {
     switch (interval) {
+        case RETENTION_CUSTOM:
+            return t('settings_custom');
         case 6 * HOUR:
             return t('interval_6_hour');
         case DAY:
@@ -42,11 +54,26 @@ const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.
     />
 ));
 
-const Form = (props) => {
+let Form = (props) => {
     const {
-        handleSubmit, submitting, invalid, processing, processingClear, handleClear, t,
+        handleSubmit,
+        submitting,
+        invalid,
+        processing,
+        processingClear,
+        handleClear,
+        t,
+        interval,
+        customInterval,
+        dispatch,
     } = props;
 
+    useEffect(() => {
+        if (QUERY_LOG_INTERVALS_DAYS.includes(interval)) {
+            dispatch(change(FORM_NAME.LOG_CONFIG, CUSTOM_INTERVAL, null));
+        }
+    }, [interval]);
+
     return (
         <form onSubmit={handleSubmit}>
             <div className="form__group form__group--settings">
@@ -73,6 +100,37 @@ const Form = (props) => {
             </label>
             <div className="form__group form__group--settings">
                 <div className="custom-controls-stacked">
+                    <Field
+                        key={RETENTION_CUSTOM}
+                        name="interval"
+                        type="radio"
+                        component={renderRadioField}
+                        value={QUERY_LOG_INTERVALS_DAYS.includes(interval)
+                            ? RETENTION_CUSTOM
+                            : interval
+                        }
+                        placeholder={getIntervalTitle(RETENTION_CUSTOM, t)}
+                        normalize={toFloatNumber}
+                        disabled={processing}
+                    />
+                    {!QUERY_LOG_INTERVALS_DAYS.includes(interval) && (
+                        <div className="form__group--input">
+                            <div className="form__desc form__desc--top">
+                                {t('custom_rotation_input')}
+                            </div>
+                            <Field
+                                key={RETENTION_CUSTOM_INPUT}
+                                name={CUSTOM_INTERVAL}
+                                type="number"
+                                className="form-control"
+                                component={renderInputField}
+                                disabled={processing}
+                                normalize={toFloatNumber}
+                                min={RETENTION_RANGE.MIN}
+                                max={RETENTION_RANGE.MAX}
+                            />
+                        </div>
+                    )}
                     {getIntervalFields(processing, t, toFloatNumber)}
                 </div>
             </div>
@@ -96,7 +154,12 @@ const Form = (props) => {
                 <button
                     type="submit"
                     className="btn btn-success btn-standard btn-large"
-                    disabled={submitting || invalid || processing}
+                    disabled={
+                        submitting
+                        || invalid
+                        || processing
+                        || (!QUERY_LOG_INTERVALS_DAYS.includes(interval) && !customInterval)
+                    }
                 >
                     <Trans>save_btn</Trans>
                 </button>
@@ -121,8 +184,22 @@ Form.propTypes = {
     processing: PropTypes.bool.isRequired,
     processingClear: PropTypes.bool.isRequired,
     t: PropTypes.func.isRequired,
+    interval: PropTypes.number,
+    customInterval: PropTypes.number,
+    dispatch: PropTypes.func.isRequired,
 };
 
+const selector = formValueSelector(FORM_NAME.LOG_CONFIG);
+
+Form = connect((state) => {
+    const interval = selector(state, 'interval');
+    const customInterval = selector(state, CUSTOM_INTERVAL);
+    return {
+        interval,
+        customInterval,
+    };
+})(Form);
+
 export default flow([
     withTranslation(),
     reduxForm({ form: FORM_NAME.LOG_CONFIG }),

client/src/components/Settings/LogsConfig/index.js

@@ -4,15 +4,22 @@ import { withTranslation } from 'react-i18next';
 
 import Card from '../../ui/Card';
 import Form from './Form';
+import { HOUR } from '../../../helpers/constants';
 
 class LogsConfig extends Component {
     handleFormSubmit = (values) => {
         const { t, interval: prevInterval } = this.props;
-        const { interval } = values;
+        const { interval, customInterval, ...rest } = values;
 
-        const data = { ...values, ignored: values.ignored ? values.ignored.split('\n') : [] };
+        const newInterval = customInterval ? customInterval * HOUR : interval;
 
-        if (interval !== prevInterval) {
+        const data = {
+            ...rest,
+            ignored: values.ignored ? values.ignored.split('\n') : [],
+            interval: newInterval,
+        };
+
+        if (newInterval < prevInterval) {
             // eslint-disable-next-line no-alert
             if (window.confirm(t('query_log_retention_confirm'))) {
                 this.props.setLogsConfig(data);
@@ -32,7 +39,14 @@ class LogsConfig extends Component {
 
     render() {
         const {
-            t, enabled, interval, processing, processingClear, anonymize_client_ip, ignored,
+            t,
+            enabled,
+            interval,
+            processing,
+            processingClear,
+            anonymize_client_ip,
+            ignored,
+            customInterval,
         } = this.props;
 
         return (
@@ -46,6 +60,7 @@ class LogsConfig extends Component {
                         initialValues={{
                             enabled,
                             interval,
+                            customInterval,
                             anonymize_client_ip,
                             ignored: ignored.join('\n'),
                         }}
@@ -62,6 +77,7 @@ class LogsConfig extends Component {
 
 LogsConfig.propTypes = {
     interval: PropTypes.number.isRequired,
+    customInterval: PropTypes.number,
     enabled: PropTypes.bool.isRequired,
     anonymize_client_ip: PropTypes.bool.isRequired,
     processing: PropTypes.bool.isRequired,

client/src/components/Settings/Settings.css

@@ -18,6 +18,11 @@
     font-size: 14px;
 }
 
+.form__group--input {
+    max-width: 300px;
+    margin: 0 1.5rem 10px;
+}
+
 .form__group--checkbox {
     margin-bottom: 25px;
 }
@@ -100,6 +105,14 @@
     margin-bottom: 0;
 }
 
+.form__label--bot {
+    margin-bottom: 10px;
+}
+
+.form__label--top {
+    margin-top: 10px;
+}
+
 .form__status {
     margin-top: 10px;
     font-size: 14px;

client/src/components/Settings/StatsConfig/Form.js

@@ -1,32 +1,44 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { Field, reduxForm } from 'redux-form';
+import {
+    change, Field, formValueSelector, reduxForm,
+} from 'redux-form';
 import { Trans, withTranslation } from 'react-i18next';
 import flow from 'lodash/flow';
+import { connect } from 'react-redux';
+
 
 import {
     renderRadioField,
     toNumber,
     CheckboxField,
     renderTextareaField,
+    toFloatNumber,
+    renderInputField,
 } from '../../../helpers/form';
 import {
     FORM_NAME,
     STATS_INTERVALS_DAYS,
     DAY,
+    RETENTION_CUSTOM,
+    RETENTION_CUSTOM_INPUT,
+    CUSTOM_INTERVAL,
+    RETENTION_RANGE,
 } from '../../../helpers/constants';
 import '../FormButton.css';
 
 const getIntervalTitle = (intervalMs, t) => {
-    switch (intervalMs / DAY) {
+    switch (intervalMs) {
-        case 1:
+        case RETENTION_CUSTOM:
+            return t('settings_custom');
+        case DAY:
             return t('interval_24_hour');
         default:
             return t('interval_days', { count: intervalMs / DAY });
     }
 };
 
-const Form = (props) => {
+let Form = (props) => {
     const {
         handleSubmit,
         processing,
@@ -35,8 +47,17 @@ const Form = (props) => {
         handleReset,
         processingReset,
         t,
+        interval,
+        customInterval,
+        dispatch,
     } = props;
 
+    useEffect(() => {
+        if (STATS_INTERVALS_DAYS.includes(interval)) {
+            dispatch(change(FORM_NAME.STATS_CONFIG, CUSTOM_INTERVAL, null));
+        }
+    }, [interval]);
+
     return (
         <form onSubmit={handleSubmit}>
             <div className="form__group form__group--settings">
@@ -56,6 +77,37 @@ const Form = (props) => {
             </div>
             <div className="form__group form__group--settings mt-2">
                 <div className="custom-controls-stacked">
+                    <Field
+                        key={RETENTION_CUSTOM}
+                        name="interval"
+                        type="radio"
+                        component={renderRadioField}
+                        value={STATS_INTERVALS_DAYS.includes(interval)
+                            ? RETENTION_CUSTOM
+                            : interval
+                        }
+                        placeholder={getIntervalTitle(RETENTION_CUSTOM, t)}
+                        normalize={toFloatNumber}
+                        disabled={processing}
+                    />
+                    {!STATS_INTERVALS_DAYS.includes(interval) && (
+                        <div className="form__group--input">
+                            <div className="form__desc form__desc--top">
+                                {t('custom_retention_input')}
+                            </div>
+                            <Field
+                                key={RETENTION_CUSTOM_INPUT}
+                                name={CUSTOM_INTERVAL}
+                                type="number"
+                                className="form-control"
+                                component={renderInputField}
+                                disabled={processing}
+                                normalize={toFloatNumber}
+                                min={RETENTION_RANGE.MIN}
+                                max={RETENTION_RANGE.MAX}
+                            />
+                        </div>
+                    )}
                     {STATS_INTERVALS_DAYS.map((interval) => (
                         <Field
                             key={interval}
@@ -90,7 +142,12 @@ const Form = (props) => {
                 <button
                     type="submit"
                     className="btn btn-success btn-standard btn-large"
-                    disabled={submitting || invalid || processing}
+                    disabled={
+                        submitting
+                        || invalid
+                        || processing
+                        || (!STATS_INTERVALS_DAYS.includes(interval) && !customInterval)
+                    }
                 >
                     <Trans>save_btn</Trans>
                 </button>
@@ -116,8 +173,22 @@ Form.propTypes = {
     processing: PropTypes.bool.isRequired,
     processingReset: PropTypes.bool.isRequired,
     t: PropTypes.func.isRequired,
+    interval: PropTypes.number,
+    customInterval: PropTypes.number,
+    dispatch: PropTypes.func.isRequired,
 };
 
+const selector = formValueSelector(FORM_NAME.STATS_CONFIG);
+
+Form = connect((state) => {
+    const interval = selector(state, 'interval');
+    const customInterval = selector(state, CUSTOM_INTERVAL);
+    return {
+        interval,
+        customInterval,
+    };
+})(Form);
+
 export default flow([
     withTranslation(),
     reduxForm({ form: FORM_NAME.STATS_CONFIG }),

client/src/components/Settings/StatsConfig/index.js

@@ -4,13 +4,18 @@ import { withTranslation } from 'react-i18next';
 
 import Card from '../../ui/Card';
 import Form from './Form';
+import { HOUR } from '../../../helpers/constants';
 
 class StatsConfig extends Component {
-    handleFormSubmit = ({ enabled, interval, ignored }) => {
+    handleFormSubmit = ({
+        enabled, interval, ignored, customInterval,
+    }) => {
         const { t, interval: prevInterval } = this.props;
+        const newInterval = customInterval ? customInterval * HOUR : interval;
+
         const config = {
             enabled,
-            interval,
+            interval: newInterval,
             ignored: ignored ? ignored.split('\n') : [],
         };
 
@@ -33,7 +38,13 @@ class StatsConfig extends Component {
 
     render() {
         const {
-            t, interval, processing, processingReset, ignored, enabled,
+            t,
+            interval,
+            customInterval,
+            processing,
+            processingReset,
+            ignored,
+            enabled,
         } = this.props;
 
         return (
@@ -46,6 +57,7 @@ class StatsConfig extends Component {
                     <Form
                         initialValues={{
                             interval,
+                            customInterval,
                             enabled,
                             ignored: ignored.join('\n'),
                         }}
@@ -62,6 +74,7 @@ class StatsConfig extends Component {
 
 StatsConfig.propTypes = {
     interval: PropTypes.number.isRequired,
+    customInterval: PropTypes.number,
     ignored: PropTypes.array.isRequired,
     enabled: PropTypes.bool.isRequired,
     processing: PropTypes.bool.isRequired,

client/src/components/Settings/index.js

@@ -124,6 +124,7 @@ class Settings extends Component {
                                     enabled={queryLogs.enabled}
                                     ignored={queryLogs.ignored}
                                     interval={queryLogs.interval}
+                                    customInterval={queryLogs.customInterval}
                                     anonymize_client_ip={queryLogs.anonymize_client_ip}
                                     processing={queryLogs.processingSetConfig}
                                     processingClear={queryLogs.processingClear}
@@ -134,6 +135,7 @@ class Settings extends Component {
                             <div className="col-md-12">
                                 <StatsConfig
                                     interval={stats.interval}
+                                    customInterval={stats.customInterval}
                                     ignored={stats.ignored}
                                     enabled={stats.enabled}
                                     processing={stats.processingSetConfig}
@@ -166,6 +168,7 @@ Settings.propTypes = {
     stats: PropTypes.shape({
         processingGetConfig: PropTypes.bool,
         interval: PropTypes.number,
+        customInterval: PropTypes.number,
         enabled: PropTypes.bool,
         ignored: PropTypes.array,
         processingSetConfig: PropTypes.bool,
@@ -174,6 +177,7 @@ Settings.propTypes = {
     queryLogs: PropTypes.shape({
         enabled: PropTypes.bool,
         interval: PropTypes.number,
+        customInterval: PropTypes.number,
         anonymize_client_ip: PropTypes.bool,
         processingSetConfig: PropTypes.bool,
         processingClear: PropTypes.bool,

client/src/components/ui/Footer.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 import cn from 'classnames';
@@ -33,16 +33,14 @@ const Footer = () => {
     const { t } = useTranslation();
     const dispatch = useDispatch();
 
-    const currentTheme = useSelector((state) => (state.dashboard ? state.dashboard.theme : 'auto'));
+    const currentTheme = useSelector((state) => (
-    const profileName = useSelector((state) => (state.dashboard ? state.dashboard.name : ''));
+        state.dashboard ? state.dashboard.theme : THEMES.auto
+    ));
+    const profileName = useSelector((state) => (
+        state.dashboard ? state.dashboard.name : ''
+    ));
     const isLoggedIn = profileName !== '';
-    const [currentThemeLocal, setCurrentThemeLocal] = useState('auto');
+    const [currentThemeLocal, setCurrentThemeLocal] = useState(THEMES.auto);
-
-    useEffect(() => {
-        if (!isLoggedIn) {
-            setUITheme(window.matchMedia('(prefers-color-scheme: dark)').matches ? THEMES.dark : THEMES.light);
-        }
-    }, []);
 
     const getYear = () => {
         const today = new Date();

client/src/components/ui/Overlay.css

@@ -13,7 +13,7 @@
     font-size: 28px;
     font-weight: 600;
     text-align: center;
-    background-color: rgba(255, 255, 255, 0.8);
+    background-color: var(--rt-nodata-bgcolor);
 }
 
 .overlay--visible {

client/src/helpers/constants.js

@@ -220,6 +220,12 @@ export const STATS_INTERVALS_DAYS = [DAY, DAY * 7, DAY * 30, DAY * 90];
 
 export const QUERY_LOG_INTERVALS_DAYS = [HOUR * 6, DAY, DAY * 7, DAY * 30, DAY * 90];
 
+export const RETENTION_CUSTOM = 1;
+
+export const RETENTION_CUSTOM_INPUT = 'custom_retention_input';
+
+export const CUSTOM_INTERVAL = 'customInterval';
+
 export const FILTERS_INTERVALS_HOURS = [0, 1, 12, 24, 72, 168];
 
 // Note that translation strings contain these modes (blocking_mode_CONSTANT)
@@ -462,6 +468,11 @@ export const UINT32_RANGE = {
     MAX: 4294967295,
 };
 
+export const RETENTION_RANGE = {
+    MIN: 1,
+    MAX: 365 * 24,
+};
+
 export const DHCP_VALUES_PLACEHOLDERS = {
     ipv4: {
         subnet_mask: '255.255.255.0',
@@ -537,3 +548,5 @@ export const DISABLE_PROTECTION_TIMINGS = {
     HOUR: 60 * 60 * 1000,
     TOMORROW: 24 * 60 * 60 * 1000,
 };
+
+export const LOCAL_STORAGE_THEME_KEY = 'account_theme';

client/src/helpers/filters/filters.js

@@ -100,6 +100,12 @@ export default {
             "homepage": "https://github.com/DandelionSprout/adfilt",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_13.txt"
         },
+        "POL_cert_polska_list_of_malicious_domains": {
+            "name": "POL: CERT Polska List of malicious domains",
+            "categoryId": "regional",
+            "homepage": "https://cert.pl/posts/2020/03/ostrzezenia_phishing/",
+            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_41.txt"
+        },
         "POL_polish_filters_for_pi_hole": {
             "name": "POL: Polish filters for Pi-hole",
             "categoryId": "regional",
@@ -118,6 +124,12 @@ export default {
             "homepage": "https://github.com/bkrucarci/turk-adlist",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_26.txt"
         },
+        "TUR_turkish_ad_hosts": {
+            "name": "TUR: Turkish Ad Hosts",
+            "categoryId": "regional",
+            "homepage": "https://github.com/symbuzzer/Turkish-Ad-Hosts",
+            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_40.txt"
+        },
         "VNM_abpvn": {
             "name": "VNM: ABPVN List",
             "categoryId": "regional",
@@ -214,6 +226,12 @@ export default {
             "homepage": "https://github.com/durablenapkin/scamblocklist",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_10.txt"
         },
+        "shadowwhisperers_malware_list": {
+            "name": "ShadowWhisperer's Malware List",
+            "categoryId": "security",
+            "homepage": "https://github.com/ShadowWhisperer/BlockLists",
+            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_42.txt"
+        },
         "staklerware_indicators_list": {
             "name": "Stalkerware Indicators List",
             "categoryId": "security",

client/src/helpers/helpers.js

@@ -25,6 +25,8 @@ import {
     STANDARD_HTTPS_PORT,
     STANDARD_WEB_PORT,
     SPECIAL_FILTER_ID,
+    THEMES,
+    LOCAL_STORAGE_THEME_KEY,
 } from './constants';
 
 /**
@@ -678,13 +680,61 @@ export const setHtmlLangAttr = (language) => {
     window.document.documentElement.lang = language;
 };
 
+/**
+ * Set local storage field
+ *
+ * @param {string} key
+ * @param {string} value
+ */
+
+export const setStorageItem = (key, value) => {
+    if (window.localStorage) {
+        window.localStorage.setItem(key, value);
+    }
+};
+
+/**
+ * Get local storage field
+ *
+ * @param {string} key
+ */
+
+export const getStorageItem = (key) => (window.localStorage
+    ? window.localStorage.getItem(key)
+    : null);
+
+/**
+ * Set local storage theme field
+ *
+ * @param {string} theme
+ */
+
+export const setTheme = (theme) => {
+    setStorageItem(LOCAL_STORAGE_THEME_KEY, theme);
+};
+
+/**
+ * Get local storage theme field
+ *
+ * @returns {string}
+ */
+
+export const getTheme = () => getStorageItem(LOCAL_STORAGE_THEME_KEY) || THEMES.light;
+
 /**
  * Sets UI theme.
  *
  * @param theme
  */
 export const setUITheme = (theme) => {
-    document.body.dataset.theme = theme;
+    let currentTheme = theme || getTheme();
+
+    if (currentTheme === THEMES.auto) {
+        const prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
+        currentTheme = prefersDark ? THEMES.dark : THEMES.light;
+    }
+    setTheme(currentTheme);
+    document.body.dataset.theme = currentTheme;
 };
 
 /**

client/src/helpers/trackers/trackers.json

@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-03-29T00:10:35.167Z",
+    "timeUpdated": "2023-06-01T00:12:12.660Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",
@@ -19526,6 +19526,13 @@
             "companyId": "qualcomm",
             "source": "AdGuard"
         },
+        "qualcomm_location_service": {
+            "name": "Qualcomm Location Service",
+            "categoryId": 15,
+            "url": "https://www.qualcomm.com/site/privacy/services",
+            "companyId": "qualcomm",
+            "source": "AdGuard"
+        },
         "recaptcha": {
             "name": "reCAPTCHA",
             "categoryId": 8,
@@ -19533,6 +19540,55 @@
             "companyId": "google",
             "source": "AdGuard"
         },
+        "samsung": {
+            "name": "Samsung",
+            "categoryId": 8,
+            "url": "https://www.samsung.com/",
+            "companyId": "samsung",
+            "source": "AdGuard"
+        },
+        "samsungads": {
+            "name": "Samsung Ads",
+            "categoryId": 4,
+            "url": "https://www.samsung.com/business/samsungads/",
+            "companyId": "samsung",
+            "source": "AdGuard"
+        },
+        "samsungapps": {
+            "name": "Samsung Apps",
+            "categoryId": 101,
+            "url": "https://www.samsung.com/au/apps/",
+            "companyId": "samsung",
+            "source": "AdGuard"
+        },
+        "samsungmobile": {
+            "name": "Samsung Mobile",
+            "categoryId": 101,
+            "url": "https://www.samsung.com/mobile/",
+            "companyId": "samsung",
+            "source": "AdGuard"
+        },
+        "samsungpush": {
+            "name": "Samsung Push",
+            "categoryId": 8,
+            "url": null,
+            "companyId": "samsung",
+            "source": "AdGuard"
+        },
+        "samsungsds": {
+            "name": "Samsung SDS",
+            "categoryId": 10,
+            "url": "https://www.samsungsds.com/",
+            "companyId": "samsung",
+            "source": "AdGuard"
+        },
+        "samsungtv": {
+            "name": "Samsung TV",
+            "categoryId": 15,
+            "url": "https://www.samsung.com/au/tvs/",
+            "companyId": "samsung",
+            "source": "AdGuard"
+        },
         "sectigo": {
             "name": "Sectigo Limited",
             "categoryId": 5,
@@ -19589,6 +19645,13 @@
             "companyId": "telstra",
             "source": "AdGuard"
         },
+        "ubuntu": {
+            "name": "Ubuntu",
+            "categoryId": 8,
+            "url": "https://ubuntu.com/",
+            "companyId": "ubuntu",
+            "source": "AdGuard"
+        },
         "unity_ads": {
             "name": "Unity Ads",
             "categoryId": 4,
@@ -19651,6 +19714,13 @@
             "url": "https://www.3gpp.org/",
             "companyId": "3gpp",
             "source": "AdGuard"
+        },
+        "7plus": {
+            "name": "7plus",
+            "categoryId": 0,
+            "url": "https://7plus.com.au/",
+            "companyId": "7plus",
+            "source": "AdGuard"
         }
     },
     "trackerDomains": {
@@ -19843,8 +19913,8 @@
         "adfreestyle.pl": "adfreestyle",
         "adfront.org": "adfront",
         "adfrontiers.com": "adfrontiers",
-        "adgear.com": "adgear",
+        "adgear.com": "samsungads",
-        "adgrx.com": "adgear",
+        "adgrx.com": "samsungads",
         "adgebra.co.in": "adgebra",
         "adgenie.co.uk": "adgenie",
         "ad.adgile.com": "adgile",
@@ -24056,6 +24126,10 @@
         "safebrowsing.g.applimg.com": "apple",
         "applvn.com": "applovin",
         "applovin.com": "applovin",
+        "bitbucket.org": "atlassian.net",
+        "jira.com": "atlassian.net",
+        "ss-inf.net": "atlassian.net",
+        "stspg-customer.com": "statuspage.io",
         "blob.core.windows.net": "azure_blob_storage",
         "azure.com": "azure",
         "trafficmanager.net": "azure",
@@ -24063,6 +24137,21 @@
         "mobileapptracking.com": "branch",
         "bttn.io": "button",
         "cloudflare-dns.com": "cloudflare",
+        "cloudflare-dm-cmpimg.com": "cloudflare",
+        "cloudflare-ipfs.com": "cloudflare",
+        "cloudflare-quic.com": "cloudflare",
+        "cloudflare-terms-of-service-abuse.com": "cloudflare",
+        "cloudflare.tv": "cloudflare",
+        "cloudflareaccess.com": "cloudflare",
+        "cloudflareclient.com": "cloudflare",
+        "cloudflareinsights.com": "cloudflare",
+        "cloudflareok.com": "cloudflare",
+        "cloudflareportal.com": "cloudflare",
+        "cloudflareresolve.com": "cloudflare",
+        "cloudflaressl.com": "cloudflare",
+        "cloudflarestatus.com": "cloudflare",
+        "pacloudflare.com": "cloudflare",
+        "sn-cloudflare.com": "cloudflare",
         "crashlytics.com": "crashlytics",
         "phicdn.net": "digicert_trust_seal",
         "domain.glass": "domainglass",
@@ -24092,6 +24181,9 @@
         "qy.net": "iqiyi",
         "iqiyi.com": "iqiyi",
         "iq.com": "iqiyi",
+        "ironsrc.com": "ironsource",
+        "ironsrc.net": "ironsource",
+        "supersonicads.com": "ironsource",
         "karambasecurity.com": "karambasecurity",
         "kik.com": "kik",
         "apikik.com": "kik",
@@ -24121,6 +24213,23 @@
         "mozilla.com": "mozilla",
         "mozilla.net": "mozilla",
         "mozilla.org": "mozilla",
+        "flxvpn.net": "netflix",
+        "netflix.ca": "netflix",
+        "netflix.com.au": "netflix",
+        "netflix.net": "netflix",
+        "netflixdnstest1.com": "netflix",
+        "netflixdnstest10.com": "netflix",
+        "netflixdnstest2.com": "netflix",
+        "netflixdnstest3.com": "netflix",
+        "netflixdnstest4.com": "netflix",
+        "netflixdnstest5.com": "netflix",
+        "netflixdnstest6.com": "netflix",
+        "netflixdnstest7.com": "netflix",
+        "netflixdnstest8.com": "netflix",
+        "netflixdnstest9.com": "netflix",
+        "netflixinvestor.com": "netflix",
+        "netflixstudios.com": "netflix",
+        "netflixtechblog.com": "netflix",
         "nflximg.com": "netflix",
         "netify.ai": "netify",
         "nab.com": "nab",
@@ -24144,9 +24253,69 @@
         "oztam.com.au": "oztam",
         "plex.tv": "plex",
         "plex.direct": "plex",
-        "xtracloud.net": "qualcomm",
         "qualcomm.com": "qualcomm",
+        "gpsonextra.net": "qualcomm_location_service",
+        "izatcloud.net": "qualcomm_location_service",
+        "xtracloud.net": "qualcomm_location_service",
         "recaptcha.net": "recaptcha",
+        "samsungacr.com": "samsungads",
+        "samsungadhub.com": "samsungads",
+        "samsungads.com": "samsungads",
+        "samsungtifa.com": "samsungads",
+        "game-mode.net": "samsung",
+        "gos-gsp.io": "samsung",
+        "lldns.net": "samsung",
+        "pavv.co.kr": "samsung",
+        "remotesamsung.com": "samsung",
+        "samsung-gamelauncher.com": "samsung",
+        "samsung.co.kr": "samsung",
+        "samsung.com": "samsung",
+        "samsung.com.cn": "samsung",
+        "samsungcloud.com": "samsung",
+        "samsungcloudcdn.com": "samsung",
+        "samsungcloudprint.com": "samsung",
+        "samsungcloudsolution.com": "samsung",
+        "samsungcloudsolution.net": "samsung",
+        "samsungelectronics.com": "samsung",
+        "samsunghealth.com": "samsung",
+        "samsungiotcloud.com": "samsung",
+        "samsungknox.com": "samsung",
+        "samsungnyc.com": "samsung",
+        "samsungosp.com": "samsung",
+        "samsungotn.net": "samsung",
+        "samsungpositioning.com": "samsung",
+        "samsungqbe.com": "samsung",
+        "samsungrm.net": "samsung",
+        "samsungrs.com": "samsung",
+        "samsungsemi.com": "samsung",
+        "samsungsetup.com": "samsung",
+        "samsungusa.com": "samsung",
+        "secb2b.com": "samsung",
+        "smartthings.com": "samsung",
+        "ospserver.net": "samsungmobile",
+        "samsungdms.net": "samsungmobile",
+        "samsungmax.com": "samsungmobile",
+        "samsungmobile.com": "samsungmobile",
+        "secmobilesvc.com": "samsungmobile",
+        "internetat.tv": "samsungtv",
+        "samsungcloud.tv": "samsungtv",
+        "samsungsds.com": "samsungsds",
+        "push.samsungosp.com": "samsungpush",
+        "pushmessage.samsung.com": "samsungpush",
+        "scs.samsungqbe.com": "samsungpush",
+        "ssp.samsung.com": "samsungpush",
+        "aibixby.com": "samsungapps",
+        "findmymobile.samsung.com": "samsungapps",
+        "samsapps.cust.lldns.net": "samsungapps",
+        "samsung-omc.com": "samsungapps",
+        "samsungapps.com": "samsungapps",
+        "samsungdiroute.net": "samsungapps",
+        "samsungdive.com": "samsungapps",
+        "samsungdm.com": "samsungapps",
+        "samsungdmroute.com": "samsungapps",
+        "samsungmdec.com": "samsungapps",
+        "samsungvisioncloud.com": "samsungapps",
+        "sbixby.com": "samsungapps",
         "sectigo.com": "sectigo",
         "showrss.info": "showrss",
         "similarweb.io": "similarweb",
@@ -24171,6 +24340,13 @@
         "telstra.com.au": "telstra",
         "telstra.com": "telstra",
         "usertrust.com": "trustlogo",
+        "canonical.com": "ubuntu",
+        "launchpad.net": "ubuntu",
+        "launchpadcontent.net": "ubuntu",
+        "snapcraft.io": "ubuntu",
+        "snapcraftcontent.com": "ubuntu",
+        "ubuntu.com": "ubuntu",
+        "ubuntucompanyservices.co.za": "ubuntu",
         "unityads.unity3d.com": "unity_ads",
         "exp-tas.com": "vscode",
         "vscode-unpkg.net": "vscode",
@@ -24190,6 +24366,7 @@
         "yandex.kz": "yandex",
         "appmetrica.yandex.com": "yandex_appmetrica",
         "3gppnetwork.org": "3gpp",
-        "3gpp.org": "3gpp"
+        "3gpp.org": "3gpp",
+        "swm.digital": "7plus"
     }
-}
+}

client/src/login/Login/index.js

@@ -8,6 +8,7 @@ import * as actionCreators from '../../actions/login';
 import logo from '../../components/ui/svg/logo.svg';
 import Toasts from '../../components/Toasts';
 import Footer from '../../components/ui/Footer';
+import Icons from '../../components/ui/Icons';
 import Form from './Form';
 
 import './Login.css';
@@ -69,6 +70,7 @@ class Login extends Component {
                 </div>
                 <Footer />
                 <Toasts />
+                <Icons />
             </div>
         );
     }

client/src/reducers/dashboard.js

@@ -177,7 +177,7 @@ const dashboard = handleActions(
         autoClients: [],
         supportedTags: [],
         name: '',
-        theme: 'auto',
+        theme: undefined,
         checkUpdateFlag: false,
     },
 );

client/src/reducers/queryLogs.js

@@ -1,7 +1,9 @@
 import { handleActions } from 'redux-actions';
 
 import * as actions from '../actions/queryLogs';
-import { DEFAULT_LOGS_FILTER, DAY } from '../helpers/constants';
+import {
+    DEFAULT_LOGS_FILTER, DAY, QUERY_LOG_INTERVALS_DAYS, HOUR,
+} from '../helpers/constants';
 
 const queryLogs = handleActions(
     {
@@ -59,6 +61,9 @@ const queryLogs = handleActions(
         [actions.getLogsConfigSuccess]: (state, { payload }) => ({
             ...state,
             ...payload,
+            customInterval: !QUERY_LOG_INTERVALS_DAYS.includes(payload.interval)
+                ? payload.interval / HOUR
+                : null,
             processingGetConfig: false,
         }),
 
@@ -95,6 +100,7 @@ const queryLogs = handleActions(
         anonymize_client_ip: false,
         isDetailed: true,
         isEntireLog: false,
+        customInterval: null,
     },
 );
 

client/src/reducers/stats.js

@@ -1,6 +1,6 @@
 import { handleActions } from 'redux-actions';
 import { normalizeTopClients } from '../helpers/helpers';
-import { DAY } from '../helpers/constants';
+import { DAY, HOUR, STATS_INTERVALS_DAYS } from '../helpers/constants';
 
 import * as actions from '../actions/stats';
 
@@ -27,6 +27,9 @@ const stats = handleActions(
         [actions.getStatsConfigSuccess]: (state, { payload }) => ({
             ...state,
             ...payload,
+            customInterval: !STATS_INTERVALS_DAYS.includes(payload.interval)
+                ? payload.interval / HOUR
+                : null,
             processingGetConfig: false,
         }),
 
@@ -93,6 +96,7 @@ const stats = handleActions(
         processingStats: true,
         processingReset: false,
         interval: DAY,
+        customInterval: null,
         ...defaultStats,
     },
 );

docker/Dockerfile

@@ -25,6 +25,8 @@ RUN apk --no-cache add ca-certificates libcap tzdata && \
 	mkdir -p /opt/adguardhome/conf /opt/adguardhome/work && \
 	chown -R nobody: /opt/adguardhome
 
+RUN apk --no-cache add tini
+
 ARG DIST_DIR
 ARG TARGETARCH
 ARG TARGETOS
@@ -62,11 +64,22 @@ COPY --chown=nobody:nogroup\
 	./${DIST_DIR}/docker/scripts\
 	/opt/adguardhome/scripts
 
-ENTRYPOINT ["/opt/adguardhome/AdGuardHome"]
+HEALTHCHECK \
+	--interval=30s \
+	--timeout=10s \
+	--retries=3 \
+	CMD [ "/opt/adguardhome/scripts/healthcheck.sh" ]
 
-HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD [ "/opt/adguardhome/scripts/healthcheck.sh" ]
+# It seems that the healthckech script sometimes spawns zombie processes, so we
+# need a way to handle them, since AdGuard Home doesn't know how to keep track
+# of the processes delegated to it by the OS.  Use tini as entry point because
+# it needs the PID=1 to be the default parent for orphaned processes.
+#
+# See https://github.com/adguardTeam/adGuardHome/issues/3290.
+ENTRYPOINT [ "/sbin/tini", "--" ]
 
 CMD [ \
+	"/opt/adguardhome/AdGuardHome", \
 	"--no-check-update", \
 	"-c", "/opt/adguardhome/conf/AdGuardHome.yaml", \
 	"-h", "0.0.0.0", \

docker/dns-bind.awk

@@ -4,19 +4,26 @@
 
 /^[[:space:]]+- .+/ {
     if (FNR - prev_line == 1) {
-        addrs[addrsnum++] = $2
+        addrs[$2] = true
         prev_line = FNR
+
+        if ($2 == "0.0.0.0" || $2 == "'::'") {
+            # Drop all the other addresses.
+            delete addrs
+            addrs[""] = true
+            prev_line = -1
+        }
     }
 }
 
 /^[[:space:]]+port:/ { if (is_dns) port = $2 }
 
 END {
-    for (i in addrs) {
+    for (addr in addrs) {
-        if (match(addrs[i], ":")) {
+        if (match(addr, ":")) {
-            print "[" addrs[i] "]:" port
+            print "[" addr "]:" port
         } else {
-            print addrs[i] ":" port
+            print addr ":" port
         }
     }
-}
+}

docker/healthcheck.sh

@@ -61,8 +61,11 @@ then
     error_exit "no DNS bindings could be retrieved from $filename"
 fi
 
+first_dns="$( echo "$dns_hosts" | head -n 1 )"
+readonly first_dns
+
 # TODO(e.burkov):  Deal with 0 port.
-case "$( echo "$dns_hosts" | head -n 1 )"
+case "$first_dns"
 in
 (*':0')
     error_exit '0 in DNS port is not supported by healthcheck'
@@ -82,8 +85,23 @@ esac
 # See https://github.com/AdguardTeam/AdGuardHome/issues/5642.
 wget --no-check-certificate "$web_url" -O /dev/null -q || exit 1
 
-echo "$dns_hosts" | while read -r host
+test_fqdn="healthcheck.adguardhome.test."
-do
+readonly test_fqdn
-    nslookup -type=a healthcheck.adguardhome.test. "$host" > /dev/null ||\
+
+# The awk script currently returns only port prefixed with colon in case of
+# unspecified address.
+case "$first_dns"
+in
+(':'*)
+    nslookup -type=a "$test_fqdn" "127.0.0.1${first_dns}" > /dev/null ||\
+    nslookup -type=a "$test_fqdn" "[::1]${first_dns}" > /dev/null ||\
         error_exit "nslookup failed for $host"
-done
+    ;;
+(*)
+    echo "$dns_hosts" | while read -r host
+    do
+        nslookup -type=a "$test_fqdn" "$host" > /dev/null ||\
+            error_exit "nslookup failed for $host"
+    done
+    ;;
+esac

docker/web-bind.awk

@@ -10,4 +10,4 @@ END {
      } else {
         print "http://" host ":" port
     }
-}
+}

go.mod

@@ -3,12 +3,11 @@ module github.com/AdguardTeam/AdGuardHome
 go 1.19
 
 require (
-	// TODO(a.garipov): Use v0.48.0 when it's released.
+	github.com/AdguardTeam/dnsproxy v0.50.2
-	github.com/AdguardTeam/dnsproxy v0.48.2
+	github.com/AdguardTeam/golibs v0.13.2
-	github.com/AdguardTeam/golibs v0.13.0
 	github.com/AdguardTeam/urlfilter v0.16.1
 	github.com/NYTimes/gziphandler v1.1.1
-	github.com/ameshkov/dnscrypt/v2 v2.2.6
+	github.com/ameshkov/dnscrypt/v2 v2.2.7
 	github.com/digineo/go-ipset/v2 v2.2.1
 	github.com/dimfeld/httptreemux/v5 v5.5.0
 	github.com/fsnotify/fsnotify v1.6.0
@@ -17,20 +16,24 @@ require (
 	github.com/google/gopacket v1.1.19
 	github.com/google/renameio v1.0.1
 	github.com/google/uuid v1.3.0
-	github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8
+	github.com/insomniacslk/dhcp v0.0.0-20230516061539-49801966e6cb
+	github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86
 	github.com/kardianos/service v1.2.2
 	github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
-	github.com/mdlayher/netlink v1.7.1
+	github.com/mdlayher/netlink v1.7.2
-	github.com/mdlayher/packet v1.1.1
+	github.com/mdlayher/packet v1.1.2
-	github.com/miekg/dns v1.1.53
+	// TODO(a.garipov): This package is deprecated; find a new one or use our
-	github.com/quic-go/quic-go v0.33.0
+	// own code for that.  Perhaps, use gopacket.
+	github.com/mdlayher/raw v0.1.0
+	github.com/miekg/dns v1.1.54
+	github.com/quic-go/quic-go v0.35.1
 	github.com/stretchr/testify v1.8.2
 	github.com/ti-mo/netfilter v0.5.0
 	go.etcd.io/bbolt v1.3.7
-	golang.org/x/crypto v0.7.0
+	golang.org/x/crypto v0.9.0
-	golang.org/x/exp v0.0.0-20230321023759-10a507213a29
+	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
-	golang.org/x/net v0.8.0
+	golang.org/x/net v0.10.0
-	golang.org/x/sys v0.6.0
+	golang.org/x/sys v0.8.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v3 v3.0.1
 	howett.net/plist v1.0.0
@@ -45,25 +48,19 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/golang/mock v1.6.0 // indirect
-	github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
+	github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
-	github.com/josharian/native v1.1.0 // indirect
+	github.com/mdlayher/socket v0.4.1 // indirect
-	github.com/mdlayher/raw v0.1.0 // indirect
+	github.com/onsi/ginkgo/v2 v2.10.0 // indirect
-	github.com/mdlayher/socket v0.4.0 // indirect
-	github.com/onsi/ginkgo/v2 v2.9.2 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pierrec/lz4/v4 v4.1.17 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
-	github.com/quic-go/qtls-go1-19 v0.3.0 // indirect
+	github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
-	github.com/quic-go/qtls-go1-20 v0.2.0 // indirect
+	github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
 	github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 // indirect
-	golang.org/x/mod v0.9.0 // indirect
+	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sync v0.2.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
-	golang.org/x/tools v0.7.0 // indirect
+	golang.org/x/tools v0.9.3 // indirect
 )
-
-// TODO(a.garipov): Remove this and update github.com/ameshkov/dnscrypt when
-// it's released.
-replace github.com/ameshkov/dnscrypt/v2 => github.com/ainar-g/dnscrypt/v2 v2.0.1-0.20230315131826-cdb2bf61bda8

go.sum

@@ -1,9 +1,9 @@
-github.com/AdguardTeam/dnsproxy v0.48.2 h1:zEWeImyJGPeQAZ7+F/sgOJ2WbCRN1zbINLsDAEnFWjI=
+github.com/AdguardTeam/dnsproxy v0.50.2 h1:p1471SsMZ6SMo7T51Olw4aNluahvMwSLMorwxYV18ts=
-github.com/AdguardTeam/dnsproxy v0.48.2/go.mod h1:Y7g7jRTd/u7+KJ/QvnGI2PCE8vnisp6EsW47/Sz0DZw=
+github.com/AdguardTeam/dnsproxy v0.50.2/go.mod h1:CQhZTkqC8X0ID6glrtyaxgqRRdiYfn1gJulC1cZ5Dn8=
 github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
 github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
-github.com/AdguardTeam/golibs v0.13.0 h1:hVBeNQXT/BgcjKz/4FMpFGvEYqXiXDJG+b5XpGCUOLk=
+github.com/AdguardTeam/golibs v0.13.2 h1:BPASsyQKmb+b8VnvsNOHp7bKfcZl9Z+Z2UhPjOiupSc=
-github.com/AdguardTeam/golibs v0.13.0/go.mod h1:rIglKDHdLvFT1UbhumBLHO9S4cvWS9MEyT1njommI/Y=
+github.com/AdguardTeam/golibs v0.13.2/go.mod h1:7ylQLv2Lqsc3UW3jHoITynYk6Y1tYtgEMkR09ppfsN8=
 github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
 github.com/AdguardTeam/urlfilter v0.16.1 h1:ZPi0rjqo8cQf2FVdzo6cqumNoHZx2KPXj2yZa1A5BBw=
 github.com/AdguardTeam/urlfilter v0.16.1/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
@@ -15,8 +15,8 @@ github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmH
 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
 github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
 github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
-github.com/ainar-g/dnscrypt/v2 v2.0.1-0.20230315131826-cdb2bf61bda8 h1:jc3/aOQ01Yy3vxB/uqcuUi4F+6E/FKWaTCHq5J1ef2o=
+github.com/ameshkov/dnscrypt/v2 v2.2.7 h1:aEitLIR8HcxVodZ79mgRcCiC0A0I5kZPBuWGFwwulAw=
-github.com/ainar-g/dnscrypt/v2 v2.0.1-0.20230315131826-cdb2bf61bda8/go.mod h1:qPWhwz6FdSmuK7W4sMyvogrez4MWdtzosdqlr0Rg3ow=
+github.com/ameshkov/dnscrypt/v2 v2.2.7/go.mod h1:qPWhwz6FdSmuK7W4sMyvogrez4MWdtzosdqlr0Rg3ow=
 github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo=
 github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
 github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 h1:0b2vaepXIfMsG++IsjHiI2p4bxALD1Y2nQKGMR5zDQM=
@@ -31,10 +31,9 @@ github.com/digineo/go-ipset/v2 v2.2.1 h1:k6skY+0fMqeUjjeWO/m5OuWPSZUAn7AucHMnQ1M
 github.com/digineo/go-ipset/v2 v2.2.1/go.mod h1:wBsNzJlZlABHUITkesrggFnZQtgW5wkqw1uo8Qxe0VU=
 github.com/dimfeld/httptreemux/v5 v5.5.0 h1:p8jkiMrCuZ0CmhwYLcbNbl7DDo21fozhKHQ2PccwOFQ=
 github.com/dimfeld/httptreemux/v5 v5.5.0/go.mod h1:QeEylH57C0v3VO0tkKraVz9oD3Uu93CKPnTLbsidvSw=
-github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
+github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
 github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ping/ping v1.1.0 h1:3MCGhVX4fyEUuhsfwPrsEdQw6xspHkv5zHsiSoDFZYw=
@@ -45,72 +44,54 @@ github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
 github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
-github.com/google/pprof v0.0.0-20230323073829-e72429f035bd h1:r8yyd+DJDmsUhGrRBxH5Pj7KeFK5l+Y3FsgT8keqKtk=
+github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 h1:hR7/MlvK23p6+lIw9SN1TigNLn9ZnF3W4SYRKq2gAHs=
-github.com/google/pprof v0.0.0-20230323073829-e72429f035bd/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
+github.com/google/pprof v0.0.0-20230602150820-91b7bce49751/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA=
 github.com/google/renameio v1.0.1 h1:Lh/jXZmvZxb0BBeSY5VKEfidcbcbenKjZFzM/q0fSeU=
 github.com/google/renameio v1.0.1/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8=
-github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
+github.com/insomniacslk/dhcp v0.0.0-20230516061539-49801966e6cb h1:6fDKEAXwe3rsfS4khW3EZ8kEqmSiV9szhMPcDrD+Y7Q=
-github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 h1:Z72DOke2yOK0Ms4Z2LK1E1OrRJXOxSj5DllTz2FYTRg=
+github.com/insomniacslk/dhcp v0.0.0-20230516061539-49801966e6cb/go.mod h1:7474bZ1YNCvarT6WFKie4kEET6J0KYRDC4XJqqXzQW4=
-github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8/go.mod h1:m5WMe03WCvWcXjRnhvaAbAAXdCnu20J5P+mmH44ZzpE=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
-github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
+github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 h1:elKwZS1OcdQ0WwEDBeqxKwb7WB62QX8bvZ/FJnVXIfk=
-github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
+github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86/go.mod h1:aFAMtuldEgx/4q7iSGazk22+IcgvtiC+HIimFO9XlS8=
-github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
-github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
-github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
-github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kardianos/service v1.2.2 h1:ZvePhAHfvo0A7Mftk/tEzqEZ7Q4lgnR8sGz4xu1YX60=
 github.com/kardianos/service v1.2.2/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
 github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 h1:2oDp6OOhLxQ9JBoUuysVz9UZ9uI6oLUbvAZu0x8o+vE=
 github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118/go.mod h1:ZFUnHIVchZ9lJoWoEGUg8Q3M4U8aNNWA3CVSUTkW4og=
 github.com/mdlayher/netlink v0.0.0-20190313131330-258ea9dff42c/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
-github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
+github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g=
-github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
+github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
-github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY=
-github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
-github.com/mdlayher/netlink v1.7.1 h1:FdUaT/e33HjEXagwELR8R3/KL1Fq5x3G5jgHLp/BTmg=
-github.com/mdlayher/netlink v1.7.1/go.mod h1:nKO5CSjE/DJjVhk/TNp6vCE1ktVxEA8VEh8drhZzxsQ=
 github.com/mdlayher/packet v1.0.0/go.mod h1:eE7/ctqDhoiRhQ44ko5JZU2zxB88g+JH/6jmnjzPjOU=
-github.com/mdlayher/packet v1.1.1 h1:7Fv4OEMYqPl7//uBm04VgPpnSNi8fbBZznppgh6WMr8=
+github.com/mdlayher/packet v1.1.2 h1:3Up1NG6LZrsgDVn6X4L9Ge/iyRyxFEFD9o6Pr3Q1nQY=
-github.com/mdlayher/packet v1.1.1/go.mod h1:DRvYY5mH4M4lUqAnMg04E60U4fjUKMZ/4g2cHElZkKo=
+github.com/mdlayher/packet v1.1.2/go.mod h1:GEu1+n9sG5VtiRE4SydOmX5GTwyyYlteZiFU+x0kew4=
-github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
-github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
 github.com/mdlayher/raw v0.1.0 h1:K4PFMVy+AFsp0Zdlrts7yNhxc/uXoPVHi9RzRvtZF2Y=
 github.com/mdlayher/raw v0.1.0/go.mod h1:yXnxvs6c0XoF/aK52/H5PjsVHmWBCFfZUfoh/Y5s9Sg=
 github.com/mdlayher/socket v0.2.1/go.mod h1:QLlNPkFR88mRUNQIzRBMfXxwKal8H7u1h3bL1CV+f0E=
-github.com/mdlayher/socket v0.4.0 h1:280wsy40IC9M9q1uPGcLBwXpcTQDtoGwVt+BNoITxIw=
+github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
-github.com/mdlayher/socket v0.4.0/go.mod h1:xxFqz5GRCUN3UEOm9CZqEJsAbe1C8OwSK46NlmWuVoc=
+github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
 github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
-github.com/miekg/dns v1.1.53 h1:ZBkuHr5dxHtB1caEOlZTLPo7D3L3TWckgUUs/RHfDxw=
+github.com/miekg/dns v1.1.54 h1:5jon9mWcb0sFJGpnI99tOMhCPyJ+RPVz5b63MQG0VWI=
-github.com/miekg/dns v1.1.53/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
+github.com/miekg/dns v1.1.54/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU=
+github.com/onsi/ginkgo/v2 v2.10.0 h1:sfUl4qgLdvkChZrWCYndY2EAu9BRIw1YphNAzy1VNWs=
-github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts=
+github.com/onsi/ginkgo/v2 v2.10.0/go.mod h1:UDQOh5wbQUlMnkLfVaIUMtQ1Vus92oM+P2JX1aulgcE=
-github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E=
+github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
@@ -123,16 +104,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
-github.com/quic-go/qtls-go1-19 v0.3.0 h1:aUBoQdpHzUWtPw5tQZbsD2GnrWCNu7/RIX1PtqGeLYY=
+github.com/quic-go/qtls-go1-19 v0.3.2 h1:tFxjCFcTQzK+oMxG6Zcvp4Dq8dx4yD3dDiIiyc86Z5U=
-github.com/quic-go/qtls-go1-19 v0.3.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
+github.com/quic-go/qtls-go1-19 v0.3.2/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
-github.com/quic-go/qtls-go1-20 v0.2.0 h1:jUHn+obJ6WI5JudqBO0Iy1ra5Vh5vsitQ1gXQvkmN+E=
+github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8GEa3E=
-github.com/quic-go/qtls-go1-20 v0.2.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
+github.com/quic-go/qtls-go1-20 v0.2.2/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
-github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y0=
+github.com/quic-go/quic-go v0.35.1 h1:b0kzj6b/cQAf05cT0CkQubHM31wiA+xH3IBkxP62poo=
-github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA=
+github.com/quic-go/quic-go v0.35.1/go.mod h1:+4CVgVppm0FNjpG3UcX8Joi/frKOH7/ciD5yGcwOO1g=
 github.com/shirou/gopsutil/v3 v3.21.8 h1:nKct+uP0TV8DjjNiHanKf8SAuub+GNsbrOtM9Nl9biA=
 github.com/shirou/gopsutil/v3 v3.21.8/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
@@ -152,7 +131,6 @@ github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev
 github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
 github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ=
 github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
-github.com/u-root/uio v0.0.0-20221213070652-c3537552635f/go.mod h1:IogEAUBXDEwX7oR/BMmCctShYs80ql4hF0ySdzGxf7E=
 github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 h1:YcojQL98T/OO+rybuzn2+5KrD5dBwXIvYBvQ2cD3Avg=
 github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63/go.mod h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
@@ -160,52 +138,36 @@ go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
 go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
-golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
+golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
+golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
+golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
-golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190322080309-f49334f85ddc/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -218,23 +180,23 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
+golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
+golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

internal/aghhttp/aghhttp.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/version"
+	"github.com/AdguardTeam/golibs/httphdr"
 	"github.com/AdguardTeam/golibs/log"
 )
 
@@ -52,7 +53,7 @@ const textPlainDeprMsg = `using this api with the text/plain content-type is dep
 // deprecation and removal of a plain-text API if the request is made with the
 // "text/plain" content-type.
 func WriteTextPlainDeprecated(w http.ResponseWriter, r *http.Request) (isPlainText bool) {
-	if r.Header.Get(HdrNameContentType) != HdrValTextPlain {
+	if r.Header.Get(httphdr.ContentType) != HdrValTextPlain {
 		return false
 	}
 
@@ -71,8 +72,8 @@ func WriteJSONResponse(w http.ResponseWriter, r *http.Request, resp any) (err er
 // WriteJSONResponseCode is like [WriteJSONResponse] but adds the ability to
 // redefine the status code.
 func WriteJSONResponseCode(w http.ResponseWriter, r *http.Request, code int, resp any) (err error) {
+	w.Header().Set(httphdr.ContentType, HdrValApplicationJSON)
 	w.WriteHeader(code)
-	w.Header().Set(HdrNameContentType, HdrValApplicationJSON)
 	err = json.NewEncoder(w).Encode(resp)
 	if err != nil {
 		Error(r, w, http.StatusInternalServerError, "encoding resp: %s", err)

internal/aghhttp/header.go

@@ -1,22 +1,6 @@
 package aghhttp
 
-// HTTP Headers
+// HTTP headers
-
-// HTTP header name constants.
-//
-// TODO(a.garipov): Remove unused.
-const (
-	HdrNameAcceptEncoding           = "Accept-Encoding"
-	HdrNameAccessControlAllowOrigin = "Access-Control-Allow-Origin"
-	HdrNameAltSvc                   = "Alt-Svc"
-	HdrNameContentEncoding          = "Content-Encoding"
-	HdrNameContentType              = "Content-Type"
-	HdrNameOrigin                   = "Origin"
-	HdrNameServer                   = "Server"
-	HdrNameTrailer                  = "Trailer"
-	HdrNameUserAgent                = "User-Agent"
-	HdrNameVary                     = "Vary"
-)
 
 // HTTP header value constants.
 const (

internal/aghnet/dhcp_unix.go

@@ -304,7 +304,7 @@ func tryConn6(req *dhcpv6.Message, c net.PacketConn) (ok, next bool, err error)
 	if !(response.Type() == dhcpv6.MessageTypeAdvertise &&
 		msg.TransactionID == req.TransactionID &&
 		rcid != nil &&
-		cid.Equal(*rcid)) {
+		cid.Equal(rcid)) {
 
 		log.Debug("dhcpv6: received message from server doesn't match our request")
 

internal/aghnet/testdata/etc_hosts

@@ -35,4 +35,4 @@
 1.3.5.7 domain4 domain4.alias
 7.5.3.1 domain4.alias domain4
 ::13    domain6 domain6.alias
-::31    domain6.alias domain6
+::31    domain6.alias domain6

internal/aghnet/testdata/ifaces

@@ -1 +1 @@
-iface sample_name inet static
+iface sample_name inet static

internal/aghnet/testdata/include-subsources

@@ -2,4 +2,4 @@
 # parent directory.  Real interface files usually contain only absolute paths.
 
 source ./testdata/ifaces
-source ./testdata/*
+source ./testdata/*

internal/aghnet/testdata/proc_net_arp

@@ -3,4 +3,4 @@ IP address     HW type     Flags       HW address            Mask     Device
 ::ffff:ffff    0x1         0x0         ef:cd:ab:ef:cd:ab     *        br-lan
 0.0.0.0        0x0         0x0         00:00:00:00:00:00     *        unspec
 1.2.3.4.5      0x1         0x2         aa:bb:cc:dd:ee:ff     *        wan
-1.2.3.4        0x1         0x2         12:34:56:78:910       *        wan
+1.2.3.4        0x1         0x2         12:34:56:78:910       *        wan

internal/aghos/endian_big.go

@@ -1,10 +0,0 @@
-//go:build mips || mips64
-
-// This file is an adapted version of github.com/josharian/native.
-
-package aghos
-
-import "encoding/binary"
-
-// NativeEndian is the native endianness of this system.
-var NativeEndian = binary.BigEndian

internal/aghos/endian_little.go

@@ -1,10 +0,0 @@
-//go:build amd64 || 386 || arm || arm64 || mipsle || mips64le || ppc64le
-
-// This file is an adapted version of github.com/josharian/native.
-
-package aghos
-
-import "encoding/binary"
-
-// NativeEndian is the native endianness of this system.
-var NativeEndian = binary.LittleEndian

internal/aghos/service.go

@@ -0,0 +1,6 @@
+package aghos
+
+// PreCheckActionStart performs the service start action pre-check.
+func PreCheckActionStart() (err error) {
+	return preCheckActionStart()
+}

internal/aghos/service_darwin.go

@@ -0,0 +1,32 @@
+//go:build darwin
+
+package aghos
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/AdguardTeam/golibs/log"
+)
+
+// preCheckActionStart performs the service start action pre-check.  It warns
+// user that the service should be installed into Applications directory.
+func preCheckActionStart() (err error) {
+	exe, err := os.Executable()
+	if err != nil {
+		return fmt.Errorf("getting executable path: %v", err)
+	}
+
+	exe, err = filepath.EvalSymlinks(exe)
+	if err != nil {
+		return fmt.Errorf("evaluating executable symlinks: %v", err)
+	}
+
+	if !strings.HasPrefix(exe, "/Applications/") {
+		log.Info("warning: service must be started from within the /Applications directory")
+	}
+
+	return err
+}

internal/aghos/service_others.go

@@ -0,0 +1,8 @@
+//go:build !darwin
+
+package aghos
+
+// preCheckActionStart performs the service start action pre-check.
+func preCheckActionStart() (err error) {
+	return nil
+}

internal/dhcpd/README.md

@@ -1,46 +1,60 @@
-# DHCP server
+ #  Testing DHCP Server
 
 Contents:
-* [Test setup with Virtual Box](#vbox)
+ *  [Test setup with Virtual Box](#vbox)
+ *  [Quick test with DHCPTest](#dhcptest)
 
-<a id="vbox"></a>
+##  <a href="#vbox" id="vbox" name="vbox">Test setup with Virtual Box</a>
-## Test setup with Virtual Box
 
-To set up a test environment for DHCP server you need:
+   ### Prerequisites
 
-* Linux host machine
+To set up a test environment for DHCP server you will need:
-* Virtual Box
-* Virtual machine (guest OS doesn't matter)
 
-### Configure client
+ *  Linux AG Home host machine (Virtual).
+ *  Virtual Box.
+ *  Virtual machine (guest OS doesn't matter).
 
-1. Install Virtual Box and run the following command to create a Host-Only network:
+   ### Configure Virtual Box
 
-        $ VBoxManage hostonlyif create
+ 1.  Install Virtual Box and run the following command to create a Host-Only 
+     network:
 
-    You can check its status by `ip a` command.
+     ```sh
+     $ VBoxManage hostonlyif create
+     ```
+     
+     You can check its status by `ip a` command.  
 
-    You can also set up Host-Only network using Virtual Box menu:
+     You can also set up Host-Only network using Virtual Box menu: 
+     
+     ```
+     File -> Host Network Manager...
+     ```
 
-        File -> Host Network Manager...
+ 2.  Create your virtual machine and set up its network:
 
-2. Create your virtual machine and set up its network:
+     ```
+     VM Settings -> Network -> Host-only Adapter
+     ```
 
-        VM Settings -> Network -> Host-only Adapter
+ 3.  Start your VM, install an OS.  Configure your network interface to use
+     DHCP and the OS should ask for a IP address from our DHCP server.
 
-3. Start your VM, install an OS.  Configure your network interface to use DHCP and the OS should ask for a IP address from our DHCP server.
+ 4.  To see the current IP addresses on client OS you can use `ip a` command on
+     Linux or `ipconfig` on Windows.
 
-4. To see the current IP address on client OS you can use `ip a` command on Linux or `ipconfig` on Windows.
+ 5.  To force the client OS to request an IP from DHCP server again, you can
+     use `dhclient` on Linux or `ipconfig /release` on Windows.
 
-5. To force the client OS to request an IP from DHCP server again, you can use `dhclient` on Linux or `ipconfig /release` on Windows.
+   ### Configure server
 
-### Configure server
+ 1.  Edit server configuration file `AdGuardHome.yaml`, for example:
 
-1. Edit server configuration file 'AdGuardHome.yaml', for example:
+     ```yaml
-
+     dhcp:
-        dhcp:
           enabled: true
           interface_name: vboxnet0
+          local_domain_name: lan
           dhcpv4:
             gateway_ip: 192.168.56.1
             subnet_mask: 255.255.255.0
@@ -54,11 +68,29 @@ To set up a test environment for DHCP server you need:
             lease_duration: 86400
             ra_slaac_only: false
             ra_allow_slaac: false
+     ```
 
-2. Start the server
+ 2.  Start the server
 
-        ./AdGuardHome
+     ```sh
+     ./AdGuardHome -v
+     ```
 
-    There should be a message in log which shows that DHCP server is ready:
+     There should be a message in log which shows that DHCP server is ready:
 
-        [info] DHCP: listening on 0.0.0.0:67
+     ```
+     [info] DHCP: listening on 0.0.0.0:67
+     ```
+
+##  <a href="#dhcptest" id="dhcptest" name="dhcptest">Quick test with DHCPTest utility</a>
+
+   ### Prerequisites
+
+ *  [DHCP test utility][dhcptest-gh].
+
+   ### Quick test
+
+The DHCP server could be tested for DISCOVER-OFFER packets with in
+interactive mode.
+
+[dhcptest-gh]: https://github.com/CyberShadow/dhcptest

internal/dhcpd/config.go

@@ -31,8 +31,16 @@ type ServerConfig struct {
 	Conf4 V4ServerConf `yaml:"dhcpv4"`
 	Conf6 V6ServerConf `yaml:"dhcpv6"`
 
-	WorkDir    string `yaml:"-"`
+	// WorkDir is used to store DHCP leases.
-	DBFilePath string `yaml:"-"`
+	//
+	// Deprecated:  Remove it when migration of DHCP leases will not be needed.
+	WorkDir string `yaml:"-"`
+
+	// DataDir is used to store DHCP leases.
+	DataDir string `yaml:"-"`
+
+	// dbFilePath is the path to the file with stored DHCP leases.
+	dbFilePath string `yaml:"-"`
 }
 
 // DHCPServer - DHCP server interface

internal/dhcpd/conn_bsd.go

@@ -0,0 +1,293 @@
+//go:build darwin || freebsd || openbsd
+
+package dhcpd
+
+import (
+	"fmt"
+	"net"
+	"os"
+	"time"
+
+	"github.com/AdguardTeam/golibs/errors"
+	"github.com/AdguardTeam/golibs/log"
+	"github.com/AdguardTeam/golibs/netutil"
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
+	"github.com/insomniacslk/dhcp/dhcpv4"
+	"github.com/insomniacslk/dhcp/dhcpv4/server4"
+	"github.com/mdlayher/ethernet"
+
+	//lint:ignore SA1019 See the TODO in go.mod.
+	"github.com/mdlayher/raw"
+)
+
+// dhcpUnicastAddr is the combination of MAC and IP addresses for responding to
+// the unconfigured host.
+type dhcpUnicastAddr struct {
+	// raw.Addr is embedded here to make *dhcpUcastAddr a net.Addr without
+	// actually implementing all methods.  It also contains the client's
+	// hardware address.
+	raw.Addr
+
+	// yiaddr is an IP address just allocated by server for the host.
+	yiaddr net.IP
+}
+
+// dhcpConn is the net.PacketConn capable of handling both net.UDPAddr and
+// net.HardwareAddr.
+type dhcpConn struct {
+	// udpConn is the connection for UDP addresses.
+	udpConn net.PacketConn
+	// bcastIP is the broadcast address specific for the configured
+	// interface's subnet.
+	bcastIP net.IP
+
+	// rawConn is the connection for MAC addresses.
+	rawConn net.PacketConn
+	// srcMAC is the hardware address of the configured network interface.
+	srcMAC net.HardwareAddr
+	// srcIP is the IP address  of the configured network interface.
+	srcIP net.IP
+}
+
+// newDHCPConn creates the special connection for DHCP server.
+func (s *v4Server) newDHCPConn(iface *net.Interface) (c net.PacketConn, err error) {
+	var ucast net.PacketConn
+	if ucast, err = raw.ListenPacket(iface, uint16(ethernet.EtherTypeIPv4), nil); err != nil {
+		return nil, fmt.Errorf("creating raw udp connection: %w", err)
+	}
+
+	// Create the UDP connection.
+	var bcast net.PacketConn
+	bcast, err = server4.NewIPv4UDPConn(iface.Name, &net.UDPAddr{
+		// TODO(e.burkov):  Listening on zeroes makes the server handle
+		// requests from all the interfaces.  Inspect the ways to
+		// specify the interface-specific listening addresses.
+		//
+		// See https://github.com/AdguardTeam/AdGuardHome/issues/3539.
+		IP:   net.IP{0, 0, 0, 0},
+		Port: dhcpv4.ServerPort,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("creating ipv4 udp connection: %w", err)
+	}
+
+	return &dhcpConn{
+		udpConn: bcast,
+		bcastIP: s.conf.broadcastIP.AsSlice(),
+		rawConn: ucast,
+		srcMAC:  iface.HardwareAddr,
+		srcIP:   s.conf.dnsIPAddrs[0].AsSlice(),
+	}, nil
+}
+
+// wrapErrs is a helper to wrap the errors from two independent underlying
+// connections.
+func (*dhcpConn) wrapErrs(action string, udpConnErr, rawConnErr error) (err error) {
+	switch {
+	case udpConnErr != nil && rawConnErr != nil:
+		return errors.List(fmt.Sprintf("%s both connections", action), udpConnErr, rawConnErr)
+	case udpConnErr != nil:
+		return fmt.Errorf("%s udp connection: %w", action, udpConnErr)
+	case rawConnErr != nil:
+		return fmt.Errorf("%s raw connection: %w", action, rawConnErr)
+	default:
+		return nil
+	}
+}
+
+// WriteTo implements net.PacketConn for *dhcpConn.  It selects the underlying
+// connection to write to based on the type of addr.
+func (c *dhcpConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
+	switch addr := addr.(type) {
+	case *dhcpUnicastAddr:
+		// Unicast the message to the client's MAC address.  Use the raw
+		// connection.
+		//
+		// Note: unicasting is performed on the only network interface
+		// that is configured.  For now it may be not what users expect
+		// so additionally broadcast the message via UDP connection.
+		//
+		// See https://github.com/AdguardTeam/AdGuardHome/issues/3539.
+		var rerr error
+		n, rerr = c.unicast(p, addr)
+
+		_, uerr := c.broadcast(p, &net.UDPAddr{
+			IP:   netutil.IPv4bcast(),
+			Port: dhcpv4.ClientPort,
+		})
+
+		return n, c.wrapErrs("writing to", uerr, rerr)
+	case *net.UDPAddr:
+		if addr.IP.Equal(net.IPv4bcast) {
+			// Broadcast the message for the client which supports
+			// it.  Use the UDP connection.
+			return c.broadcast(p, addr)
+		}
+
+		// Unicast the message to the client's IP address.  Use the UDP
+		// connection.
+		return c.udpConn.WriteTo(p, addr)
+	default:
+		return 0, fmt.Errorf("addr has an unexpected type %T", addr)
+	}
+}
+
+// ReadFrom implements net.PacketConn for *dhcpConn.
+func (c *dhcpConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
+	return c.udpConn.ReadFrom(p)
+}
+
+// unicast wraps respData with required frames and writes it to the peer.
+func (c *dhcpConn) unicast(respData []byte, peer *dhcpUnicastAddr) (n int, err error) {
+	var data []byte
+	data, err = c.buildEtherPkt(respData, peer)
+	if err != nil {
+		return 0, err
+	}
+
+	return c.rawConn.WriteTo(data, &peer.Addr)
+}
+
+// Close implements net.PacketConn for *dhcpConn.
+func (c *dhcpConn) Close() (err error) {
+	rerr := c.rawConn.Close()
+	if errors.Is(rerr, os.ErrClosed) {
+		// Ignore the error since the actual file is closed already.
+		rerr = nil
+	}
+
+	return c.wrapErrs("closing", c.udpConn.Close(), rerr)
+}
+
+// LocalAddr implements net.PacketConn for *dhcpConn.
+func (c *dhcpConn) LocalAddr() (a net.Addr) {
+	return c.udpConn.LocalAddr()
+}
+
+// SetDeadline implements net.PacketConn for *dhcpConn.
+func (c *dhcpConn) SetDeadline(t time.Time) (err error) {
+	return c.wrapErrs("setting deadline on", c.udpConn.SetDeadline(t), c.rawConn.SetDeadline(t))
+}
+
+// SetReadDeadline implements net.PacketConn for *dhcpConn.
+func (c *dhcpConn) SetReadDeadline(t time.Time) error {
+	return c.wrapErrs(
+		"setting reading deadline on",
+		c.udpConn.SetReadDeadline(t),
+		c.rawConn.SetReadDeadline(t),
+	)
+}
+
+// SetWriteDeadline implements net.PacketConn for *dhcpConn.
+func (c *dhcpConn) SetWriteDeadline(t time.Time) error {
+	return c.wrapErrs(
+		"setting writing deadline on",
+		c.udpConn.SetWriteDeadline(t),
+		c.rawConn.SetWriteDeadline(t),
+	)
+}
+
+// ipv4DefaultTTL is the default Time to Live value in seconds as recommended by
+// RFC-1700.
+//
+// See https://datatracker.ietf.org/doc/html/rfc1700.
+const ipv4DefaultTTL = 64
+
+// buildEtherPkt wraps the payload with IPv4, UDP and Ethernet frames.
+// Validation of the payload is a caller's responsibility.
+func (c *dhcpConn) buildEtherPkt(payload []byte, peer *dhcpUnicastAddr) (pkt []byte, err error) {
+	udpLayer := &layers.UDP{
+		SrcPort: dhcpv4.ServerPort,
+		DstPort: dhcpv4.ClientPort,
+	}
+
+	ipv4Layer := &layers.IPv4{
+		Version:  uint8(layers.IPProtocolIPv4),
+		Flags:    layers.IPv4DontFragment,
+		TTL:      ipv4DefaultTTL,
+		Protocol: layers.IPProtocolUDP,
+		SrcIP:    c.srcIP,
+		DstIP:    peer.yiaddr,
+	}
+
+	// Ignore the error since it's only returned for invalid network layer's
+	// type.
+	_ = udpLayer.SetNetworkLayerForChecksum(ipv4Layer)
+
+	ethLayer := &layers.Ethernet{
+		SrcMAC:       c.srcMAC,
+		DstMAC:       peer.HardwareAddr,
+		EthernetType: layers.EthernetTypeIPv4,
+	}
+
+	buf := gopacket.NewSerializeBuffer()
+	setts := gopacket.SerializeOptions{
+		FixLengths:       true,
+		ComputeChecksums: true,
+	}
+
+	err = gopacket.SerializeLayers(
+		buf,
+		setts,
+		ethLayer,
+		ipv4Layer,
+		udpLayer,
+		gopacket.Payload(payload),
+	)
+	if err != nil {
+		return nil, fmt.Errorf("serializing layers: %w", err)
+	}
+
+	return buf.Bytes(), nil
+}
+
+// send writes resp for peer to conn considering the req's parameters according
+// to RFC-2131.
+//
+// See https://datatracker.ietf.org/doc/html/rfc2131#section-4.1.
+func (s *v4Server) send(peer net.Addr, conn net.PacketConn, req, resp *dhcpv4.DHCPv4) {
+	switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
+	case giaddr != nil && !giaddr.IsUnspecified():
+		// Send any return messages to the server port on the BOOTP
+		// relay agent whose address appears in giaddr.
+		peer = &net.UDPAddr{
+			IP:   giaddr,
+			Port: dhcpv4.ServerPort,
+		}
+		if mtype == dhcpv4.MessageTypeNak {
+			// Set the broadcast bit in the DHCPNAK, so that the relay agent
+			// broadcasts it to the client, because the client may not have
+			// a correct network address or subnet mask, and the client may not
+			// be answering ARP requests.
+			resp.SetBroadcast()
+		}
+	case mtype == dhcpv4.MessageTypeNak:
+		// Broadcast any DHCPNAK messages to 0xffffffff.
+	case ciaddr != nil && !ciaddr.IsUnspecified():
+		// Unicast DHCPOFFER and DHCPACK messages to the address in
+		// ciaddr.
+		peer = &net.UDPAddr{
+			IP:   ciaddr,
+			Port: dhcpv4.ClientPort,
+		}
+	case !req.IsBroadcast() && req.ClientHWAddr != nil:
+		// Unicast DHCPOFFER and DHCPACK messages to the client's
+		// hardware address and yiaddr.
+		peer = &dhcpUnicastAddr{
+			Addr:   raw.Addr{HardwareAddr: req.ClientHWAddr},
+			yiaddr: resp.YourIPAddr,
+		}
+	default:
+		// Go on since peer is already set to broadcast.
+	}
+
+	pktData := resp.ToBytes()
+
+	log.Debug("dhcpv4: sending %d bytes to %s: %s", len(pktData), peer, resp.Summary())
+
+	_, err := conn.WriteTo(pktData, peer)
+	if err != nil {
+		log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
+	}
+}

internal/dhcpd/conn_bsd_internal_test.go

@@ -0,0 +1,219 @@
+//go:build darwin || freebsd || openbsd
+
+package dhcpd
+
+import (
+	"net"
+	"testing"
+
+	"github.com/AdguardTeam/golibs/testutil"
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
+	"github.com/insomniacslk/dhcp/dhcpv4"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	//lint:ignore SA1019 See the TODO in go.mod.
+	"github.com/mdlayher/raw"
+)
+
+func TestDHCPConn_WriteTo_common(t *testing.T) {
+	respData := (&dhcpv4.DHCPv4{}).ToBytes()
+	udpAddr := &net.UDPAddr{
+		IP:   net.IP{1, 2, 3, 4},
+		Port: dhcpv4.ClientPort,
+	}
+
+	t.Run("unicast_ip", func(t *testing.T) {
+		writeTo := func(_ []byte, addr net.Addr) (_ int, _ error) {
+			assert.Equal(t, udpAddr, addr)
+
+			return 0, nil
+		}
+
+		conn := &dhcpConn{udpConn: &fakePacketConn{writeTo: writeTo}}
+
+		_, err := conn.WriteTo(respData, udpAddr)
+		assert.NoError(t, err)
+	})
+
+	t.Run("unexpected_addr_type", func(t *testing.T) {
+		type unexpectedAddrType struct {
+			net.Addr
+		}
+
+		conn := &dhcpConn{}
+		n, err := conn.WriteTo(nil, &unexpectedAddrType{})
+		require.Error(t, err)
+
+		testutil.AssertErrorMsg(t, "addr has an unexpected type *dhcpd.unexpectedAddrType", err)
+		assert.Zero(t, n)
+	})
+}
+
+func TestBuildEtherPkt(t *testing.T) {
+	conn := &dhcpConn{
+		srcMAC: net.HardwareAddr{1, 2, 3, 4, 5, 6},
+		srcIP:  net.IP{1, 2, 3, 4},
+	}
+	peer := &dhcpUnicastAddr{
+		Addr:   raw.Addr{HardwareAddr: net.HardwareAddr{6, 5, 4, 3, 2, 1}},
+		yiaddr: net.IP{4, 3, 2, 1},
+	}
+	payload := (&dhcpv4.DHCPv4{}).ToBytes()
+
+	t.Run("success", func(t *testing.T) {
+		pkt, err := conn.buildEtherPkt(payload, peer)
+		require.NoError(t, err)
+
+		assert.NotEmpty(t, pkt)
+
+		actualPkt := gopacket.NewPacket(pkt, layers.LayerTypeEthernet, gopacket.DecodeOptions{
+			NoCopy: true,
+		})
+		require.NotNil(t, actualPkt)
+
+		wantTypes := []gopacket.LayerType{
+			layers.LayerTypeEthernet,
+			layers.LayerTypeIPv4,
+			layers.LayerTypeUDP,
+			layers.LayerTypeDHCPv4,
+		}
+		actualLayers := actualPkt.Layers()
+		require.Len(t, actualLayers, len(wantTypes))
+
+		for i, wantType := range wantTypes {
+			layer := actualLayers[i]
+			require.NotNil(t, layer)
+
+			assert.Equal(t, wantType, layer.LayerType())
+		}
+	})
+
+	t.Run("bad_payload", func(t *testing.T) {
+		// Create an invalid DHCP packet.
+		invalidPayload := []byte{1, 2, 3, 4}
+		pkt, err := conn.buildEtherPkt(invalidPayload, peer)
+		require.NoError(t, err)
+
+		assert.NotEmpty(t, pkt)
+	})
+
+	t.Run("serializing_error", func(t *testing.T) {
+		// Create a peer with invalid MAC.
+		badPeer := &dhcpUnicastAddr{
+			Addr:   raw.Addr{HardwareAddr: net.HardwareAddr{5, 4, 3, 2, 1}},
+			yiaddr: net.IP{4, 3, 2, 1},
+		}
+
+		pkt, err := conn.buildEtherPkt(payload, badPeer)
+		require.Error(t, err)
+
+		assert.Empty(t, pkt)
+	})
+}
+
+func TestV4Server_Send(t *testing.T) {
+	s := &v4Server{}
+
+	var (
+		defaultIP = net.IP{99, 99, 99, 99}
+		knownIP   = net.IP{4, 2, 4, 2}
+		knownMAC  = net.HardwareAddr{6, 5, 4, 3, 2, 1}
+	)
+
+	defaultPeer := &net.UDPAddr{
+		IP: defaultIP,
+		// Use neither client nor server port to check it actually
+		// changed.
+		Port: dhcpv4.ClientPort + dhcpv4.ServerPort,
+	}
+	defaultResp := &dhcpv4.DHCPv4{}
+
+	testCases := []struct {
+		want net.Addr
+		req  *dhcpv4.DHCPv4
+		resp *dhcpv4.DHCPv4
+		name string
+	}{{
+		name: "giaddr",
+		req:  &dhcpv4.DHCPv4{GatewayIPAddr: knownIP},
+		resp: defaultResp,
+		want: &net.UDPAddr{
+			IP:   knownIP,
+			Port: dhcpv4.ServerPort,
+		},
+	}, {
+		name: "nak",
+		req:  &dhcpv4.DHCPv4{},
+		resp: &dhcpv4.DHCPv4{
+			Options: dhcpv4.OptionsFromList(
+				dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
+			),
+		},
+		want: defaultPeer,
+	}, {
+		name: "ciaddr",
+		req:  &dhcpv4.DHCPv4{ClientIPAddr: knownIP},
+		resp: &dhcpv4.DHCPv4{},
+		want: &net.UDPAddr{
+			IP:   knownIP,
+			Port: dhcpv4.ClientPort,
+		},
+	}, {
+		name: "chaddr",
+		req:  &dhcpv4.DHCPv4{ClientHWAddr: knownMAC},
+		resp: &dhcpv4.DHCPv4{YourIPAddr: knownIP},
+		want: &dhcpUnicastAddr{
+			Addr:   raw.Addr{HardwareAddr: knownMAC},
+			yiaddr: knownIP,
+		},
+	}, {
+		name: "who_are_you",
+		req:  &dhcpv4.DHCPv4{},
+		resp: &dhcpv4.DHCPv4{},
+		want: defaultPeer,
+	}}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			conn := &fakePacketConn{
+				writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
+					assert.Equal(t, tc.want, addr)
+
+					return 0, nil
+				},
+			}
+
+			s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
+		})
+	}
+
+	t.Run("giaddr_nak", func(t *testing.T) {
+		req := &dhcpv4.DHCPv4{
+			GatewayIPAddr: knownIP,
+		}
+		// Ensure the request is for unicast.
+		req.SetUnicast()
+		resp := &dhcpv4.DHCPv4{
+			Options: dhcpv4.OptionsFromList(
+				dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
+			),
+		}
+		want := &net.UDPAddr{
+			IP:   req.GatewayIPAddr,
+			Port: dhcpv4.ServerPort,
+		}
+
+		conn := &fakePacketConn{
+			writeTo: func(_ []byte, addr net.Addr) (n int, err error) {
+				assert.Equal(t, want, addr)
+
+				return 0, nil
+			},
+		}
+
+		s.send(cloneUDPAddr(defaultPeer), conn, req, resp)
+		assert.True(t, resp.IsBroadcast())
+	})
+}

internal/dhcpd/conn_linux.go

@@ -1,4 +1,4 @@
-//go:build darwin || freebsd || linux || openbsd
+//go:build linux
 
 package dhcpd
 
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/AdguardTeam/golibs/errors"
+	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/netutil"
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
@@ -238,3 +239,53 @@ func (c *dhcpConn) buildEtherPkt(payload []byte, peer *dhcpUnicastAddr) (pkt []b
 
 	return buf.Bytes(), nil
 }
+
+// send writes resp for peer to conn considering the req's parameters according
+// to RFC-2131.
+//
+// See https://datatracker.ietf.org/doc/html/rfc2131#section-4.1.
+func (s *v4Server) send(peer net.Addr, conn net.PacketConn, req, resp *dhcpv4.DHCPv4) {
+	switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
+	case giaddr != nil && !giaddr.IsUnspecified():
+		// Send any return messages to the server port on the BOOTP
+		// relay agent whose address appears in giaddr.
+		peer = &net.UDPAddr{
+			IP:   giaddr,
+			Port: dhcpv4.ServerPort,
+		}
+		if mtype == dhcpv4.MessageTypeNak {
+			// Set the broadcast bit in the DHCPNAK, so that the relay agent
+			// broadcasts it to the client, because the client may not have
+			// a correct network address or subnet mask, and the client may not
+			// be answering ARP requests.
+			resp.SetBroadcast()
+		}
+	case mtype == dhcpv4.MessageTypeNak:
+		// Broadcast any DHCPNAK messages to 0xffffffff.
+	case ciaddr != nil && !ciaddr.IsUnspecified():
+		// Unicast DHCPOFFER and DHCPACK messages to the address in
+		// ciaddr.
+		peer = &net.UDPAddr{
+			IP:   ciaddr,
+			Port: dhcpv4.ClientPort,
+		}
+	case !req.IsBroadcast() && req.ClientHWAddr != nil:
+		// Unicast DHCPOFFER and DHCPACK messages to the client's
+		// hardware address and yiaddr.
+		peer = &dhcpUnicastAddr{
+			Addr:   packet.Addr{HardwareAddr: req.ClientHWAddr},
+			yiaddr: resp.YourIPAddr,
+		}
+	default:
+		// Go on since peer is already set to broadcast.
+	}
+
+	pktData := resp.ToBytes()
+
+	log.Debug("dhcpv4: sending %d bytes to %s: %s", len(pktData), peer, resp.Summary())
+
+	_, err := conn.WriteTo(pktData, peer)
+	if err != nil {
+		log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
+	}
+}

internal/dhcpd/conn_linux_internal_test.go

@@ -1,4 +1,4 @@
-//go:build darwin || freebsd || linux || openbsd
+//go:build linux
 
 package dhcpd
 
@@ -110,3 +110,108 @@ func TestBuildEtherPkt(t *testing.T) {
 		assert.Empty(t, pkt)
 	})
 }
+
+func TestV4Server_Send(t *testing.T) {
+	s := &v4Server{}
+
+	var (
+		defaultIP = net.IP{99, 99, 99, 99}
+		knownIP   = net.IP{4, 2, 4, 2}
+		knownMAC  = net.HardwareAddr{6, 5, 4, 3, 2, 1}
+	)
+
+	defaultPeer := &net.UDPAddr{
+		IP: defaultIP,
+		// Use neither client nor server port to check it actually
+		// changed.
+		Port: dhcpv4.ClientPort + dhcpv4.ServerPort,
+	}
+	defaultResp := &dhcpv4.DHCPv4{}
+
+	testCases := []struct {
+		want net.Addr
+		req  *dhcpv4.DHCPv4
+		resp *dhcpv4.DHCPv4
+		name string
+	}{{
+		name: "giaddr",
+		req:  &dhcpv4.DHCPv4{GatewayIPAddr: knownIP},
+		resp: defaultResp,
+		want: &net.UDPAddr{
+			IP:   knownIP,
+			Port: dhcpv4.ServerPort,
+		},
+	}, {
+		name: "nak",
+		req:  &dhcpv4.DHCPv4{},
+		resp: &dhcpv4.DHCPv4{
+			Options: dhcpv4.OptionsFromList(
+				dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
+			),
+		},
+		want: defaultPeer,
+	}, {
+		name: "ciaddr",
+		req:  &dhcpv4.DHCPv4{ClientIPAddr: knownIP},
+		resp: &dhcpv4.DHCPv4{},
+		want: &net.UDPAddr{
+			IP:   knownIP,
+			Port: dhcpv4.ClientPort,
+		},
+	}, {
+		name: "chaddr",
+		req:  &dhcpv4.DHCPv4{ClientHWAddr: knownMAC},
+		resp: &dhcpv4.DHCPv4{YourIPAddr: knownIP},
+		want: &dhcpUnicastAddr{
+			Addr:   packet.Addr{HardwareAddr: knownMAC},
+			yiaddr: knownIP,
+		},
+	}, {
+		name: "who_are_you",
+		req:  &dhcpv4.DHCPv4{},
+		resp: &dhcpv4.DHCPv4{},
+		want: defaultPeer,
+	}}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			conn := &fakePacketConn{
+				writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
+					assert.Equal(t, tc.want, addr)
+
+					return 0, nil
+				},
+			}
+
+			s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
+		})
+	}
+
+	t.Run("giaddr_nak", func(t *testing.T) {
+		req := &dhcpv4.DHCPv4{
+			GatewayIPAddr: knownIP,
+		}
+		// Ensure the request is for unicast.
+		req.SetUnicast()
+		resp := &dhcpv4.DHCPv4{
+			Options: dhcpv4.OptionsFromList(
+				dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
+			),
+		}
+		want := &net.UDPAddr{
+			IP:   req.GatewayIPAddr,
+			Port: dhcpv4.ServerPort,
+		}
+
+		conn := &fakePacketConn{
+			writeTo: func(_ []byte, addr net.Addr) (n int, err error) {
+				assert.Equal(t, want, addr)
+
+				return 0, nil
+			},
+		}
+
+		s.send(cloneUDPAddr(defaultPeer), conn, req, resp)
+		assert.True(t, resp.IsBroadcast())
+	})
+}

internal/dhcpd/db.go

@@ -5,43 +5,34 @@ package dhcpd
 import (
 	"encoding/json"
 	"fmt"
-	"net"
-	"net/netip"
 	"os"
-	"time"
 
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/google/renameio/maybe"
+	"golang.org/x/exp/slices"
 )
 
-const dbFilename = "leases.db"
+const (
+	// dataFilename contains saved leases.
+	dataFilename = "leases.json"
 
-type leaseJSON struct {
+	// dataVersion is the current version of the stored DHCP leases structure.
-	HWAddr   []byte `json:"mac"`
+	dataVersion = 1
-	IP       []byte `json:"ip"`
+)
-	Hostname string `json:"host"`
+
-	Expiry   int64  `json:"exp"`
+// dataLeases is the structure of the stored DHCP leases.
+type dataLeases struct {
+	// Version is the current version of the structure.
+	Version int `json:"version"`
+
+	// Leases is the list containing stored DHCP leases.
+	Leases []*Lease `json:"leases"`
 }
 
-func normalizeIP(ip net.IP) net.IP {
+// dbLoad loads stored leases.
-	ip4 := ip.To4()
-	if ip4 != nil {
-		return ip4
-	}
-	return ip
-}
-
-// Load lease table from DB
-//
-// TODO(s.chzhen):  Decrease complexity.
 func (s *server) dbLoad() (err error) {
-	dynLeases := []*Lease{}
+	data, err := os.ReadFile(s.conf.dbFilePath)
-	staticLeases := []*Lease{}
-	v6StaticLeases := []*Lease{}
-	v6DynLeases := []*Lease{}
-
-	data, err := os.ReadFile(s.conf.DBFilePath)
 	if err != nil {
 		if !errors.Is(err, os.ErrNotExist) {
 			return fmt.Errorf("reading db: %w", err)
@@ -50,51 +41,30 @@ func (s *server) dbLoad() (err error) {
 		return nil
 	}
 
-	obj := []leaseJSON{}
+	dl := &dataLeases{}
-	err = json.Unmarshal(data, &obj)
+	err = json.Unmarshal(data, dl)
 	if err != nil {
 		return fmt.Errorf("decoding db: %w", err)
 	}
 
-	numLeases := len(obj)
+	leases := dl.Leases
-	for i := range obj {
-		obj[i].IP = normalizeIP(obj[i].IP)
 
-		ip, ok := netip.AddrFromSlice(obj[i].IP)
+	leases4 := []*Lease{}
-		if !ok {
+	leases6 := []*Lease{}
-			log.Info("dhcp: invalid IP: %s", obj[i].IP)
-			continue
-		}
 
-		lease := Lease{
+	for _, l := range leases {
-			HWAddr:   obj[i].HWAddr,
+		if l.IP.Is4() {
-			IP:       ip,
+			leases4 = append(leases4, l)
-			Hostname: obj[i].Hostname,
-			Expiry:   time.Unix(obj[i].Expiry, 0),
-		}
-
-		if len(obj[i].IP) == 16 {
-			if obj[i].Expiry == leaseExpireStatic {
-				v6StaticLeases = append(v6StaticLeases, &lease)
-			} else {
-				v6DynLeases = append(v6DynLeases, &lease)
-			}
 		} else {
-			if obj[i].Expiry == leaseExpireStatic {
+			leases6 = append(leases6, l)
-				staticLeases = append(staticLeases, &lease)
-			} else {
-				dynLeases = append(dynLeases, &lease)
-			}
 		}
 	}
 
-	leases4 := normalizeLeases(staticLeases, dynLeases)
 	err = s.srv4.ResetLeases(leases4)
 	if err != nil {
 		return fmt.Errorf("resetting dhcpv4 leases: %w", err)
 	}
 
-	leases6 := normalizeLeases(v6StaticLeases, v6DynLeases)
 	if s.srv6 != nil {
 		err = s.srv6.ResetLeases(leases6)
 		if err != nil {
@@ -103,90 +73,54 @@ func (s *server) dbLoad() (err error) {
 	}
 
 	log.Info("dhcp: loaded leases v4:%d  v6:%d  total-read:%d from DB",
-		len(leases4), len(leases6), numLeases)
+		len(leases4), len(leases6), len(leases))
 
 	return nil
 }
 
-// Skip duplicate leases
+// dbStore stores DHCP leases.
-// Static leases have a priority over dynamic leases
-func normalizeLeases(staticLeases, dynLeases []*Lease) []*Lease {
-	leases := []*Lease{}
-	index := map[string]int{}
-
-	for i, lease := range staticLeases {
-		_, ok := index[lease.HWAddr.String()]
-		if ok {
-			continue // skip the lease with the same HW address
-		}
-		index[lease.HWAddr.String()] = i
-		leases = append(leases, lease)
-	}
-
-	for i, lease := range dynLeases {
-		_, ok := index[lease.HWAddr.String()]
-		if ok {
-			continue // skip the lease with the same HW address
-		}
-		index[lease.HWAddr.String()] = i
-		leases = append(leases, lease)
-	}
-
-	return leases
-}
-
-// Store lease table in DB
 func (s *server) dbStore() (err error) {
 	// Use an empty slice here as opposed to nil so that it doesn't write
 	// "null" into the database file if leases are empty.
-	leases := []leaseJSON{}
+	leases := []*Lease{}
 
 	leases4 := s.srv4.getLeasesRef()
-	for _, l := range leases4 {
+	leases = append(leases, leases4...)
-		if l.Expiry.Unix() == 0 {
-			continue
-		}
-
-		lease := leaseJSON{
-			HWAddr:   l.HWAddr,
-			IP:       l.IP.AsSlice(),
-			Hostname: l.Hostname,
-			Expiry:   l.Expiry.Unix(),
-		}
-
-		leases = append(leases, lease)
-	}
 
 	if s.srv6 != nil {
 		leases6 := s.srv6.getLeasesRef()
-		for _, l := range leases6 {
+		leases = append(leases, leases6...)
-			if l.Expiry.Unix() == 0 {
-				continue
-			}
-
-			lease := leaseJSON{
-				HWAddr:   l.HWAddr,
-				IP:       l.IP.AsSlice(),
-				Hostname: l.Hostname,
-				Expiry:   l.Expiry.Unix(),
-			}
-
-			leases = append(leases, lease)
-		}
 	}
 
-	var data []byte
+	return writeDB(s.conf.dbFilePath, leases)
-	data, err = json.Marshal(leases)
+}
+
+// writeDB writes leases to file at path.
+func writeDB(path string, leases []*Lease) (err error) {
+	defer func() { err = errors.Annotate(err, "writing db: %w") }()
+
+	slices.SortFunc(leases, func(a, b *Lease) bool {
+		return a.Hostname < b.Hostname
+	})
+
+	dl := &dataLeases{
+		Version: dataVersion,
+		Leases:  leases,
+	}
+
+	buf, err := json.Marshal(dl)
 	if err != nil {
-		return fmt.Errorf("encoding db: %w", err)
+		// Don't wrap the error since it's informative enough as is.
+		return err
 	}
 
-	err = maybe.WriteFile(s.conf.DBFilePath, data, 0o644)
+	err = maybe.WriteFile(path, buf, 0o644)
 	if err != nil {
-		return fmt.Errorf("writing db: %w", err)
+		// Don't wrap the error since it's informative enough as is.
+		return err
 	}
 
-	log.Info("dhcp: stored %d leases in db", len(leases))
+	log.Info("dhcp: stored %d leases in %q", len(leases), path)
 
 	return nil
 }

internal/dhcpd/dhcpd.go

@@ -15,13 +15,6 @@ import (
 )
 
 const (
-	// leaseExpireStatic is used to define the Expiry field for static
-	// leases.
-	//
-	// TODO(e.burkov): Remove it when static leases determining mechanism
-	// will be improved.
-	leaseExpireStatic = 1
-
 	// DefaultDHCPLeaseTTL is the default time-to-live for leases.
 	DefaultDHCPLeaseTTL = uint32(timeutil.Day / time.Second)
 
@@ -35,10 +28,10 @@ const (
 	defaultBackoff     time.Duration = 500 * time.Millisecond
 )
 
-// Lease contains the necessary information about a DHCP lease
+// Lease contains the necessary information about a DHCP lease.  It's used in
+// various places.  So don't change it without good reason.
 type Lease struct {
-	// Expiry is the expiration time of the lease.  The unix timestamp value
+	// Expiry is the expiration time of the lease.
-	// of 1 means that this is a static lease.
 	Expiry time.Time `json:"expires"`
 
 	// Hostname of the client.
@@ -51,6 +44,9 @@ type Lease struct {
 	//
 	// TODO(a.garipov): Migrate leases.db.
 	IP netip.Addr `json:"ip"`
+
+	// IsStatic defines if the lease is static.
+	IsStatic bool `json:"static"`
 }
 
 // Clone returns a deep copy of l.
@@ -64,6 +60,7 @@ func (l *Lease) Clone() (clone *Lease) {
 		Hostname: l.Hostname,
 		HWAddr:   slices.Clone(l.HWAddr),
 		IP:       l.IP,
+		IsStatic: l.IsStatic,
 	}
 }
 
@@ -84,17 +81,10 @@ func (l *Lease) IsBlocklisted() (ok bool) {
 	return true
 }
 
-// IsStatic returns true if the lease is static.
-//
-// TODO(a.garipov): Just make it a boolean field.
-func (l *Lease) IsStatic() (ok bool) {
-	return l != nil && l.Expiry.Unix() == leaseExpireStatic
-}
-
 // MarshalJSON implements the json.Marshaler interface for Lease.
 func (l Lease) MarshalJSON() ([]byte, error) {
 	var expiryStr string
-	if !l.IsStatic() {
+	if !l.IsStatic {
 		// The front-end is waiting for RFC 3999 format of the time
 		// value.  It also shouldn't got an Expiry field for static
 		// leases.
@@ -241,7 +231,7 @@ func Create(conf *ServerConfig) (s *server, err error) {
 
 			LocalDomainName: conf.LocalDomainName,
 
-			DBFilePath: filepath.Join(conf.WorkDir, dbFilename),
+			dbFilePath: filepath.Join(conf.DataDir, dataFilename),
 		},
 	}
 
@@ -249,39 +239,26 @@ func Create(conf *ServerConfig) (s *server, err error) {
 	// [aghhttp.RegisterFunc].
 	s.registerHandlers()
 
-	v4conf := conf.Conf4
+	v4Enabled, v6Enabled, err := s.setServers(conf)
-	v4conf.InterfaceName = s.conf.InterfaceName
-	v4conf.notify = s.onNotify
-	v4conf.Enabled = s.conf.Enabled && v4conf.RangeStart.IsValid()
-
-	s.srv4, err = v4Create(&v4conf)
 	if err != nil {
-		if v4conf.Enabled {
+		// Don't wrap the error, because it's informative enough as is.
-			return nil, fmt.Errorf("creating dhcpv4 srv: %w", err)
+		return nil, err
-		}
-
-		log.Debug("dhcpd: warning: creating dhcpv4 srv: %s", err)
-	}
-
-	v6conf := conf.Conf6
-	v6conf.Enabled = s.conf.Enabled
-	if len(v6conf.RangeStart) == 0 {
-		v6conf.Enabled = false
-	}
-	v6conf.InterfaceName = s.conf.InterfaceName
-	v6conf.notify = s.onNotify
-	s.srv6, err = v6Create(v6conf)
-	if err != nil {
-		return nil, fmt.Errorf("creating dhcpv6 srv: %w", err)
 	}
 
 	s.conf.Conf4 = conf.Conf4
 	s.conf.Conf6 = conf.Conf6
 
-	if s.conf.Enabled && !v4conf.Enabled && !v6conf.Enabled {
+	if s.conf.Enabled && !v4Enabled && !v6Enabled {
 		return nil, fmt.Errorf("neither dhcpv4 nor dhcpv6 srv is configured")
 	}
 
+	// Migrate leases db if needed.
+	err = migrateDB(conf)
+	if err != nil {
+		// Don't wrap the error since it's informative enough as is.
+		return nil, err
+	}
+
 	// Don't delay database loading until the DHCP server is started,
 	// because we need static leases functionality available beforehand.
 	err = s.dbLoad()
@@ -292,6 +269,39 @@ func Create(conf *ServerConfig) (s *server, err error) {
 	return s, nil
 }
 
+// setServers updates DHCPv4 and DHCPv6 servers created from the provided
+// configuration conf.
+func (s *server) setServers(conf *ServerConfig) (v4Enabled, v6Enabled bool, err error) {
+	v4conf := conf.Conf4
+	v4conf.InterfaceName = s.conf.InterfaceName
+	v4conf.notify = s.onNotify
+	v4conf.Enabled = s.conf.Enabled && v4conf.RangeStart.IsValid()
+
+	s.srv4, err = v4Create(&v4conf)
+	if err != nil {
+		if v4conf.Enabled {
+			return true, false, fmt.Errorf("creating dhcpv4 srv: %w", err)
+		}
+
+		log.Debug("dhcpd: warning: creating dhcpv4 srv: %s", err)
+	}
+
+	v6conf := conf.Conf6
+	v6conf.InterfaceName = s.conf.InterfaceName
+	v6conf.notify = s.onNotify
+	v6conf.Enabled = s.conf.Enabled
+	if len(v6conf.RangeStart) == 0 {
+		v6conf.Enabled = false
+	}
+
+	s.srv6, err = v6Create(v6conf)
+	if err != nil {
+		return v4conf.Enabled, v6conf.Enabled, fmt.Errorf("creating dhcpv6 srv: %w", err)
+	}
+
+	return v4conf.Enabled, v6conf.Enabled, nil
+}
+
 // Enabled returns true when the server is enabled.
 func (s *server) Enabled() (ok bool) {
 	return s.conf.Enabled

internal/dhcpd/dhcpd_unix_test.go

@@ -5,7 +5,7 @@ package dhcpd
 import (
 	"net"
 	"net/netip"
-	"os"
+	"path/filepath"
 	"testing"
 	"time"
 
@@ -27,7 +27,7 @@ func TestDB(t *testing.T) {
 	var err error
 	s := server{
 		conf: &ServerConfig{
-			DBFilePath: dbFilename,
+			dbFilePath: filepath.Join(t.TempDir(), dataFilename),
 		},
 	}
 
@@ -67,8 +67,6 @@ func TestDB(t *testing.T) {
 	err = s.dbStore()
 	require.NoError(t, err)
 
-	testutil.CleanupAndRequireSuccess(t, func() (err error) { return os.Remove(dbFilename) })
-
 	err = s.srv4.ResetLeases(nil)
 	require.NoError(t, err)
 
@@ -78,36 +76,13 @@ func TestDB(t *testing.T) {
 	ll := s.srv4.GetLeases(LeasesAll)
 	require.Len(t, ll, len(leases))
 
-	assert.Equal(t, leases[1].HWAddr, ll[0].HWAddr)
+	assert.Equal(t, leases[0].HWAddr, ll[0].HWAddr)
-	assert.Equal(t, leases[1].IP, ll[0].IP)
+	assert.Equal(t, leases[0].IP, ll[0].IP)
-	assert.True(t, ll[0].IsStatic())
+	assert.Equal(t, leases[0].Expiry.Unix(), ll[0].Expiry.Unix())
 
-	assert.Equal(t, leases[0].HWAddr, ll[1].HWAddr)
+	assert.Equal(t, leases[1].HWAddr, ll[1].HWAddr)
-	assert.Equal(t, leases[0].IP, ll[1].IP)
+	assert.Equal(t, leases[1].IP, ll[1].IP)
-	assert.Equal(t, leases[0].Expiry.Unix(), ll[1].Expiry.Unix())
+	assert.True(t, ll[1].IsStatic)
-}
-
-func TestNormalizeLeases(t *testing.T) {
-	dynLeases := []*Lease{{
-		HWAddr: net.HardwareAddr{1, 2, 3, 4},
-	}, {
-		HWAddr: net.HardwareAddr{1, 2, 3, 5},
-	}}
-
-	staticLeases := []*Lease{{
-		HWAddr: net.HardwareAddr{1, 2, 3, 4},
-		IP:     netip.MustParseAddr("0.2.3.4"),
-	}, {
-		HWAddr: net.HardwareAddr{2, 2, 3, 4},
-	}}
-
-	leases := normalizeLeases(staticLeases, dynLeases)
-	require.Len(t, leases, 3)
-
-	assert.Equal(t, leases[0].HWAddr, dynLeases[0].HWAddr)
-	assert.Equal(t, leases[0].IP, staticLeases[0].IP)
-	assert.Equal(t, leases[1].HWAddr, staticLeases[1].HWAddr)
-	assert.Equal(t, leases[2].HWAddr, dynLeases[1].HWAddr)
 }
 
 func TestV4Server_badRange(t *testing.T) {

internal/dhcpd/http_unix.go

@@ -9,12 +9,14 @@ import (
 	"net/http"
 	"net/netip"
 	"os"
+	"time"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/log"
+	"github.com/AdguardTeam/golibs/netutil"
 )
 
 type v4ServerConfJSON struct {
@@ -57,12 +59,77 @@ func v6JSONToServerConf(j *v6ServerConfJSON) V6ServerConf {
 
 // dhcpStatusResponse is the response for /control/dhcp/status endpoint.
 type dhcpStatusResponse struct {
-	IfaceName    string       `json:"interface_name"`
+	IfaceName    string          `json:"interface_name"`
-	V4           V4ServerConf `json:"v4"`
+	V4           V4ServerConf    `json:"v4"`
-	V6           V6ServerConf `json:"v6"`
+	V6           V6ServerConf    `json:"v6"`
-	Leases       []*Lease     `json:"leases"`
+	Leases       []*leaseDynamic `json:"leases"`
-	StaticLeases []*Lease     `json:"static_leases"`
+	StaticLeases []*leaseStatic  `json:"static_leases"`
-	Enabled      bool         `json:"enabled"`
+	Enabled      bool            `json:"enabled"`
+}
+
+// leaseStatic is the JSON form of static DHCP lease.
+type leaseStatic struct {
+	HWAddr   string     `json:"mac"`
+	IP       netip.Addr `json:"ip"`
+	Hostname string     `json:"hostname"`
+}
+
+// leasesToStatic converts list of leases to their JSON form.
+func leasesToStatic(leases []*Lease) (static []*leaseStatic) {
+	static = make([]*leaseStatic, len(leases))
+
+	for i, l := range leases {
+		static[i] = &leaseStatic{
+			HWAddr:   l.HWAddr.String(),
+			IP:       l.IP,
+			Hostname: l.Hostname,
+		}
+	}
+
+	return static
+}
+
+// toLease converts leaseStatic to Lease or returns error.
+func (l *leaseStatic) toLease() (lease *Lease, err error) {
+	addr, err := net.ParseMAC(l.HWAddr)
+	if err != nil {
+		return nil, fmt.Errorf("couldn't parse MAC address: %w", err)
+	}
+
+	return &Lease{
+		HWAddr:   addr,
+		IP:       l.IP,
+		Hostname: l.Hostname,
+		IsStatic: true,
+	}, nil
+}
+
+// leaseDynamic is the JSON form of dynamic DHCP lease.
+type leaseDynamic struct {
+	HWAddr   string     `json:"mac"`
+	IP       netip.Addr `json:"ip"`
+	Hostname string     `json:"hostname"`
+	Expiry   string     `json:"expires"`
+}
+
+// leasesToDynamic converts list of leases to their JSON form.
+func leasesToDynamic(leases []*Lease) (dynamic []*leaseDynamic) {
+	dynamic = make([]*leaseDynamic, len(leases))
+
+	for i, l := range leases {
+		dynamic[i] = &leaseDynamic{
+			HWAddr:   l.HWAddr.String(),
+			IP:       l.IP,
+			Hostname: l.Hostname,
+			// The front-end is waiting for RFC 3999 format of the time
+			// value.
+			//
+			// See https://github.com/AdguardTeam/AdGuardHome/issues/2692.
+			Expiry: l.Expiry.Format(time.RFC3339),
+		}
+	}
+
+	return dynamic
 }
 
 func (s *server) handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
@@ -76,8 +143,8 @@ func (s *server) handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
 	s.srv4.WriteDiskConfig4(&status.V4)
 	s.srv6.WriteDiskConfig6(&status.V6)
 
-	status.Leases = s.Leases(LeasesDynamic)
+	status.Leases = leasesToDynamic(s.Leases(LeasesDynamic))
-	status.StaticLeases = s.Leases(LeasesStatic)
+	status.StaticLeases = leasesToStatic(s.Leases(LeasesStatic))
 
 	_ = aghhttp.WriteJSONResponse(w, r, status)
 }
@@ -197,6 +264,28 @@ func (s *server) handleDHCPSetConfigV6(
 	return srv6, enabled, err
 }
 
+// createServers returns DHCPv4 and DHCPv6 servers created from the provided
+// configuration conf.
+func (s *server) createServers(conf *dhcpServerConfigJSON) (srv4, srv6 DHCPServer, err error) {
+	srv4, v4Enabled, err := s.handleDHCPSetConfigV4(conf)
+	if err != nil {
+		return nil, nil, fmt.Errorf("bad dhcpv4 configuration: %s", err)
+	}
+
+	srv6, v6Enabled, err := s.handleDHCPSetConfigV6(conf)
+	if err != nil {
+		return nil, nil, fmt.Errorf("bad dhcpv6 configuration: %s", err)
+	}
+
+	if conf.Enabled == aghalg.NBTrue && !v4Enabled && !v6Enabled {
+		return nil, nil, fmt.Errorf("dhcpv4 or dhcpv6 configuration must be complete")
+	}
+
+	return srv4, srv6, nil
+}
+
+// handleDHCPSetConfig is the handler for the POST /control/dhcp/set_config
+// HTTP API.
 func (s *server) handleDHCPSetConfig(w http.ResponseWriter, r *http.Request) {
 	conf := &dhcpServerConfigJSON{}
 	conf.Enabled = aghalg.BoolToNullBool(s.conf.Enabled)
@@ -209,22 +298,9 @@ func (s *server) handleDHCPSetConfig(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	srv4, v4Enabled, err := s.handleDHCPSetConfigV4(conf)
+	srv4, srv6, err := s.createServers(conf)
 	if err != nil {
-		aghhttp.Error(r, w, http.StatusBadRequest, "bad dhcpv4 configuration: %s", err)
+		aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
-
-		return
-	}
-
-	srv6, v6Enabled, err := s.handleDHCPSetConfigV6(conf)
-	if err != nil {
-		aghhttp.Error(r, w, http.StatusBadRequest, "bad dhcpv6 configuration: %s", err)
-
-		return
-	}
-
-	if conf.Enabled == aghalg.NBTrue && !v4Enabled && !v6Enabled {
-		aghhttp.Error(r, w, http.StatusBadRequest, "dhcpv4 or dhcpv6 configuration must be complete")
 
 		return
 	}
@@ -284,8 +360,10 @@ type netInterfaceJSON struct {
 	Addrs6       []netip.Addr `json:"ipv6_addresses"`
 }
 
+// handleDHCPInterfaces is the handler for the GET /control/dhcp/interfaces
+// HTTP API.
 func (s *server) handleDHCPInterfaces(w http.ResponseWriter, r *http.Request) {
-	response := map[string]netInterfaceJSON{}
+	resp := map[string]*netInterfaceJSON{}
 
 	ifaces, err := net.Interfaces()
 	if err != nil {
@@ -296,82 +374,86 @@ func (s *server) handleDHCPInterfaces(w http.ResponseWriter, r *http.Request) {
 
 	for _, iface := range ifaces {
 		if iface.Flags&net.FlagLoopback != 0 {
-			// it's a loopback, skip it
+			// It's a loopback, skip it.
-			continue
-		}
-		if iface.Flags&net.FlagBroadcast == 0 {
-			// this interface doesn't support broadcast, skip it
 			continue
 		}
 
-		var addrs []net.Addr
+		if iface.Flags&net.FlagBroadcast == 0 {
-		addrs, err = iface.Addrs()
+			// This interface doesn't support broadcast, skip it.
-		if err != nil {
+			continue
-			aghhttp.Error(
+		}
-				r,
+
-				w,
+		jsonIface, iErr := newNetInterfaceJSON(iface)
-				http.StatusInternalServerError,
+		if iErr != nil {
-				"Failed to get addresses for interface %s: %s",
+			aghhttp.Error(r, w, http.StatusInternalServerError, "%s", iErr)
-				iface.Name,
-				err,
-			)
 
 			return
 		}
 
-		jsonIface := netInterfaceJSON{
+		if jsonIface != nil {
-			Name:         iface.Name,
+			resp[iface.Name] = jsonIface
-			HardwareAddr: iface.HardwareAddr.String(),
-		}
-
-		if iface.Flags != 0 {
-			jsonIface.Flags = iface.Flags.String()
-		}
-		// we don't want link-local addresses in json, so skip them
-		for _, addr := range addrs {
-			ipnet, ok := addr.(*net.IPNet)
-			if !ok {
-				// not an IPNet, should not happen
-				aghhttp.Error(
-					r,
-					w,
-					http.StatusInternalServerError,
-					"got iface.Addrs() element %[1]s that is not net.IPNet, it is %[1]T",
-					addr)
-
-				return
-			}
-			// ignore link-local
-			//
-			// TODO(e.burkov):  Try to listen DHCP on LLA as well.
-			if ipnet.IP.IsLinkLocalUnicast() {
-				continue
-			}
-
-			if ip4 := ipnet.IP.To4(); ip4 != nil {
-				addr := netip.AddrFrom4(*(*[4]byte)(ip4))
-				jsonIface.Addrs4 = append(jsonIface.Addrs4, addr)
-			} else {
-				addr := netip.AddrFrom16(*(*[16]byte)(ipnet.IP))
-				jsonIface.Addrs6 = append(jsonIface.Addrs6, addr)
-			}
-		}
-		if len(jsonIface.Addrs4)+len(jsonIface.Addrs6) != 0 {
-			jsonIface.GatewayIP = aghnet.GatewayIP(iface.Name)
-			response[iface.Name] = jsonIface
 		}
 	}
 
-	err = json.NewEncoder(w).Encode(response)
+	_ = aghhttp.WriteJSONResponse(w, r, resp)
+}
+
+// newNetInterfaceJSON creates a JSON object from a [net.Interface] iface.
+func newNetInterfaceJSON(iface net.Interface) (out *netInterfaceJSON, err error) {
+	addrs, err := iface.Addrs()
 	if err != nil {
-		aghhttp.Error(
+		return nil, fmt.Errorf(
-			r,
+			"failed to get addresses for interface %s: %s",
-			w,
+			iface.Name,
-			http.StatusInternalServerError,
-			"Failed to marshal json with available interfaces: %s",
 			err,
 		)
 	}
+
+	out = &netInterfaceJSON{
+		Name:         iface.Name,
+		HardwareAddr: iface.HardwareAddr.String(),
+	}
+
+	if iface.Flags != 0 {
+		out.Flags = iface.Flags.String()
+	}
+
+	// We don't want link-local addresses in JSON, so skip them.
+	for _, addr := range addrs {
+		ipNet, ok := addr.(*net.IPNet)
+		if !ok {
+			// Not an IPNet, should not happen.
+			return nil, fmt.Errorf("got iface.Addrs() element %[1]s that is not"+
+				" net.IPNet, it is %[1]T", addr)
+		}
+
+		// Ignore link-local.
+		//
+		// TODO(e.burkov):  Try to listen DHCP on LLA as well.
+		if ipNet.IP.IsLinkLocalUnicast() {
+			continue
+		}
+
+		vAddr, iErr := netutil.IPToAddrNoMapped(ipNet.IP)
+		if iErr != nil {
+			// Not an IPNet, should not happen.
+			return nil, fmt.Errorf("failed to convert IP address %[1]s: %w", addr, iErr)
+		}
+
+		if vAddr.Is4() {
+			out.Addrs4 = append(out.Addrs4, vAddr)
+		} else {
+			out.Addrs6 = append(out.Addrs6, vAddr)
+		}
+	}
+
+	if len(out.Addrs4)+len(out.Addrs6) == 0 {
+		return nil, nil
+	}
+
+	out.GatewayIP = aghnet.GatewayIP(iface.Name)
+
+	return out, nil
 }
 
 // dhcpSearchOtherResult contains information about other DHCP server for
@@ -488,7 +570,7 @@ func setOtherDHCPResult(ifaceName string, result *dhcpSearchResult) {
 }
 
 func (s *server) handleDHCPAddStaticLease(w http.ResponseWriter, r *http.Request) {
-	l := &Lease{}
+	l := &leaseStatic{}
 	err := json.NewDecoder(r.Body).Decode(l)
 	if err != nil {
 		aghhttp.Error(r, w, http.StatusBadRequest, "json.Decode: %s", err)
@@ -511,7 +593,14 @@ func (s *server) handleDHCPAddStaticLease(w http.ResponseWriter, r *http.Request
 		srv = s.srv6
 	}
 
-	err = srv.AddStaticLease(l)
+	lease, err := l.toLease()
+	if err != nil {
+		aghhttp.Error(r, w, http.StatusBadRequest, "parsing: %s", err)
+
+		return
+	}
+
+	err = srv.AddStaticLease(lease)
 	if err != nil {
 		aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
 
@@ -520,7 +609,7 @@ func (s *server) handleDHCPAddStaticLease(w http.ResponseWriter, r *http.Request
 }
 
 func (s *server) handleDHCPRemoveStaticLease(w http.ResponseWriter, r *http.Request) {
-	l := &Lease{}
+	l := &leaseStatic{}
 	err := json.NewDecoder(r.Body).Decode(l)
 	if err != nil {
 		aghhttp.Error(r, w, http.StatusBadRequest, "json.Decode: %s", err)
@@ -543,7 +632,14 @@ func (s *server) handleDHCPRemoveStaticLease(w http.ResponseWriter, r *http.Requ
 		srv = s.srv6
 	}
 
-	err = srv.RemoveStaticLease(l)
+	lease, err := l.toLease()
+	if err != nil {
+		aghhttp.Error(r, w, http.StatusBadRequest, "parsing: %s", err)
+
+		return
+	}
+
+	err = srv.RemoveStaticLease(lease)
 	if err != nil {
 		aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
 
@@ -559,7 +655,7 @@ func (s *server) handleReset(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err = os.Remove(s.conf.DBFilePath)
+	err = os.Remove(s.conf.dbFilePath)
 	if err != nil && !errors.Is(err, os.ErrNotExist) {
 		log.Error("dhcp: removing db: %s", err)
 	}
@@ -571,8 +667,8 @@ func (s *server) handleReset(w http.ResponseWriter, r *http.Request) {
 
 		LocalDomainName: s.conf.LocalDomainName,
 
-		WorkDir:    s.conf.WorkDir,
+		DataDir:    s.conf.DataDir,
-		DBFilePath: s.conf.DBFilePath,
+		dbFilePath: s.conf.dbFilePath,
 	}
 
 	v4conf := &V4ServerConf{

internal/dhcpd/http_unix_test.go

@@ -5,35 +5,33 @@ package dhcpd
 import (
 	"bytes"
 	"encoding/json"
-	"net"
 	"net/http"
 	"net/http/httptest"
 	"net/netip"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestServer_handleDHCPStatus(t *testing.T) {
-	const staticName = "static-client"
+	const (
+		staticName = "static-client"
+		staticMAC  = "aa:aa:aa:aa:aa:aa"
+	)
 
 	staticIP := netip.MustParseAddr("192.168.10.10")
-	staticMAC := net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}
 
-	staticLease := &Lease{
+	staticLease := &leaseStatic{
-		Expiry:   time.Unix(leaseExpireStatic, 0),
-		Hostname: staticName,
 		HWAddr:   staticMAC,
 		IP:       staticIP,
+		Hostname: staticName,
 	}
 
 	s, err := Create(&ServerConfig{
 		Enabled:        true,
 		Conf4:          *defaultV4ServerConf(),
-		WorkDir:        t.TempDir(),
+		DataDir:        t.TempDir(),
-		DBFilePath:     dbFilename,
 		ConfigModified: func() {},
 	})
 	require.NoError(t, err)
@@ -65,8 +63,8 @@ func TestServer_handleDHCPStatus(t *testing.T) {
 		resp := &dhcpStatusResponse{
 			V4:           *conf4,
 			V6:           V6ServerConf{},
-			Leases:       []*Lease{},
+			Leases:       []*leaseDynamic{},
-			StaticLeases: []*Lease{},
+			StaticLeases: []*leaseStatic{},
 			Enabled:      true,
 		}
 
@@ -95,7 +93,7 @@ func TestServer_handleDHCPStatus(t *testing.T) {
 		assert.Equal(t, http.StatusOK, w.Code)
 
 		resp := defaultResponse()
-		resp.StaticLeases = []*Lease{staticLease}
+		resp.StaticLeases = []*leaseStatic{staticLease}
 
 		checkStatus(t, resp)
 	})
@@ -106,7 +104,7 @@ func TestServer_handleDHCPStatus(t *testing.T) {
 
 		b := &bytes.Buffer{}
 
-		err = json.NewEncoder(b).Encode(&Lease{})
+		err = json.NewEncoder(b).Encode(&leaseStatic{})
 		require.NoError(t, err)
 
 		var r *http.Request

internal/dhcpd/migrate.go

@@ -0,0 +1,106 @@
+package dhcpd
+
+import (
+	"encoding/json"
+	"net"
+	"net/netip"
+	"os"
+	"path/filepath"
+	"time"
+
+	"github.com/AdguardTeam/golibs/errors"
+	"github.com/AdguardTeam/golibs/log"
+)
+
+const (
+	// leaseExpireStatic is used to define the Expiry field for static
+	// leases.
+	//
+	// Deprecated:  Remove it when migration of DHCP leases will be not needed.
+	leaseExpireStatic = 1
+
+	// dbFilename contains saved leases.
+	//
+	// Deprecated:  Use dataFilename.
+	dbFilename = "leases.db"
+)
+
+// leaseJSON is the structure of stored lease.
+//
+// Deprecated:  Use [Lease].
+type leaseJSON struct {
+	HWAddr   []byte `json:"mac"`
+	IP       []byte `json:"ip"`
+	Hostname string `json:"host"`
+	Expiry   int64  `json:"exp"`
+}
+
+func normalizeIP(ip net.IP) net.IP {
+	ip4 := ip.To4()
+	if ip4 != nil {
+		return ip4
+	}
+
+	return ip
+}
+
+// migrateDB migrates stored leases if necessary.
+func migrateDB(conf *ServerConfig) (err error) {
+	defer func() { err = errors.Annotate(err, "migrating db: %w") }()
+
+	oldLeasesPath := filepath.Join(conf.WorkDir, dbFilename)
+	dataDirPath := filepath.Join(conf.DataDir, dataFilename)
+
+	file, err := os.Open(oldLeasesPath)
+	if errors.Is(err, os.ErrNotExist) {
+		// Nothing to migrate.
+		return nil
+	} else if err != nil {
+		// Don't wrap the error since it's informative enough as is.
+		return err
+	}
+
+	ljs := []leaseJSON{}
+	err = json.NewDecoder(file).Decode(&ljs)
+	if err != nil {
+		// Don't wrap the error since it's informative enough as is.
+		return err
+	}
+
+	err = file.Close()
+	if err != nil {
+		// Don't wrap the error since it's informative enough as is.
+		return err
+	}
+
+	leases := []*Lease{}
+
+	for _, lj := range ljs {
+		lj.IP = normalizeIP(lj.IP)
+
+		ip, ok := netip.AddrFromSlice(lj.IP)
+		if !ok {
+			log.Info("dhcp: invalid IP: %s", lj.IP)
+
+			continue
+		}
+
+		lease := &Lease{
+			Expiry:   time.Unix(lj.Expiry, 0),
+			Hostname: lj.Hostname,
+			HWAddr:   lj.HWAddr,
+			IP:       ip,
+			IsStatic: lj.Expiry == leaseExpireStatic,
+		}
+
+		leases = append(leases, lease)
+	}
+
+	err = writeDB(dataDirPath, leases)
+	if err != nil {
+		// Don't wrap the error since it's informative enough as is.
+		return err
+	}
+
+	return os.Remove(oldLeasesPath)
+}

internal/dhcpd/migrate_internal_test.go

@@ -0,0 +1,73 @@
+package dhcpd
+
+import (
+	"encoding/json"
+	"net"
+	"net/netip"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+const testData = `[
+{"mac":"ESIzRFVm","ip":"AQIDBA==","host":"test1","exp":1},
+{"mac":"ZlVEMyIR","ip":"BAMCAQ==","host":"test2","exp":1231231231}
+]`
+
+func TestMigrateDB(t *testing.T) {
+	dir := t.TempDir()
+
+	oldLeasesPath := filepath.Join(dir, dbFilename)
+	dataDirPath := filepath.Join(dir, dataFilename)
+
+	err := os.WriteFile(oldLeasesPath, []byte(testData), 0o644)
+	require.NoError(t, err)
+
+	wantLeases := []*Lease{{
+		Expiry:   time.Time{},
+		Hostname: "test1",
+		HWAddr:   net.HardwareAddr{0x11, 0x22, 0x33, 0x44, 0x55, 0x66},
+		IP:       netip.MustParseAddr("1.2.3.4"),
+		IsStatic: true,
+	}, {
+		Expiry:   time.Unix(1231231231, 0),
+		Hostname: "test2",
+		HWAddr:   net.HardwareAddr{0x66, 0x55, 0x44, 0x33, 0x22, 0x11},
+		IP:       netip.MustParseAddr("4.3.2.1"),
+		IsStatic: false,
+	}}
+
+	conf := &ServerConfig{
+		WorkDir: dir,
+		DataDir: dir,
+	}
+
+	err = migrateDB(conf)
+	require.NoError(t, err)
+
+	_, err = os.Stat(oldLeasesPath)
+	require.ErrorIs(t, err, os.ErrNotExist)
+
+	var data []byte
+	data, err = os.ReadFile(dataDirPath)
+	require.NoError(t, err)
+
+	dl := &dataLeases{}
+	err = json.Unmarshal(data, dl)
+	require.NoError(t, err)
+
+	leases := dl.Leases
+
+	for i, wl := range wantLeases {
+		assert.Equal(t, wl.Hostname, leases[i].Hostname)
+		assert.Equal(t, wl.HWAddr, leases[i].HWAddr)
+		assert.Equal(t, wl.IP, leases[i].IP)
+		assert.Equal(t, wl.IsStatic, leases[i].IsStatic)
+
+		require.True(t, wl.Expiry.Equal(leases[i].Expiry))
+	}
+}

internal/dhcpd/routeradv.go

@@ -7,6 +7,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/netutil"
 	"golang.org/x/net/icmp"
@@ -195,7 +196,7 @@ func createICMPv6RAPacket(params icmpv6RA) (data []byte, err error) {
 	return data, nil
 }
 
-// Init - initialize RA module
+// Init initializes RA module.
 func (ra *raCtx) Init() (err error) {
 	ra.stop.Store(0)
 	ra.conn = nil
@@ -203,8 +204,7 @@ func (ra *raCtx) Init() (err error) {
 		return nil
 	}
 
-	log.Debug("dhcpv6 ra: source IP address: %s  DNS IP address: %s",
+	log.Debug("dhcpv6 ra: source IP address: %s  DNS IP address: %s", ra.ipAddr, ra.dnsIPAddr)
-		ra.ipAddr, ra.dnsIPAddr)
 
 	params := icmpv6RA{
 		managedAddressConfiguration: !ra.raSLAACOnly,
@@ -223,18 +223,15 @@ func (ra *raCtx) Init() (err error) {
 		return fmt.Errorf("creating packet: %w", err)
 	}
 
-	success := false
 	ipAndScope := ra.ipAddr.String() + "%" + ra.ifaceName
 	ra.conn, err = icmp.ListenPacket("ip6:ipv6-icmp", ipAndScope)
 	if err != nil {
 		return fmt.Errorf("dhcpv6 ra: icmp.ListenPacket: %w", err)
 	}
+
 	defer func() {
-		if !success {
+		if err != nil {
-			derr := ra.Close()
+			err = errors.WithDeferred(err, ra.Close())
-			if derr != nil {
-				log.Error("closing context: %s", derr)
-			}
 		}
 	}()
 
@@ -269,7 +266,6 @@ func (ra *raCtx) Init() (err error) {
 		log.Debug("dhcpv6 ra: loop exit")
 	}()
 
-	success = true
 	return nil
 }
 

internal/dhcpd/v4_unix.go

@@ -20,7 +20,6 @@ import (
 	"github.com/go-ping/ping"
 	"github.com/insomniacslk/dhcp/dhcpv4"
 	"github.com/insomniacslk/dhcp/dhcpv4/server4"
-	"github.com/mdlayher/packet"
 	"golang.org/x/exp/slices"
 )
 
@@ -128,7 +127,7 @@ func (s *v4Server) ResetLeases(leases []*Lease) (err error) {
 	s.leases = nil
 
 	for _, l := range leases {
-		if !l.IsStatic() {
+		if !l.IsStatic {
 			l.Hostname = s.validHostnameForClient(l.Hostname, l.IP)
 		}
 		err = s.addLease(l)
@@ -190,7 +189,7 @@ func (s *v4Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) {
 			continue
 		}
 
-		if getStatic && l.IsStatic() {
+		if getStatic && l.IsStatic {
 			leases = append(leases, l.Clone())
 		}
 	}
@@ -211,7 +210,7 @@ func (s *v4Server) FindMACbyIP(ip netip.Addr) (mac net.HardwareAddr) {
 
 	for _, l := range s.leases {
 		if l.IP == ip {
-			if l.Expiry.After(now) || l.IsStatic() {
+			if l.IsStatic || l.Expiry.After(now) {
 				return l.HWAddr
 			}
 		}
@@ -257,9 +256,11 @@ func (s *v4Server) rmLeaseByIndex(i int) {
 
 // Remove a dynamic lease with the same properties
 // Return error if a static lease is found
+//
+// TODO(s.chzhen):  Refactor the code.
 func (s *v4Server) rmDynamicLease(lease *Lease) (err error) {
 	for i, l := range s.leases {
-		isStatic := l.IsStatic()
+		isStatic := l.IsStatic
 
 		if bytes.Equal(l.HWAddr, lease.HWAddr) || l.IP == lease.IP {
 			if isStatic {
@@ -292,7 +293,7 @@ func (s *v4Server) addLease(l *Lease) (err error) {
 	leaseIP := net.IP(l.IP.AsSlice())
 	offset, inOffset := r.offset(leaseIP)
 
-	if l.IsStatic() {
+	if l.IsStatic {
 		// TODO(a.garipov, d.seregin): Subnet can be nil when dhcp server is
 		// disabled.
 		if sn := s.conf.subnet; !sn.Contains(l.IP) {
@@ -341,8 +342,8 @@ func (s *v4Server) rmLease(lease *Lease) (err error) {
 // server to be configured and it's not.
 const ErrUnconfigured errors.Error = "server is unconfigured"
 
-// AddStaticLease implements the DHCPServer interface for *v4Server.  It is safe
+// AddStaticLease implements the DHCPServer interface for *v4Server.  It is
-// for concurrent use.
+// safe for concurrent use.
 func (s *v4Server) AddStaticLease(l *Lease) (err error) {
 	defer func() { err = errors.Annotate(err, "dhcpv4: adding static lease: %w") }()
 
@@ -353,21 +354,23 @@ func (s *v4Server) AddStaticLease(l *Lease) (err error) {
 	l.IP = l.IP.Unmap()
 
 	if !l.IP.Is4() {
-		return fmt.Errorf("invalid ip %q, only ipv4 is supported", l.IP)
+		return fmt.Errorf("invalid IP %q: only IPv4 is supported", l.IP)
 	} else if gwIP := s.conf.GatewayIP; gwIP == l.IP {
-		return fmt.Errorf("can't assign the gateway IP %s to the lease", gwIP)
+		return fmt.Errorf("can't assign the gateway IP %q to the lease", gwIP)
 	}
 
-	l.Expiry = time.Unix(leaseExpireStatic, 0)
+	l.IsStatic = true
 
 	err = netutil.ValidateMAC(l.HWAddr)
 	if err != nil {
+		// Don't wrap the error, because it's informative enough as is.
 		return err
 	}
 
 	if hostname := l.Hostname; hostname != "" {
 		hostname, err = normalizeHostname(hostname)
 		if err != nil {
+			// Don't wrap the error, because it's informative enough as is.
 			return err
 		}
 
@@ -385,32 +388,9 @@ func (s *v4Server) AddStaticLease(l *Lease) (err error) {
 		l.Hostname = hostname
 	}
 
-	// Perform the following actions in an anonymous function to make sure
+	err = s.updateStaticLease(l)
-	// that the lock gets unlocked before the notification step.
-	func() {
-		s.leasesLock.Lock()
-		defer s.leasesLock.Unlock()
-
-		err = s.rmDynamicLease(l)
-		if err != nil {
-			err = fmt.Errorf(
-				"removing dynamic leases for %s (%s): %w",
-				l.IP,
-				l.HWAddr,
-				err,
-			)
-
-			return
-		}
-
-		err = s.addLease(l)
-		if err != nil {
-			err = fmt.Errorf("adding static lease for %s (%s): %w", l.IP, l.HWAddr, err)
-
-			return
-		}
-	}()
 	if err != nil {
+		// Don't wrap the error, because it's informative enough as is.
 		return err
 	}
 
@@ -420,6 +400,25 @@ func (s *v4Server) AddStaticLease(l *Lease) (err error) {
 	return nil
 }
 
+// updateStaticLease safe removes dynamic lease with the same properties and
+// then adds a static lease l.
+func (s *v4Server) updateStaticLease(l *Lease) (err error) {
+	s.leasesLock.Lock()
+	defer s.leasesLock.Unlock()
+
+	err = s.rmDynamicLease(l)
+	if err != nil {
+		return fmt.Errorf("removing dynamic leases for %s (%s): %w", l.IP, l.HWAddr, err)
+	}
+
+	err = s.addLease(l)
+	if err != nil {
+		return fmt.Errorf("adding static lease for %s (%s): %w", l.IP, l.HWAddr, err)
+	}
+
+	return nil
+}
+
 // RemoveStaticLease removes a static lease.  It is safe for concurrent use.
 func (s *v4Server) RemoveStaticLease(l *Lease) (err error) {
 	defer func() { err = errors.Annotate(err, "dhcpv4: %w") }()
@@ -528,7 +527,7 @@ func (s *v4Server) nextIP() (ip net.IP) {
 func (s *v4Server) findExpiredLease() int {
 	now := time.Now()
 	for i, lease := range s.leases {
-		if !lease.IsStatic() && lease.Expiry.Before(now) {
+		if !lease.IsStatic && lease.Expiry.Before(now) {
 			return i
 		}
 	}
@@ -860,7 +859,7 @@ func (s *v4Server) handleRequest(req, resp *dhcpv4.DHCPv4) (lease *Lease, needsR
 	s.leasesLock.Lock()
 	defer s.leasesLock.Unlock()
 
-	if lease.IsStatic() {
+	if lease.IsStatic {
 		if lease.Hostname != "" {
 			// TODO(e.burkov):  This option is used to update the server's DNS
 			// mapping.  The option should only be answered when it has been
@@ -893,24 +892,9 @@ func (s *v4Server) handleDecline(req, resp *dhcpv4.DHCPv4) (err error) {
 		reqIP = req.ClientIPAddr
 	}
 
-	netIP, ok := netip.AddrFromSlice(reqIP)
+	oldLease := s.findLeaseForIP(reqIP, mac)
-	if !ok {
-		log.Info("dhcpv4: invalid IP: %s", reqIP)
-
-		return nil
-	}
-
-	var oldLease *Lease
-	for _, l := range s.leases {
-		if bytes.Equal(l.HWAddr, mac) && l.IP == netIP {
-			oldLease = l
-
-			break
-		}
-	}
-
 	if oldLease == nil {
-		log.Info("dhcpv4: lease with ip %s for %s not found", reqIP, mac)
+		log.Info("dhcpv4: lease with IP %s for %s not found", reqIP, mac)
 
 		return nil
 	}
@@ -924,7 +908,7 @@ func (s *v4Server) handleDecline(req, resp *dhcpv4.DHCPv4) (err error) {
 	if err != nil {
 		return fmt.Errorf("allocating new lease for %s: %w", mac, err)
 	} else if newLease == nil {
-		log.Info("dhcpv4: allocating new lease for %s: no more ip addresses", mac)
+		log.Info("dhcpv4: allocating new lease for %s: no more IP addresses", mac)
 
 		resp.YourIPAddr = make([]byte, 4)
 		resp.UpdateOption(dhcpv4.OptMessageType(dhcpv4.MessageTypeAck))
@@ -940,15 +924,32 @@ func (s *v4Server) handleDecline(req, resp *dhcpv4.DHCPv4) (err error) {
 		return fmt.Errorf("adding new lease for %s: %w", mac, err)
 	}
 
-	log.Info("dhcpv4: changed ip from %s to %s for %s", reqIP, newLease.IP, mac)
+	log.Info("dhcpv4: changed IP from %s to %s for %s", reqIP, newLease.IP, mac)
-
-	resp.YourIPAddr = net.IP(newLease.IP.AsSlice())
 
+	resp.YourIPAddr = newLease.IP.AsSlice()
 	resp.UpdateOption(dhcpv4.OptMessageType(dhcpv4.MessageTypeAck))
 
 	return nil
 }
 
+// findLeaseForIP returns a lease for provided ip and mac.
+func (s *v4Server) findLeaseForIP(ip net.IP, mac net.HardwareAddr) (l *Lease) {
+	netIP, ok := netip.AddrFromSlice(ip)
+	if !ok {
+		log.Info("dhcpv4: invalid IP: %s", ip)
+
+		return nil
+	}
+
+	for _, il := range s.leases {
+		if bytes.Equal(il.HWAddr, mac) && il.IP == netIP {
+			return il
+		}
+	}
+
+	return nil
+}
+
 // handleRelease is the handler for the DHCP Release request.
 func (s *v4Server) handleRelease(req, resp *dhcpv4.DHCPv4) (err error) {
 	mac := req.ClientHWAddr
@@ -994,11 +995,80 @@ func (s *v4Server) handleRelease(req, resp *dhcpv4.DHCPv4) (err error) {
 	return nil
 }
 
-// Find a lease associated with MAC and prepare response
+// messageHandler describes a DHCPv4 message handler function.
-// Return 1: OK
+type messageHandler func(s *v4Server, req, resp *dhcpv4.DHCPv4) (rCode int, l *Lease, err error)
-// Return 0: error; reply with Nak
+
-// Return -1: error; don't reply
+// messageHandlers is a map of handlers for various messages with message types
-func (s *v4Server) handle(req, resp *dhcpv4.DHCPv4) int {
+// keys.
+var messageHandlers = map[dhcpv4.MessageType]messageHandler{
+	dhcpv4.MessageTypeDiscover: func(
+		s *v4Server,
+		req *dhcpv4.DHCPv4,
+		resp *dhcpv4.DHCPv4,
+	) (rCode int, l *Lease, err error) {
+		l, err = s.handleDiscover(req, resp)
+		if err != nil {
+			return 0, nil, fmt.Errorf("handling discover: %s", err)
+		}
+
+		if l == nil {
+			return 0, nil, nil
+		}
+
+		return 1, l, nil
+	},
+	dhcpv4.MessageTypeRequest: func(
+		s *v4Server,
+		req *dhcpv4.DHCPv4,
+		resp *dhcpv4.DHCPv4,
+	) (rCode int, l *Lease, err error) {
+		var toReply bool
+		l, toReply = s.handleRequest(req, resp)
+		if l == nil {
+			if toReply {
+				return 0, nil, nil
+			}
+
+			// Drop the packet.
+			return -1, nil, nil
+		}
+
+		return 1, l, nil
+	},
+	dhcpv4.MessageTypeDecline: func(
+		s *v4Server,
+		req *dhcpv4.DHCPv4,
+		resp *dhcpv4.DHCPv4,
+	) (rCode int, l *Lease, err error) {
+		err = s.handleDecline(req, resp)
+		if err != nil {
+			return 0, nil, fmt.Errorf("handling decline: %s", err)
+		}
+
+		return 1, nil, nil
+	},
+	dhcpv4.MessageTypeRelease: func(
+		s *v4Server,
+		req *dhcpv4.DHCPv4,
+		resp *dhcpv4.DHCPv4,
+	) (rCode int, l *Lease, err error) {
+		err = s.handleRelease(req, resp)
+		if err != nil {
+			return 0, nil, fmt.Errorf("handling release: %s", err)
+		}
+
+		return 1, nil, nil
+	},
+}
+
+// handle processes request, it finds a lease associated with MAC address and
+// prepares response.
+//
+// Possible return values are:
+//   - "1": OK,
+//   - "0": error, reply with Nak,
+//   - "-1": error, don't reply.
+func (s *v4Server) handle(req, resp *dhcpv4.DHCPv4) (rCode int) {
 	var err error
 
 	// Include server's identifier option since any reply should contain it.
@@ -1006,47 +1076,26 @@ func (s *v4Server) handle(req, resp *dhcpv4.DHCPv4) int {
 	// See https://datatracker.ietf.org/doc/html/rfc2131#page-29.
 	resp.UpdateOption(dhcpv4.OptServerIdentifier(s.conf.dnsIPAddrs[0].AsSlice()))
 
-	// TODO(a.garipov): Refactor this into handlers.
+	handler := messageHandlers[req.MessageType()]
-	var l *Lease
+	if handler == nil {
-	switch mt := req.MessageType(); mt {
+		s.updateOptions(req, resp)
-	case dhcpv4.MessageTypeDiscover:
-		l, err = s.handleDiscover(req, resp)
-		if err != nil {
-			log.Error("dhcpv4: handling discover: %s", err)
 
-			return 0
+		return 1
-		}
+	}
 
-		if l == nil {
+	rCode, l, err := handler(s, req, resp)
-			return 0
+	if err != nil {
-		}
+		log.Error("dhcpv4: %s", err)
-	case dhcpv4.MessageTypeRequest:
-		var toReply bool
-		l, toReply = s.handleRequest(req, resp)
-		if l == nil {
-			if toReply {
-				return 0
-			}
-			return -1 // drop packet
-		}
-	case dhcpv4.MessageTypeDecline:
-		err = s.handleDecline(req, resp)
-		if err != nil {
-			log.Error("dhcpv4: handling decline: %s", err)
 
-			return 0
+		return 0
-		}
+	}
-	case dhcpv4.MessageTypeRelease:
-		err = s.handleRelease(req, resp)
-		if err != nil {
-			log.Error("dhcpv4: handling release: %s", err)
 
-			return 0
+	if rCode != 1 {
-		}
+		return rCode
 	}
 
 	if l != nil {
-		resp.YourIPAddr = net.IP(l.IP.AsSlice())
+		resp.YourIPAddr = l.IP.AsSlice()
 	}
 
 	s.updateOptions(req, resp)
@@ -1131,56 +1180,6 @@ func (s *v4Server) packetHandler(conn net.PacketConn, peer net.Addr, req *dhcpv4
 	s.send(peer, conn, req, resp)
 }
 
-// send writes resp for peer to conn considering the req's parameters according
-// to RFC-2131.
-//
-// See https://datatracker.ietf.org/doc/html/rfc2131#section-4.1.
-func (s *v4Server) send(peer net.Addr, conn net.PacketConn, req, resp *dhcpv4.DHCPv4) {
-	switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
-	case giaddr != nil && !giaddr.IsUnspecified():
-		// Send any return messages to the server port on the BOOTP
-		// relay agent whose address appears in giaddr.
-		peer = &net.UDPAddr{
-			IP:   giaddr,
-			Port: dhcpv4.ServerPort,
-		}
-		if mtype == dhcpv4.MessageTypeNak {
-			// Set the broadcast bit in the DHCPNAK, so that the relay agent
-			// broadcasts it to the client, because the client may not have
-			// a correct network address or subnet mask, and the client may not
-			// be answering ARP requests.
-			resp.SetBroadcast()
-		}
-	case mtype == dhcpv4.MessageTypeNak:
-		// Broadcast any DHCPNAK messages to 0xffffffff.
-	case ciaddr != nil && !ciaddr.IsUnspecified():
-		// Unicast DHCPOFFER and DHCPACK messages to the address in
-		// ciaddr.
-		peer = &net.UDPAddr{
-			IP:   ciaddr,
-			Port: dhcpv4.ClientPort,
-		}
-	case !req.IsBroadcast() && req.ClientHWAddr != nil:
-		// Unicast DHCPOFFER and DHCPACK messages to the client's
-		// hardware address and yiaddr.
-		peer = &dhcpUnicastAddr{
-			Addr:   packet.Addr{HardwareAddr: req.ClientHWAddr},
-			yiaddr: resp.YourIPAddr,
-		}
-	default:
-		// Go on since peer is already set to broadcast.
-	}
-
-	pktData := resp.ToBytes()
-
-	log.Debug("dhcpv4: sending %d bytes to %s: %s", len(pktData), peer, resp.Summary())
-
-	_, err := conn.WriteTo(pktData, peer)
-	if err != nil {
-		log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
-	}
-}
-
 // Start starts the IPv4 DHCP server.
 func (s *v4Server) Start() (err error) {
 	defer func() { err = errors.Annotate(err, "dhcpv4: %w") }()
@@ -1211,23 +1210,8 @@ func (s *v4Server) Start() (err error) {
 		// No available IP addresses which may appear later.
 		return nil
 	}
-	// Update the value of Domain Name Server option separately from others if
-	// not assigned yet since its value is available only at server's start.
-	//
-	// TODO(e.burkov):  Initialize as implicit option with the rest of default
-	// options when it will be possible to do before the call to Start.
-	if !s.explicitOpts.Has(dhcpv4.OptionDomainNameServer) {
-		s.implicitOpts.Update(dhcpv4.OptDNS(dnsIPAddrs...))
-	}
 
-	for _, ip := range dnsIPAddrs {
+	s.configureDNSIPAddrs(dnsIPAddrs)
-		ip = ip.To4()
-		if ip == nil {
-			continue
-		}
-
-		s.conf.dnsIPAddrs = append(s.conf.dnsIPAddrs, netip.AddrFrom4(*(*[4]byte)(ip)))
-	}
 
 	var c net.PacketConn
 	if c, err = s.newDHCPConn(iface); err != nil {
@@ -1248,10 +1232,10 @@ func (s *v4Server) Start() (err error) {
 	log.Info("dhcpv4: listening")
 
 	go func() {
-		if serr := s.srv.Serve(); errors.Is(serr, net.ErrClosed) {
+		if sErr := s.srv.Serve(); errors.Is(sErr, net.ErrClosed) {
 			log.Info("dhcpv4: server is closed")
-		} else if serr != nil {
+		} else if sErr != nil {
-			log.Error("dhcpv4: srv.Serve: %s", serr)
+			log.Error("dhcpv4: srv.Serve: %s", sErr)
 		}
 	}()
 
@@ -1262,6 +1246,28 @@ func (s *v4Server) Start() (err error) {
 	return nil
 }
 
+// configureDNSIPAddrs updates v4Server configuration with provided slice of
+// dns IP addresses.
+func (s *v4Server) configureDNSIPAddrs(dnsIPAddrs []net.IP) {
+	// Update the value of Domain Name Server option separately from others if
+	// not assigned yet since its value is available only at server's start.
+	//
+	// TODO(e.burkov):  Initialize as implicit option with the rest of default
+	// options when it will be possible to do before the call to Start.
+	if !s.explicitOpts.Has(dhcpv4.OptionDomainNameServer) {
+		s.implicitOpts.Update(dhcpv4.OptDNS(dnsIPAddrs...))
+	}
+
+	for _, ip := range dnsIPAddrs {
+		vAddr, err := netutil.IPToAddr(ip, netutil.AddrFamilyIPv4)
+		if err != nil {
+			continue
+		}
+
+		s.conf.dnsIPAddrs = append(s.conf.dnsIPAddrs, vAddr)
+	}
+}
+
 // Stop - stop server
 func (s *v4Server) Stop() (err error) {
 	if s.srv == nil {

internal/dhcpd/v4_unix_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/AdguardTeam/golibs/stringutil"
 	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/insomniacslk/dhcp/dhcpv4"
-	"github.com/mdlayher/packet"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -69,19 +68,19 @@ func TestV4Server_leasing(t *testing.T) {
 
 	t.Run("add_static", func(t *testing.T) {
 		err := s.AddStaticLease(&Lease{
-			Expiry:   time.Unix(leaseExpireStatic, 0),
 			Hostname: staticName,
 			HWAddr:   staticMAC,
 			IP:       staticIP,
+			IsStatic: true,
 		})
 		require.NoError(t, err)
 
 		t.Run("same_name", func(t *testing.T) {
 			err = s.AddStaticLease(&Lease{
-				Expiry:   time.Unix(leaseExpireStatic, 0),
 				Hostname: staticName,
 				HWAddr:   anotherMAC,
 				IP:       anotherIP,
+				IsStatic: true,
 			})
 			assert.ErrorIs(t, err, ErrDupHostname)
 		})
@@ -92,10 +91,10 @@ func TestV4Server_leasing(t *testing.T) {
 				" (" + staticMAC.String() + "): static lease already exists"
 
 			err = s.AddStaticLease(&Lease{
-				Expiry:   time.Unix(leaseExpireStatic, 0),
 				Hostname: anotherName,
 				HWAddr:   staticMAC,
 				IP:       anotherIP,
+				IsStatic: true,
 			})
 			testutil.AssertErrorMsg(t, wantErrMsg, err)
 		})
@@ -106,10 +105,10 @@ func TestV4Server_leasing(t *testing.T) {
 				" (" + anotherMAC.String() + "): static lease already exists"
 
 			err = s.AddStaticLease(&Lease{
-				Expiry:   time.Unix(leaseExpireStatic, 0),
 				Hostname: anotherName,
 				HWAddr:   anotherMAC,
 				IP:       staticIP,
+				IsStatic: true,
 			})
 			testutil.AssertErrorMsg(t, wantErrMsg, err)
 		})
@@ -228,7 +227,7 @@ func TestV4Server_AddRemove_static(t *testing.T) {
 		},
 		name: "with_gateway_ip",
 		wantErrMsg: "dhcpv4: adding static lease: " +
-			"can't assign the gateway IP 192.168.10.1 to the lease",
+			`can't assign the gateway IP "192.168.10.1" to the lease`,
 	}, {
 		lease: &Lease{
 			Hostname: "ip6.local",
@@ -237,7 +236,7 @@ func TestV4Server_AddRemove_static(t *testing.T) {
 		},
 		name: "ipv6",
 		wantErrMsg: `dhcpv4: adding static lease: ` +
-			`invalid ip "ffff::1", only ipv4 is supported`,
+			`invalid IP "ffff::1": only IPv4 is supported`,
 	}, {
 		lease: &Lease{
 			Hostname: "bad-mac.local",
@@ -326,7 +325,7 @@ func TestV4_AddReplace(t *testing.T) {
 	for i, l := range ls {
 		assert.Equal(t, stLeases[i].IP, l.IP)
 		assert.Equal(t, stLeases[i].HWAddr, l.HWAddr)
-		assert.True(t, l.IsStatic())
+		assert.True(t, l.IsStatic)
 	}
 }
 
@@ -767,111 +766,6 @@ func (fc *fakePacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
 	return fc.writeTo(p, addr)
 }
 
-func TestV4Server_Send(t *testing.T) {
-	s := &v4Server{}
-
-	var (
-		defaultIP = net.IP{99, 99, 99, 99}
-		knownIP   = net.IP{4, 2, 4, 2}
-		knownMAC  = net.HardwareAddr{6, 5, 4, 3, 2, 1}
-	)
-
-	defaultPeer := &net.UDPAddr{
-		IP: defaultIP,
-		// Use neither client nor server port to check it actually
-		// changed.
-		Port: dhcpv4.ClientPort + dhcpv4.ServerPort,
-	}
-	defaultResp := &dhcpv4.DHCPv4{}
-
-	testCases := []struct {
-		want net.Addr
-		req  *dhcpv4.DHCPv4
-		resp *dhcpv4.DHCPv4
-		name string
-	}{{
-		name: "giaddr",
-		req:  &dhcpv4.DHCPv4{GatewayIPAddr: knownIP},
-		resp: defaultResp,
-		want: &net.UDPAddr{
-			IP:   knownIP,
-			Port: dhcpv4.ServerPort,
-		},
-	}, {
-		name: "nak",
-		req:  &dhcpv4.DHCPv4{},
-		resp: &dhcpv4.DHCPv4{
-			Options: dhcpv4.OptionsFromList(
-				dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
-			),
-		},
-		want: defaultPeer,
-	}, {
-		name: "ciaddr",
-		req:  &dhcpv4.DHCPv4{ClientIPAddr: knownIP},
-		resp: &dhcpv4.DHCPv4{},
-		want: &net.UDPAddr{
-			IP:   knownIP,
-			Port: dhcpv4.ClientPort,
-		},
-	}, {
-		name: "chaddr",
-		req:  &dhcpv4.DHCPv4{ClientHWAddr: knownMAC},
-		resp: &dhcpv4.DHCPv4{YourIPAddr: knownIP},
-		want: &dhcpUnicastAddr{
-			Addr:   packet.Addr{HardwareAddr: knownMAC},
-			yiaddr: knownIP,
-		},
-	}, {
-		name: "who_are_you",
-		req:  &dhcpv4.DHCPv4{},
-		resp: &dhcpv4.DHCPv4{},
-		want: defaultPeer,
-	}}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			conn := &fakePacketConn{
-				writeTo: func(_ []byte, addr net.Addr) (_ int, _ error) {
-					assert.Equal(t, tc.want, addr)
-
-					return 0, nil
-				},
-			}
-
-			s.send(cloneUDPAddr(defaultPeer), conn, tc.req, tc.resp)
-		})
-	}
-
-	t.Run("giaddr_nak", func(t *testing.T) {
-		req := &dhcpv4.DHCPv4{
-			GatewayIPAddr: knownIP,
-		}
-		// Ensure the request is for unicast.
-		req.SetUnicast()
-		resp := &dhcpv4.DHCPv4{
-			Options: dhcpv4.OptionsFromList(
-				dhcpv4.OptMessageType(dhcpv4.MessageTypeNak),
-			),
-		}
-		want := &net.UDPAddr{
-			IP:   req.GatewayIPAddr,
-			Port: dhcpv4.ServerPort,
-		}
-
-		conn := &fakePacketConn{
-			writeTo: func(_ []byte, addr net.Addr) (n int, err error) {
-				assert.Equal(t, want, addr)
-
-				return 0, nil
-			},
-		}
-
-		s.send(cloneUDPAddr(defaultPeer), conn, req, resp)
-		assert.True(t, resp.IsBroadcast())
-	})
-}
-
 func TestV4Server_FindMACbyIP(t *testing.T) {
 	const (
 		staticName  = "static-client"
@@ -886,10 +780,10 @@ func TestV4Server_FindMACbyIP(t *testing.T) {
 
 	s := &v4Server{
 		leases: []*Lease{{
-			Expiry:   time.Unix(leaseExpireStatic, 0),
 			Hostname: staticName,
 			HWAddr:   staticMAC,
 			IP:       staticIP,
+			IsStatic: true,
 		}, {
 			Expiry:   time.Unix(10, 0),
 			Hostname: anotherName,