Pull request: 5044 Close upstreams

Merge in DNS/adguard-home from 5044-close-upstreams to master Closes #5044. Squashed commit of the following: commit e121380ecb32bd2664d47f0968c68509156404c1 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 19 15:54:17 2022 +0300 all: upd proxy again commit ce7fa539a7430a1a197fd45e7988697010c684db Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 19 14:30:46 2022 +0300 home: imp docs, names commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5 Merge: b9ee5d63 d2a09e49 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 19 14:21:44 2022 +0300 Merge branch 'master' into 5044-close-upstreams commit b9ee5d6348e696ff0b44dabee601469c545c8bd9 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 19 14:20:15 2022 +0300 all: close upstreams more commit eaca476319dc64e7986e26e67110005938cf1278 Merge: f924bc7a 8dba4ecd Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Oct 18 18:33:53 2022 +0300 Merge branch 'master' into 5044-close-upstreams commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Oct 18 18:23:54 2022 +0300 all: imp code, docs commit 011fde16aa912fc78e3d6f60375cee73a0d88709 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Oct 18 17:26:40 2022 +0300 all: upd dnsproxy
Pull request: upd-i18n
2022-10-19 16:13:05 +03:00 · 2022-10-19 13:18:34 +03:00 · 2022-10-19 12:13:22 +03:00 · 2022-10-18 17:45:04 +03:00 · 2022-10-14 20:44:29 +03:00 · 2022-10-14 20:19:25 +03:00
188 changed files with 9902 additions and 4663 deletions
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -6,11 +6,6 @@
        website
    'name': 'AdGuard filters issues'
    'url': 'https://link.adtidy.org/forward.html?action=report&app=home&from=github'
-  - 'about': >
-        Please send requests for addition to the vetted filtering lists to the
-        Hostlists Registry repository.
-    'name': 'AdGuard Hostlists Registry'
-    'url': 'https://github.com/AdguardTeam/HostlistsRegistry'
  - 'about': >
        Please use GitHub Discussions for questions
    'name': 'Q&A Discussions'
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 'name': 'build'

 'env':
-  'GO_VERSION': '1.18.8'
+  'GO_VERSION': '1.18.7'
  'NODE_VERSION': '14'

 'on':
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,7 +1,7 @@
 'name': 'lint'

 'env':
-  'GO_VERSION': '1.18.8'
+  'GO_VERSION': '1.18.7'

 'on':
  'push':
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,115 +12,11 @@ and this project adheres to
 ## [Unreleased]

 <!--
-## [v0.108.0] - TBA
+## [v0.108.0] - TBA (APPROX.)
 -->

+## Added

-
-<!--
-## [v0.107.21] - 2122-12-28 (APPROX.)
-
-See also the [v0.107.21 GitHub milestone][ms-v0.107.21].
-
-[ms-v0.107.21]: https://github.com/AdguardTeam/AdGuardHome/milestone/57?closed=1
-->
-
-
-
-## [v0.107.20] - 2022-12-07
-
-See also the [v0.107.20 GitHub milestone][ms-v0.107.20].
-
-### Security
-
- Go version has been updated to prevent the possibility of exploiting the
-  CVE-2022-41717 and CVE-2022-41720 Go vulnerabilities fixed in [Go
-  1.18.9][go-1.18.9].
-
-### Added
-
- The ability to clear the DNS cache ([#5190]).
-
-### Changed
-
- DHCP server initialization errors are now logged at debug level if the server
-  itself disabled ([#4944]).
-
-### Fixed
-
- Wrong validation error messages on the DHCP configuration page ([#5208]).
- Slow upstream checks making the API unresponsive ([#5193]).
- The TLS initialization errors preventing AdGuard Home from starting ([#5189]).
-  Instead, AdGuard Home disables encryption and shows an error message on the
-  encryption settings page in the UI, which was the intended previous behavior.
- URLs of some vetted blocklists.
-
-[#4944]: https://github.com/AdguardTeam/AdGuardHome/issues/4944
-[#5189]: https://github.com/AdguardTeam/AdGuardHome/issues/5189
-[#5190]: https://github.com/AdguardTeam/AdGuardHome/issues/5190
-[#5193]: https://github.com/AdguardTeam/AdGuardHome/issues/5193
-[#5208]: https://github.com/AdguardTeam/AdGuardHome/issues/5208
-
-[go-1.18.9]:    https://groups.google.com/g/golang-announce/c/L_3rmdT0BMU
-[ms-v0.107.20]: https://github.com/AdguardTeam/AdGuardHome/milestone/56?closed=1
-
-
-
-## [v0.107.19] - 2022-11-23
-
-See also the [v0.107.19 GitHub milestone][ms-v0.107.19].
-
-### Added
-
- The ability to block popular Mastodon instances
-  ([AdguardTeam/HostlistsRegistry#100]).
- The new `--update` command-line option, which allows updating AdGuard Home
-  silently ([#4223]).
-
-### Changed
-
- Minor UI changes.
-
-[#4223]: https://github.com/AdguardTeam/AdGuardHome/issues/4223
-
-[ms-v0.107.19]: https://github.com/AdguardTeam/AdGuardHome/milestone/55?closed=1
-
-[AdguardTeam/HostlistsRegistry#100]: https://github.com/AdguardTeam/HostlistsRegistry/pull/100
-
-
-
-## [v0.107.18] - 2022-11-08
-
-See also the [v0.107.18 GitHub milestone][ms-v0.107.18].
-
-### Fixed
-
- Crash on some systems when domains from system hosts files are processed
-  ([#5089]).
-
-[#5089]: https://github.com/AdguardTeam/AdGuardHome/issues/5089
-
-[ms-v0.107.18]: https://github.com/AdguardTeam/AdGuardHome/milestone/54?closed=1
-
-
-
-## [v0.107.17] - 2022-11-02
-
-See also the [v0.107.17 GitHub milestone][ms-v0.107.17].
-
-### Security
-
- Go version has been updated to prevent the possibility of exploiting the
-  CVE-2022-41716 Go vulnerability fixed in [Go 1.18.8][go-1.18.8].
-
-### Added
-
- The warning message when adding a certificate having no IP addresses
-  ([#4898]).
- Several new blockable services ([#3972]).  Those will now be more in sync with
-  the services that are already blockable in AdGuard DNS.
- A new HTTP API, `GET /control/blocked_services/all`, that lists all available
-  blocked services and their data, such as SVG icons ([#3972]).
 - The new optional `tls.override_tls_ciphers` property, which allows
  overriding TLS ciphers used by AdGuard Home ([#4925], [#4990]).
 - The ability to serve DNS on link-local IPv6 addresses ([#2926]).
@@ -130,20 +26,10 @@ See also the [v0.107.17 GitHub milestone][ms-v0.107.17].

 ### Changed

- DNS-over-TLS resolvers aren't returned anymore when the configured TLS
-  certificate contains no IP addresses ([#4927]).
 - Responses with `SERVFAIL` code are now cached for at least 30 seconds.

-### Deprecated
-
- The `GET /control/blocked_services/services` HTTP API; use the new
-  `GET /control/blocked_services/all` API instead ([#3972]).
-
 ### Fixed

- ClientIDs not working when using DNS-over-HTTPS with HTTP/3.
- Editing the URL of an enabled rule list also includes validation of the filter
-  contents preventing from saving a bad one ([#4916]).
 - The default value of `dns.cache_size` accidentally set to 0 has now been
  reverted to 4 MiB ([#5010]).
 - Responses for which the DNSSEC validation had explicitly been omitted aren't
@@ -152,9 +38,6 @@ See also the [v0.107.17 GitHub milestone][ms-v0.107.17].

 [#2926]: https://github.com/AdguardTeam/AdGuardHome/issues/2926
 [#3418]: https://github.com/AdguardTeam/AdGuardHome/issues/3418
-[#3972]: https://github.com/AdguardTeam/AdGuardHome/issues/3972
-[#4898]: https://github.com/AdguardTeam/AdGuardHome/issues/4898
-[#4916]: https://github.com/AdguardTeam/AdGuardHome/issues/4916
 [#4925]: https://github.com/AdguardTeam/AdGuardHome/issues/4925
 [#4942]: https://github.com/AdguardTeam/AdGuardHome/issues/4942
 [#4986]: https://github.com/AdguardTeam/AdGuardHome/issues/4986
@@ -162,9 +45,17 @@ See also the [v0.107.17 GitHub milestone][ms-v0.107.17].
 [#4993]: https://github.com/AdguardTeam/AdGuardHome/issues/4993
 [#5010]: https://github.com/AdguardTeam/AdGuardHome/issues/5010

-[clientid]:     https://github.com/AdguardTeam/AdGuardHome/wiki/Clients#clientid
-[go-1.18.8]:    https://groups.google.com/g/golang-announce/c/mbHY1UY3BaM
-[ms-v0.107.17]: https://github.com/AdguardTeam/AdGuardHome/milestone/53?closed=1
+[clientid]: https://github.com/AdguardTeam/AdGuardHome/wiki/Clients#clientid
+
+
+
+<!--
+## [v0.107.17] - 2022-11-02 (APPROX.)
+
+See also the [v0.107.17 GitHub milestone][ms-v0.107.17].
+
+[ms-v0.107.17]: https://github.com/AdguardTeam/AdGuardHome/milestone/52?closed=1
+-->



@@ -173,7 +64,7 @@ See also the [v0.107.17 GitHub milestone][ms-v0.107.17].
 This is a security update.  There is no GitHub milestone, since no GitHub issues
 were resolved.

-### Security
+## Security

 - Go version has been updated to prevent the possibility of exploiting the
  CVE-2022-2879, CVE-2022-2880, and CVE-2022-41715 Go vulnerabilities fixed in
@@ -907,7 +798,7 @@ See also the [v0.107.0 GitHub milestone][ms-v0.107.0].
 - Query log search now supports internationalized domains ([#3012]).
 - Internationalized domains are now shown decoded in the query log with the
  original encoded version shown in request details ([#3013]).
- When `/etc/hosts`-type rules have several IPs for one host, all IPs are now
+- When /etc/hosts-type rules have several IPs for one host, all IPs are now
  returned instead of only the first one ([#1381]).
 - Property `rlimit_nofile` is now in the `os` object of the configuration
  file, together with the new `group` and `user` properties ([#2763]).
@@ -1165,7 +1056,7 @@ See also the [v0.106.0 GitHub milestone][ms-v0.106.0].
 - Hostname uniqueness validation in the DHCP server ([#2952]).
 - Hostname generating for DHCP clients which don't provide their own ([#2723]).
 - New flag `--no-etc-hosts` to disable client domain name lookups in the
-  operating system's `/etc/hosts` files ([#1947]).
+  operating system's /etc/hosts files ([#1947]).
 - The ability to set up custom upstreams to resolve PTR queries for local
  addresses and to disable the automatic resolving of clients' addresses
  ([#2704]).
@@ -1482,15 +1373,11 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2].


 <!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.21...HEAD
-[v0.107.21]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.20...v0.107.21
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.17...HEAD
+[v0.107.17]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.16...v0.107.17
 -->

-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.20...HEAD
-[v0.107.20]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.19...v0.107.20
-[v0.107.19]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.18...v0.107.19
-[v0.107.18]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.17...v0.107.18
-[v0.107.17]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.16...v0.107.17
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.16...HEAD
 [v0.107.16]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.15...v0.107.16
 [v0.107.15]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.14...v0.107.15
 [v0.107.14]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.13...v0.107.14
--- a/3
+++ b/3
@@ -34,6 +34,8 @@ YARN_INSTALL_FLAGS = $(YARN_FLAGS) --network-timeout 120000 --silent\
 	--ignore-engines --ignore-optional --ignore-platform\
 	--ignore-scripts

+NEXTAPI = 0
+
 # Macros for the build-release target.  If FRONTEND_PREBUILT is 0, the
 # default, the macro $(BUILD_RELEASE_DEPS_$(FRONTEND_PREBUILT)) expands
 # into BUILD_RELEASE_DEPS_0, and so both frontend and backend
@@ -61,6 +63,7 @@ ENV = env\
 	PATH="$${PWD}/bin:$$( "$(GO.MACRO)" env GOPATH )/bin:$${PATH}"\
 	RACE='$(RACE)'\
 	SIGN='$(SIGN)'\
+	NEXTAPI='$(NEXTAPI)'\
 	VERBOSE='$(VERBOSE)'\
 	VERSION='$(VERSION)'\

--- a/bamboo-specs/release.yaml
+++ b/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:5.4'
+  'dockerGo': 'adguard/golang-ubuntu:5.2'

 'stages':
 - 'Build frontend':
@@ -322,7 +322,7 @@
    # need to build a few of these.
    'variables':
      'channel': 'beta'
-      'dockerGo': 'adguard/golang-ubuntu:5.4'
+      'dockerGo': 'adguard/golang-ubuntu:5.2'
 # release-vX.Y.Z branches are the branches from which the actual final release
 # is built.
 - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -337,4 +337,4 @@
    # are the ones that actually get released.
    'variables':
      'channel': 'release'
-      'dockerGo': 'adguard/golang-ubuntu:5.4'
+      'dockerGo': 'adguard/golang-ubuntu:5.2'
--- a/bamboo-specs/test.yaml
+++ b/bamboo-specs/test.yaml
@@ -5,7 +5,7 @@
  'key': 'AHBRTSPECS'
  'name': 'AdGuard Home - Build and run tests'
 'variables':
-  'dockerGo': 'adguard/golang-ubuntu:5.4'
+  'dockerGo': 'adguard/golang-ubuntu:5.2'

 'stages':
 - 'Tests':
--- a/client/src/__locales/ar.json
+++ b/client/src/__locales/ar.json
@@ -392,7 +392,6 @@
    "encryption_issuer": "المصدر",
    "encryption_hostnames": "اسم المستضيف",
    "encryption_reset": "هل أنت متأكد أنك تريد إعادة تعيين إعدادات التشفير؟",
-    "encryption_warning": "تحذير",
    "topline_expiring_certificate": "شهادة SSL الخاصة بك على وشك الانتهاء. قم بتحديث <0>إعدادات التشفير</0>.",
    "topline_expired_certificate": "انتهت صلاحية شهادة SSL الخاصة بك. قم بتحديث <0>إعدادات التشفير</0>.",
    "form_error_port_range": "أدخل رقم المنفذ في النطاق 80-65535",
--- a/client/src/__locales/be.json
+++ b/client/src/__locales/be.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Выдавец",
    "encryption_hostnames": "Імёны хастоў",
    "encryption_reset": "Вы ўпэўнены, што хочаце скінуць налады шыфравання?",
-    "encryption_warning": "Папярэджанне",
    "topline_expiring_certificate": "Ваш SSL-сертыфікат хутка мінае. Абновіце <0>Налады шыфравання</0>.",
    "topline_expired_certificate": "Ваш SSL-сертыфікат мінуў. Абновіце <0>Налады шыфравання</0>.",
    "form_error_port_range": "Увядзіце нумар порта з інтэрвалу 80-65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Бяспечны інтэрнэт",
    "served_from_cache": "{{value}} <i>(атрымана з кэша)</i>",
    "form_error_password_length": "Пароль павінен быць не менш за {{value}} сімвалаў",
-    "anonymizer_notification": "<0>Заўвага:</0> Ананімізацыя IP уключана. Вы можаце адключыць яго ў <1>Агульных наладах</1> .",
-    "confirm_dns_cache_clear": "Вы ўпэўнены, што хочаце ачысціць кэш DNS?",
-    "cache_cleared": "Кэш DNS паспяхова ачышчаны",
-    "clear_cache": "Ачысціць кэш"
+    "anonymizer_notification": "<0>Заўвага:</0> Ананімізацыя IP уключана. Вы можаце адключыць яго ў <1>Агульных наладах</1> ."
 }
--- a/client/src/__locales/bg.json
+++ b/client/src/__locales/bg.json
@@ -244,7 +244,6 @@
    "encryption_issuer": "Изпълнител",
    "encryption_hostnames": "Имена на хоста",
    "encryption_reset": "Сигурни ли сте че искате да изтриете настройките за криптиране?",
-    "encryption_warning": "Внимание",
    "topline_expiring_certificate": "Вашият SSL сертификат изтича. Обнови <0>Настройки за криптиране</0>.",
    "topline_expired_certificate": "Вашият SSL сертификат е изтекъл. Обнови <0>Настройки за криптиране</0>.",
    "form_error_port_range": "Въведете порт в диапазона 80-65535",
--- a/client/src/__locales/cs.json
+++ b/client/src/__locales/cs.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Vydavatel",
    "encryption_hostnames": "Názvy hostitelů",
    "encryption_reset": "Opravdu chcete obnovit nastavení šifrování?",
-    "encryption_warning": "Varování",
    "topline_expiring_certificate": "Váš SSL certifikát brzy vyprší. Aktualizujte <0>Nastavení šifrování</0>.",
    "topline_expired_certificate": "Váš SSL certifikát vypršel. Aktualizujte <0>Nastavení šifrování</0>.",
    "form_error_port_range": "Zadejte číslo portu v rozmezí 80-65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Bezpečné prohlížení",
    "served_from_cache": "{{value}} <i>(převzato z mezipaměti)</i>",
    "form_error_password_length": "Heslo musí být alespoň {{value}} znaků dlouhé",
-    "anonymizer_notification": "<0>Poznámka:</0> Anonymizace IP je zapnuta. Můžete ji vypnout v <1>Obecných nastaveních</1>.",
-    "confirm_dns_cache_clear": "Opravdu chcete vymazat mezipaměť DNS?",
-    "cache_cleared": "Mezipaměť DNS úspěšně vymazána",
-    "clear_cache": "Vymazat mezipaměť"
+    "anonymizer_notification": "<0>Poznámka:</0> Anonymizace IP je zapnuta. Můžete ji vypnout v <1>Obecných nastaveních</1>."
 }
--- a/client/src/__locales/da.json
+++ b/client/src/__locales/da.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Udsteder",
    "encryption_hostnames": "Værtsnavne",
    "encryption_reset": "Sikker på, at du vil nulstille krypteringsindstillingerne?",
-    "encryption_warning": "Advarsel",
    "topline_expiring_certificate": "Dit SSL-certifikat er ved at udløbe. Opdatér <0>Krypteringsindstillinger</0>.",
    "topline_expired_certificate": "Dit SSL-certifikat er udløbet. Opdatér <0>Krypteringsindstillinger</0>.",
    "form_error_port_range": "Angiv portnummer i intervallet 80-65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Sikker Browsing",
    "served_from_cache": "{{value}} <i>(leveret fra cache)</i>",
    "form_error_password_length": "Adgangskoden skal udgøre mindst {{value}} tegn.",
-    "anonymizer_notification": "<0>Bemærk:</0> IP-anonymisering er aktiveret. Det kan deaktiveres via <1>Generelle indstillinger</1>.",
-    "confirm_dns_cache_clear": "Sikker på, at DNS-cache skal ryddes?",
-    "cache_cleared": "DNS-cache hermed ryddet",
-    "clear_cache": "Ryd cache"
+    "anonymizer_notification": "<0>Bemærk:</0> IP-anonymisering er aktiveret. Det kan deaktiveres via <1>Generelle indstillinger</1>."
 }
--- a/client/src/__locales/de.json
+++ b/client/src/__locales/de.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Ausgestellt von",
    "encryption_hostnames": "Hostnamen",
    "encryption_reset": "Möchten Sie die Verschlüsselungseinstellungen wirklich zurücksetzen?",
-    "encryption_warning": "Warnhinweis",
    "topline_expiring_certificate": "Ihr SSL-Zertifikat läuft demnächst ab. Aktualisieren Sie Ihre <0>Verschlüsselungseinstellungen</0>.",
    "topline_expired_certificate": "Ihr SSL-Zertifikat ist abgelaufen. Aktualisieren Sie Ihre <0>Verschlüsselungseinstellungen</0>.",
    "form_error_port_range": "Geben Sie die Portnummer zwischen 80 und 65535 ein",
@@ -638,8 +637,5 @@
    "safe_browsing": "Internetsicherheit",
    "served_from_cache": "{{value}} <i>(aus dem Cache abgerufen)</i>",
    "form_error_password_length": "Das Passwort muss mindestens {{value}} Zeichen enthalten",
-    "anonymizer_notification": "<0>Hinweis:</0> Die IP-Anonymisierung ist aktiviert. Sie können sie in den <1>Allgemeinen Einstellungen</1> deaktivieren.",
-    "confirm_dns_cache_clear": "Möchten Sie den DNS-Cache wirklich leeren?",
-    "cache_cleared": "DNS-Cache erfolgreich geleert",
-    "clear_cache": "Cache leeren"
+    "anonymizer_notification": "<0>Hinweis:</0> Die IP-Anonymisierung ist aktiviert. Sie können sie in den <1>Allgemeinen Einstellungen</1> deaktivieren."
 }
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -37,6 +37,8 @@
    "dhcp_ipv6_settings": "DHCP IPv6 Settings",
    "form_error_required": "Required field",
    "form_error_ip4_format": "Invalid IPv4 address",
+    "form_error_ip4_range_start_format": "Invalid IPv4 address of the range start",
+    "form_error_ip4_range_end_format": "Invalid IPv4 address of the range end",
    "form_error_ip4_gateway_format": "Invalid IPv4 address of the gateway",
    "form_error_ip6_format": "Invalid IPv6 address",
    "form_error_ip_format": "Invalid IP address",
@@ -49,8 +51,9 @@
    "out_of_range_error": "Must be out of range \"{{start}}\"-\"{{end}}\"",
    "lower_range_start_error": "Must be lower than range start",
    "greater_range_start_error": "Must be greater than range start",
+    "greater_range_end_error": "Must be greater than range end",
    "subnet_error": "Addresses must be in one subnet",
-    "gateway_or_subnet_invalid": "Invalid subnet mask",
+    "gateway_or_subnet_invalid": "Subnet mask invalid",
    "dhcp_form_gateway_input": "Gateway IP",
    "dhcp_form_subnet_input": "Subnet mask",
    "dhcp_form_range_title": "Range of IP addresses",
@@ -390,7 +393,6 @@
    "encryption_issuer": "Issuer",
    "encryption_hostnames": "Hostnames",
    "encryption_reset": "Are you sure you want to reset encryption settings?",
-    "encryption_warning": "Warning",
    "topline_expiring_certificate": "Your SSL certificate is about to expire. Update <0>Encryption settings</0>.",
    "topline_expired_certificate": "Your SSL certificate is expired. Update <0>Encryption settings</0>.",
    "form_error_port_range": "Enter port number in the range of 80-65535",
@@ -635,8 +637,5 @@
    "safe_browsing": "Safe Browsing",
    "served_from_cache": "{{value}} <i>(served from cache)</i>",
    "form_error_password_length": "Password must be at least {{value}} characters long",
-    "anonymizer_notification": "<0>Note:</0> IP anonymization is enabled. You can disable it in <1>General settings</1>.",
-    "confirm_dns_cache_clear": "Are you sure you want to clear DNS cache?",
-    "cache_cleared": "DNS cache successfully cleared",
-    "clear_cache": "Clear cache"
+    "anonymizer_notification": "<0>Note:</0> IP anonymization is enabled. You can disable it in <1>General settings</1>."
 }
--- a/client/src/__locales/es.json
+++ b/client/src/__locales/es.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Emisor",
    "encryption_hostnames": "Nombres de hosts",
    "encryption_reset": "¿Estás seguro de que deseas restablecer la configuración de cifrado?",
-    "encryption_warning": "Advertencia",
    "topline_expiring_certificate": "Tu certificado SSL está a punto de expirar. Actualiza la <0>configuración de cifrado</0>.",
    "topline_expired_certificate": "Tu certificado SSL ha expirado. Actualiza la <0>configuración de cifrado</0>.",
    "form_error_port_range": "Ingresa el número del puerto en el rango de 80 a 65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Navegación segura",
    "served_from_cache": "{{value}} <i>(servido desde la caché)</i>",
    "form_error_password_length": "La contraseña debe tener al menos {{value}} caracteres",
-    "anonymizer_notification": "<0>Nota:</0> La anonimización de IP está habilitada. Puedes deshabilitarla en <1>Configuración general</1>.",
-    "confirm_dns_cache_clear": "¿Estás seguro de que deseas borrar la caché de DNS?",
-    "cache_cleared": "Caché DNS borrado con éxito",
-    "clear_cache": "Borrar caché"
+    "anonymizer_notification": "<0>Nota:</0> La anonimización de IP está habilitada. Puedes deshabilitarla en <1>Configuración general</1>."
 }
--- a/client/src/__locales/fa.json
+++ b/client/src/__locales/fa.json
@@ -361,7 +361,6 @@
    "encryption_issuer": "صادر کننده",
    "encryption_hostnames": "نام میزبان",
    "encryption_reset": "آیا میخواهید تنظیمات رمزگُذاری به پیش فرض بازگردد؟",
-    "encryption_warning": "هشدار",
    "topline_expiring_certificate": "گواهینامه اِس اِس اِل شما در صدد انقضاء است.  <0>تنظیمات رمزگُذاری</0> را بروز رسانی کنید.",
    "topline_expired_certificate": "گواهینامه اِس اِس اِل شما منقضی شده است. <0>تنظیمات رمزگُذاری</0> را بروز رسانی کنید.",
    "form_error_port_range": "مقدار پورت را در محدوده 80-65535 وارد کنید",
--- a/client/src/__locales/fi.json
+++ b/client/src/__locales/fi.json
@@ -88,7 +88,7 @@
    "response_details": "Vastauksen tiedot",
    "request_details": "Pyynnön tiedot",
    "client_details": "Päätelaitteen tiedot",
-    "details": "Yksityiskohdat",
+    "details": "Tiedot",
    "back": "Takaisin",
    "dashboard": "Tila",
    "settings": "Asetukset",
@@ -275,7 +275,7 @@
    "nxdomain": "NXDOMAIN",
    "refused": "REFUSED",
    "null_ip": "Tyhjä IP",
-    "custom_ip": "Oma IP-osoite",
+    "custom_ip": "Oma IP",
    "blocking_ipv4": "IPv4-esto",
    "blocking_ipv6": "IPv6-esto",
    "dnscrypt": "DNSCrypt",
@@ -393,7 +393,6 @@
    "encryption_issuer": "Toimittaja",
    "encryption_hostnames": "Isäntänimet",
    "encryption_reset": "Haluatko varmasti palauttaa salausasetukset?",
-    "encryption_warning": "Varoitus",
    "topline_expiring_certificate": "SSL-varmenteesi on erääntymässä. Päivitä <0>Salausasetukset</0>.",
    "topline_expired_certificate": "SSL-varmenteesi on erääntynyt. Päivitä <0>Salausasetukset</0>.",
    "form_error_port_range": "Syötä portti väliltä 80-65535",
@@ -416,8 +415,8 @@
    "clients_title": "Pysyvät päätelaitteet",
    "clients_desc": "Määritä pysyvät AdGuard Homeen yhdistetyt päätelaitetiedot.",
    "settings_global": "Yleinen",
-    "settings_custom": "Muut aiheet",
-    "table_client": "Asiakas",
+    "settings_custom": "Oma",
+    "table_client": "Päätelaite",
    "table_name": "Nimi",
    "save_btn": "Tallenna",
    "client_add": "Lisää päätelaite",
@@ -543,8 +542,8 @@
    "descr": "Kuvaus",
    "whois": "WHOIS",
    "filtering_rules_learn_more": "<0>Lue lisää</0> omien hosts-listojesi luonnista.",
-    "blocked_by_response": "Estetty vastauksen CNAME:n tai IP:n perusteella",
-    "blocked_by_cname_or_ip": "Estetty CNAME:n tai IP:n perusteella",
+    "blocked_by_response": "Vastauksen sisältämän CNAME:n tai IP:n estämä",
+    "blocked_by_cname_or_ip": "CNAME:n tai IP:n estämä",
    "try_again": "Yritä uudelleen",
    "domain_desc": "Syötä korvattava verkkotunnus tai jokerimerkki.",
    "example_rewrite_domain": "korvaa vain tämän verkkotunnuksen vastaukset",
@@ -598,7 +597,7 @@
    "show_whitelisted_responses": "Sallitut",
    "show_processed_responses": "Käsitelty",
    "blocked_safebrowsing": "Turvallisen selauksen estämät",
-    "blocked_adult_websites": "Estetty lapsilukolla",
+    "blocked_adult_websites": "Lapsilukon estämät",
    "blocked_threats": "Estetyt uhat",
    "allowed": "Sallitut",
    "filtered": "Suodatetut",
@@ -638,8 +637,5 @@
    "safe_browsing": "Turvallinen selaus",
    "served_from_cache": "{{value}} <i>(jaettu välimuistista)</i>",
    "form_error_password_length": "Salasanan on oltava ainakin {{value}} merkkiä",
-    "anonymizer_notification": "<0>Huomioi:</0> IP-osoitteen anonymisointi on käytössä. Voit poistaa sen käytöstä <1>Yleisistä asetuksista</1>.",
-    "confirm_dns_cache_clear": "Haluatko varmasti tyhjentää DNS-välimuistin?",
-    "cache_cleared": "DNS-välimuistin tyhjennys onnistui",
-    "clear_cache": "Tyhjennä välimuisti"
+    "anonymizer_notification": "<0>Huomioi:</0> IP-osoitteen anonymisointi on käytössä. Voit poistaa sen käytöstä <1>Yleisistä asetuksista</1>."
 }
--- a/client/src/__locales/fr.json
+++ b/client/src/__locales/fr.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Émetteur",
    "encryption_hostnames": "Noms d'hôte",
    "encryption_reset": "Voulez-vous vraiment réinitialiser les paramètres de chiffrement ?",
-    "encryption_warning": "Attention",
    "topline_expiring_certificate": "Votre certificat SSL est sur le point d'expirer. Mettez à jour vos <0>Paramètres de chiffrement</0>.",
    "topline_expired_certificate": "Votre certificat SSL a expiré. Mettez à jour vos <0>Paramètres de chiffrement</0>.",
    "form_error_port_range": "Saisissez une valeur de port entre 80 et 65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Navigation sécurisée",
    "served_from_cache": "{{value}} <i>(depuis le cache)</i>",
    "form_error_password_length": "Le mot de passe doit comporter au moins {{value}} caractères",
-    "anonymizer_notification": "<0>Note :</0> L'anonymisation IP est activée. Vous pouvez la désactiver dans les <1>paramètres généraux</1>.",
-    "confirm_dns_cache_clear": "Voulez-vous vraiment vider le cache DNS ?",
-    "cache_cleared": "Le cache DNS a été vidé",
-    "clear_cache": "Vider le cache"
+    "anonymizer_notification": "<0>Note :</0> L'anonymisation IP est activée. Vous pouvez la désactiver dans les <1>paramètres généraux</1>."
 }
--- a/client/src/__locales/hr.json
+++ b/client/src/__locales/hr.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Izdavač",
    "encryption_hostnames": "Nazivi računala",
    "encryption_reset": "Jeste li sigurni da želite poništiti postavke šifriranja?",
-    "encryption_warning": "Upozorenje",
    "topline_expiring_certificate": "Vaš SSL certifikat uskoro ističe. Ažurirajte <0>Postavke šifriranja</0>.",
    "topline_expired_certificate": "Vaš SSL certifikat je istekao. Ažurirajte <0>Postavke šifriranja</0>.",
    "form_error_port_range": "Unesite broj porta od 80 do 65536",
@@ -638,8 +637,5 @@
    "safe_browsing": "Sigurno surfanje",
    "served_from_cache": "{{value}} <i>(dohvaćeno iz predmemorije)</i>",
    "form_error_password_length": "Lozinka mora imati najmanje {{value}} znakova",
-    "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"
+    "anonymizer_notification": "<0>Napomena:</0>IP anonimizacija je omogućena. Možete ju onemogućiti u <1>općim postavkama</1>."
 }
--- a/client/src/__locales/hu.json
+++ b/client/src/__locales/hu.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Kibocsátó",
    "encryption_hostnames": "Hosztnevek",
    "encryption_reset": "Biztosan visszaállítja a titkosítási beállításokat?",
-    "encryption_warning": "Figyelmeztetés",
    "topline_expiring_certificate": "Az SSL-tanúsítványa hamarosan lejár. Frissítse a <0>Titkosítási beállításokat</0>.",
    "topline_expired_certificate": "Az SSL-tanúsítványa lejárt. Frissítse a <0>Titkosítási beállításokat</0>.",
    "form_error_port_range": "Adjon meg egy portszámot a 80-65535 tartományon belül",
@@ -638,8 +637,5 @@
    "safe_browsing": "Biztonságos böngészés",
    "served_from_cache": "{{value}} <i>(gyorsítótárból kiszolgálva)</i>",
    "form_error_password_length": "A jelszó legalább {{value}} karakter hosszú kell, hogy legyen",
-    "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"
+    "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> ."
 }
--- a/client/src/__locales/id.json
+++ b/client/src/__locales/id.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Penerbit",
    "encryption_hostnames": "Nama host",
    "encryption_reset": "Anda yakin ingin mengatur ulang pengaturan enkripsi?",
-    "encryption_warning": "Perhatian",
    "topline_expiring_certificate": "Sertifikat SSL Anda hampir kedaluwarsa. Perbarui <0>Pengaturan enkripsi</0>.",
    "topline_expired_certificate": "Sertifikat SSL Anda kedaluwarsa. Perbarui <0>Pengaturan enkripsi</0>.",
    "form_error_port_range": "Masukkan nomor port di kisaran 80-65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Penjelajahan Aman",
    "served_from_cache": "{{value}} <i>(disajikan dari cache)</i>",
    "form_error_password_length": "Kata sandi harus minimal {{value}} karakter",
-    "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"
+    "anonymizer_notification": "<0>Catatan:</0> Anonimisasi IP diaktifkan. Anda dapat menonaktifkannya di <1>Pengaturan umum</1> ."
 }
--- a/client/src/__locales/it.json
+++ b/client/src/__locales/it.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Emittente",
    "encryption_hostnames": "Nomi host",
    "encryption_reset": "Sei sicuro di voler ripristinare le impostazioni di crittografia?",
-    "encryption_warning": "Attenzione",
    "topline_expiring_certificate": "Il tuo certificato SSL sta per scadere. Aggiorna le<0> Impostazioni di crittografia </ 0>.",
    "topline_expired_certificate": "Il tuo certificato SSL è scaduto. Aggiorna le <0> Impostazioni di crittografia </ 0>.",
    "form_error_port_range": "Immettere il valore della porta nell'intervallo 80-65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Navigazione Sicura",
    "served_from_cache": "{{value}} <i>(fornito dalla cache)</i>",
    "form_error_password_length": "La password deve contenere almeno {{value}} caratteri",
-    "anonymizer_notification": "<0>Attenzione:</0> L'anonimizzazione dell'IP è abilitata. Puoi disabilitarla in <1>Impostazioni generali</1>.",
-    "confirm_dns_cache_clear": "Sei sicuro di voler cancellare la cache DNS?",
-    "cache_cleared": "Cache DNS è stata cancellata correttamente",
-    "clear_cache": "Cancella cache"
+    "anonymizer_notification": "<0>Attenzione:</0> L'anonimizzazione dell'IP è abilitata. Puoi disabilitarla in <1>Impostazioni generali</1>."
 }
--- a/client/src/__locales/ja.json
+++ b/client/src/__locales/ja.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "発行者",
    "encryption_hostnames": "ホスト名",
    "encryption_reset": "暗号化設定をリセットして良いですか？",
-    "encryption_warning": "警告",
    "topline_expiring_certificate": "SSL証明書は期限切れになります。<0>暗号化設定</0>を更新します。",
    "topline_expired_certificate": "SSL証明書は期限切れです。<0>暗号化設定</0>を更新します。",
    "form_error_port_range": "80〜65535 の範囲内でポート番号を入力してください",
@@ -638,8 +637,5 @@
    "safe_browsing": "セーフブラウジング",
    "served_from_cache": "{{value}} <i>(キャッシュから応答)</i>",
    "form_error_password_length": "パスワードは{{value}}文字以上にしてください",
-    "anonymizer_notification": "【<0>注意</0>】IPの匿名化が有効になっています。 <1>一般設定</1>で無効にできます。",
-    "confirm_dns_cache_clear": "DNS キャッシュをクリアしてもよろしいですか？",
-    "cache_cleared": "DNSキャッシュのクリア完了です。",
-    "clear_cache": "キャッシュをクリアする"
+    "anonymizer_notification": "【<0>注意</0>】IPの匿名化が有効になっています。 <1>一般設定</1>で無効にできます。"
 }
--- a/client/src/__locales/ko.json
+++ b/client/src/__locales/ko.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "발행자",
    "encryption_hostnames": "호스트 이름",
    "encryption_reset": "암호화 설정을 재설정하시겠습니까?",
-    "encryption_warning": "경고",
    "topline_expiring_certificate": "SSL 인증서가 곧 만료됩니다. 업데이트<0> 암호화 설정</0>.",
    "topline_expired_certificate": "SSL 인증서가 만료되었습니다. 업데이트<0> 암호화 설정</0>.",
    "form_error_port_range": "80-65535 범위의 포트 번호를 입력하세요",
@@ -638,8 +637,5 @@
    "safe_browsing": "세이프 브라우징",
    "served_from_cache": "{{value}} <i>(캐시에서 제공)</i>",
    "form_error_password_length": "비밀번호는 {{value}}자 이상이어야 합니다",
-    "anonymizer_notification": "<0>참고:</0> IP 익명화가 활성화되었습니다. <1>일반 설정</1>에서 비활성화할 수 있습니다.",
-    "confirm_dns_cache_clear": "정말로 DNS 캐시를 지우시겠습니까?",
-    "cache_cleared": "DNS 캐시를 성공적으로 지웠습니다",
-    "clear_cache": "캐시 지우기"
+    "anonymizer_notification": "<0>참고:</0> IP 익명화가 활성화되었습니다. <1>일반 설정</1>에서 비활성화할 수 있습니다."
 }
--- a/client/src/__locales/nl.json
+++ b/client/src/__locales/nl.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Uitgever",
    "encryption_hostnames": "Hostnamen",
    "encryption_reset": "Ben je zeker dat je de encryptie instellingen wil resetten?",
-    "encryption_warning": "Waarschuwing",
    "topline_expiring_certificate": "Jouw SSL-certificaat vervalt binnenkort. Werk de <0>encryptie-instellingen</0> bij.",
    "topline_expired_certificate": "Jouw SSL-certificaat is vervallen. Werk de <0>encryptie-instellingen</0> bij.",
    "form_error_port_range": "Poortnummer invoeren tussen 80 en 65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Veilig browsen",
    "served_from_cache": "{{value}} <i>(geleverd vanuit cache)</i>",
    "form_error_password_length": "Wachtwoord moet minimaal {{value}} tekens lang zijn",
-    "anonymizer_notification": "<0>Opmerking:</0> IP-anonimisering is ingeschakeld. Je kunt het uitschakelen in <1>Algemene instellingen</1>.",
-    "confirm_dns_cache_clear": "Weet je zeker dat je de DNS-cache wilt wissen?",
-    "cache_cleared": "DNS-cache succesvol gewist",
-    "clear_cache": "Cache wissen"
+    "anonymizer_notification": "<0>Opmerking:</0> IP-anonimisering is ingeschakeld. Je kunt het uitschakelen in <1>Algemene instellingen</1>."
 }
--- a/client/src/__locales/no.json
+++ b/client/src/__locales/no.json
@@ -373,7 +373,6 @@
    "encryption_issuer": "Utsteder",
    "encryption_hostnames": "Vertsnavn",
    "encryption_reset": "Er du sikker på at du vil tilbakestille krypteringsinnstillingene?",
-    "encryption_warning": "Advarsel",
    "topline_expiring_certificate": "Ditt SSL-sertifikat er i ferd med å utløpe. Oppdater <0>Krypteringsinnstillinger</0>.",
    "topline_expired_certificate": "SSL-sertifikatet har utløpt. Oppdater <0>Krypteringsinnstillinger</0>.",
    "form_error_port_range": "Skriv inn et portnummer i området 80-65535",
--- a/client/src/__locales/pl.json
+++ b/client/src/__locales/pl.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Zgłaszający",
    "encryption_hostnames": "Nazwy hostów",
    "encryption_reset": "Czy na pewno chcesz zresetować ustawienia szyfrowania?",
-    "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",
@@ -638,8 +637,5 @@
    "safe_browsing": "Bezpieczne przeglądanie",
    "served_from_cache": "{{value}} <i>(podawane z pamięci podręcznej)</i>",
    "form_error_password_length": "Hasło musi mieć co najmniej {{value}} znaków",
-    "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ą"
+    "anonymizer_notification": "<0>Uwaga:</0> Anonimizacja IP jest włączona. Możesz ją wyłączyć w <1>Ustawieniach ogólnych</1>."
 }
--- a/client/src/__locales/pt-br.json
+++ b/client/src/__locales/pt-br.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Emissor",
    "encryption_hostnames": "Nomes dos servidores",
    "encryption_reset": "Você tem certeza de que deseja redefinir a configuração de criptografia?",
-    "encryption_warning": "Aviso",
    "topline_expiring_certificate": "Seu certificado SSL está prestes a expirar. Atualize suas <0>configurações de criptografia</]0>",
    "topline_expired_certificate": "Seu certificado SSL está expirado. Atualize suas <0>configurações de criptografia</0>",
    "form_error_port_range": "Digite um número de porta entre 80 e 65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Navegação segura",
    "served_from_cache": "{{value}} <i>(servido do cache)</i>",
    "form_error_password_length": "A senha deve ter pelo menos {{value}} caracteres",
-    "anonymizer_notification": "<0>Observação:</0> A anonimização de IP está ativada. Você pode desativá-lo em <1>Configurações gerais</1>.",
-    "confirm_dns_cache_clear": "Tem certeza de que deseja limpar o cache DNS?",
-    "cache_cleared": "Cache DNS limpo com sucesso",
-    "clear_cache": "Limpar cache"
+    "anonymizer_notification": "<0>Observação:</0> A anonimização de IP está ativada. Você pode desativá-lo em <1>Configurações gerais</1>."
 }
--- a/client/src/__locales/pt-pt.json
+++ b/client/src/__locales/pt-pt.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Emissor",
    "encryption_hostnames": "Nomes dos servidores",
    "encryption_reset": "Tem a certeza de que deseja repor a definição de criptografia?",
-    "encryption_warning": "Aviso",
    "topline_expiring_certificate": "O seu certificado SSL está prestes a expirar. Atualize as suas <0>definições de criptografia</0>.",
    "topline_expired_certificate": "O seu certificado SSL está expirado. Atualize as suas <0>definições de criptografia</0>.",
    "form_error_port_range": "Digite um numero de porta entre 80 e 65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Navegação segura",
    "served_from_cache": "{{value}} <i>(servido do cache)</i>",
    "form_error_password_length": "A palavra-passe deve ter pelo menos {{value}} caracteres",
-    "anonymizer_notification": "<0>Observação:</0> A anonimização de IP está ativada. Você pode desativá-la em <1>Definições gerais</1>.",
-    "confirm_dns_cache_clear": "Tem certeza de que quer limpar a cache DNS?",
-    "cache_cleared": "O cache DNS foi apagado com sucesso",
-    "clear_cache": "Limpar cache"
+    "anonymizer_notification": "<0>Observação:</0> A anonimização de IP está ativada. Você pode desativá-la em <1>Definições gerais</1>."
 }
--- a/client/src/__locales/ro.json
+++ b/client/src/__locales/ro.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Emitent",
    "encryption_hostnames": "Nume de host",
    "encryption_reset": "Sunteți sigur că doriți să resetați setările de criptare?",
-    "encryption_warning": "Avertisment",
    "topline_expiring_certificate": "Certificatul dvs. SSL este pe cale să expire. Actualizați <0>Setările de criptare</0>.",
    "topline_expired_certificate": "Certificatul dvs. SSL a expirat. Actualizați <0>Setările de criptare</0>.",
    "form_error_port_range": "Introduceți valoarea portului între 80-65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Navigare în siguranță",
    "served_from_cache": "{{value}} <i>(furnizat din cache)</i>",
    "form_error_password_length": "Parola trebuie să aibă cel puțin {{value}} caractere",
-    "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"
+    "anonymizer_notification": "<0>Nota:</0> Anonimizarea IP este activată. Puteți să o dezactivați în <1>Setări generale</1>."
 }
--- a/client/src/__locales/ru.json
+++ b/client/src/__locales/ru.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Издатель",
    "encryption_hostnames": "Имена хостов",
    "encryption_reset": "Вы уверены, что хотите сбросить настройки шифрования?",
-    "encryption_warning": "Предупреждение",
    "topline_expiring_certificate": "Ваш SSL-сертификат скоро истекает. Обновите <0>Настройки шифрования</0>.",
    "topline_expired_certificate": "Ваш SSL-сертификат истёк. Обновите <0>Настройки шифрования</0>.",
    "form_error_port_range": "Введите номер порта из интервала 80-65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Безопасный интернет",
    "served_from_cache": "{{value}} <i>(получено из кеша)</i>",
    "form_error_password_length": "Пароль должен быть длиной не меньше {{value}} символов",
-    "anonymizer_notification": "<0>Внимание:</0> включена анонимизация IP-адресов. Вы можете отключить её в разделе <1>Основные настройки</1>.",
-    "confirm_dns_cache_clear": "Вы уверены, что хотите очистить кеш DNS?",
-    "cache_cleared": "Кеш DNS успешно очищен",
-    "clear_cache": "Очистить кеш"
+    "anonymizer_notification": "<0>Внимание:</0> включена анонимизация IP-адресов. Вы можете отключить её в разделе <1>Основные настройки</1>."
 }
--- a/client/src/__locales/si-lk.json
+++ b/client/src/__locales/si-lk.json
@@ -126,7 +126,7 @@
    "number_of_dns_query_to_safe_search": "ආරක්ෂිත සෙවීම බලාත්මක කළ සෙවුම් යන්ත්‍ර සඳහා ව.නා.ප. ඉල්ලීම් ගණන",
    "average_processing_time": "සාමාන්‍ය සැකසුම් කාලය",
    "average_processing_time_hint": "ව.නා.ප. ඉල්ලීමක් සැකසීමේ සාමාන්‍ය කාලය මිලි තත්පර වලින්",
-    "block_domain_use_filters_and_hosts": "පෙරහන් හා සත්කාරක ගොනු භාවිතයෙන් වසම් අවහිර කරන්න",
+    "block_domain_use_filters_and_hosts": "පෙරහන් සහ ධාරක ගොනු භාවිතා කරමින් වසම් අවහිර කරන්න",
    "filters_block_toggle_hint": "ඔබට අවහිර කිරීමේ නීති <a>පෙරහන්</a> තුළ පිහිටුවිය හැකිය.",
    "use_adguard_browsing_sec": "ඇඩ්ගාර්ඩ් පිරික්සුම් ආරක්‍ෂණ වියමන සේවාව භාවිතා කරන්න",
    "use_adguard_browsing_sec_hint": "ඇඩ්ගාර්ඩ් හෝම් විසින් පිරික්සුම් ආරක්‍ෂණ වියමන සේවාව මගින් වසම අවහිර කර ඇත්දැයි පරීක්‍ෂා කරයි. එය සිදු කිරීමට රහස්‍යතා-හිතකාමී බැලීමේ යෙ.ක්‍ර.මු. භාවිතා කෙරේ: වසමේ කෙටි උපසර්ගයක SHA256 පූරකයක් පමණක් සේවාදායකය වෙත යවනු ලැබේ.",
@@ -575,7 +575,7 @@
    "blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව",
    "milliseconds_abbreviation": "මිලි තත්.",
    "cache_size": "නිහිතයෙහි ප්‍රමාණය",
-    "cache_size_desc": "ව.නා.ප. නිහිතයෙහි ප්‍රමාණය (බයිට). නිහිතය අබල කිරීමට, හිස්ව තබන්න.",
+    "cache_size_desc": "ව.නා.ප. නිහිතයෙහි ප්‍රමාණය (බයිට)",
    "cache_ttl_min_override": "අවම පව. කා. අභිබවන්න",
    "cache_ttl_max_override": "උපරිම පව. කා. අභිබවන්න",
    "enter_cache_size": "ව.නා.ප. නිහිතයෙහි ප්‍රමාණය යොදන්න (බයිට)",
--- a/client/src/__locales/sk.json
+++ b/client/src/__locales/sk.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Vydavateľ",
    "encryption_hostnames": "Názvy hostiteľov",
    "encryption_reset": "Naozaj chcete obnoviť nastavenia šifrovania?",
-    "encryption_warning": "Varovanie",
    "topline_expiring_certificate": "Váš SSL certifikát čoskoro vyprší. Aktualizujte <0>Nastavenia šifrovania</0>.",
    "topline_expired_certificate": "Váš SSL certifikát vypršal. Aktualizujte <0>Nastavenia šifrovania</0>.",
    "form_error_port_range": "Zadajte číslo portu v rozsahu 80-65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Bezpečné prehliadanie",
    "served_from_cache": "{{value}} <i>(prevzatá z cache pamäte)</i>",
    "form_error_password_length": "Heslo musí mať dĺžku aspoň {{value}} znakov",
-    "anonymizer_notification": "<0>Poznámka:</0> Anonymizácia IP je zapnutá. Môžete ju vypnúť vo <1>Všeobecných nastaveniach</1>.",
-    "confirm_dns_cache_clear": "Naozaj chcete vymazať vyrovnávaciu pamäť DNS?",
-    "cache_cleared": "Vyrovnávacia pamäť DNS bola úspešne vymazaná",
-    "clear_cache": "Vymazať vyrovnávaciu pamäť"
+    "anonymizer_notification": "<0>Poznámka:</0> Anonymizácia IP je zapnutá. Môžete ju vypnúť vo <1>Všeobecných nastaveniach</1>."
 }
--- a/client/src/__locales/sl.json
+++ b/client/src/__locales/sl.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Izdajatelj",
    "encryption_hostnames": "Imena gostiteljev",
    "encryption_reset": "Ali ste prepričani, da želite ponastaviti nastavitve šifriranja?",
-    "encryption_warning": "Opozorilo",
    "topline_expiring_certificate": "Vaš e digitalno potrdilo SSL bo kmalu poteklol. Posodobite <0>Nastavitve šifriranja</0>.",
    "topline_expired_certificate": "Vaše digitalno potrdilo SSL je poteklo. Posodobi <0>Nastavitve šifriranja</0>.",
    "form_error_port_range": "Vnesite številko vrat v razponu med 80-65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Varno brskanje",
    "served_from_cache": "{{value}} <i>(postreženo iz predpomnilnika)</i>",
    "form_error_password_length": "Geslo mora vsebovati najmanj {{value}} znakov",
-    "anonymizer_notification": "<0>Opomba:</0> Anonimizacija IP je omogočena. Onemogočite ga lahko v <1>Splošnih nastavitvah</1>.",
-    "confirm_dns_cache_clear": "Ali ste prepričani, da želite počistiti predpomnilnik DNS?",
-    "cache_cleared": "Predpomnilnik DNS je bil uspešno počiščen",
-    "clear_cache": "Počisti predpomnilnik"
+    "anonymizer_notification": "<0>Opomba:</0> Anonimizacija IP je omogočena. Onemogočite ga lahko v <1>Splošnih nastavitvah</1>."
 }
--- a/client/src/__locales/sr-cs.json
+++ b/client/src/__locales/sr-cs.json
@@ -215,7 +215,7 @@
    "example_upstream_udp": "uobičajen DNS (preko UDP, imena domaćina);",
    "example_upstream_dot": "šifrovano <0>DNS-over-TLS</0>;",
    "example_upstream_doh": "šifrovano <0>DNS-over-HTTPS</0>;",
-    "example_upstream_doh3": "šifrovani DNS-over-HTTPS sa prinudnim <0>HTTP/3</0> bez povratka na HTTP/2 ili ispod;",
+    "example_upstream_doh3": "šifrovani DNS-over-HTTPS sa prinudnim <0>HTTP/3</0> i bez povratka na HTTP/2 ili ispod;",
    "example_upstream_doq": "šifrovano <0>DNS-over-QUIC</0>;",
    "example_upstream_sdns": "<0>DNS brojeve</0> za <1>DNSCrypt</1> ili <2>DNS-over-HTTPS</2> razrešivače;",
    "example_upstream_tcp": "uobičajeni DNS (preko TCP);",
@@ -393,7 +393,6 @@
    "encryption_issuer": "Izdavač",
    "encryption_hostnames": "Imena hostova",
    "encryption_reset": "Jeste li sigurni da želite dda resetujete postavke šifrovanja?",
-    "encryption_warning": "Upozorenje",
    "topline_expiring_certificate": "Vaš SSL sertifikat uskoro ističe. Ažurirajte <0>postavke šifrovanja</0>.",
    "topline_expired_certificate": "Vaš SSL sertifikat je istekao. Ažurirajte <0>postavke šifrovanja</0>.",
    "form_error_port_range": "Unesite vrednost porta u opsegu od 80-65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Sigurno pregledanje",
    "served_from_cache": "{{value}} <i>(posluženo iz predmemorije)</i>",
    "form_error_password_length": "Lozinka mora imati najmanje {{value}} znakova",
-    "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"
+    "anonymizer_notification": "<0>Nota:</0> IP prepoznavanje je omogućeno. Možete ga onemogućiti u opštim <1>postavkama</1>."
 }
--- a/client/src/__locales/sv.json
+++ b/client/src/__locales/sv.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Utgivare",
    "encryption_hostnames": "Värdnamn",
    "encryption_reset": "Är du säker på att du vill återställa krypteringsinställningarna?",
-    "encryption_warning": "Varning",
    "topline_expiring_certificate": "Ditt SSL-certifikat håller på att gå ut. <0>Krypteringsinställningar</0>.",
    "topline_expired_certificate": "Ditt SSL-certifikat har gått ut. Uppdatera <0>Krypteringsinställningar</0>-",
    "form_error_port_range": "Ange ett portnummer inom värdena 80-65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Säker surfning",
    "served_from_cache": "{{value}} <i>(levereras från cache)</i>",
    "form_error_password_length": "Lösenordet måste vara minst {{value}} tecken långt",
-    "anonymizer_notification": "<0>Observera:</0> IP-anonymisering är aktiverad. Du kan inaktivera den i <1>Allmänna inställningar</1>.",
-    "confirm_dns_cache_clear": "Är du säker på att du vill rensa DNS-cache?",
-    "cache_cleared": "DNS-cacheminnet har rensats",
-    "clear_cache": "Rensa cache"
+    "anonymizer_notification": "<0>Observera:</0> IP-anonymisering är aktiverad. Du kan inaktivera den i <1>Allmänna inställningar</1>."
 }
--- a/client/src/__locales/th.json
+++ b/client/src/__locales/th.json
@@ -262,7 +262,6 @@
    "encryption_issuer": "ผู้ออกใบรับรอง:",
    "encryption_hostnames": "ชื่อโฮส",
    "encryption_reset": "คุณแน่ใจนะว่าจะล้างค่าการเข้ารหัส?",
-    "encryption_warning": "คำเตือน",
    "topline_expiring_certificate": "ใบรับรอง SSL ของคุณกำลังจะหมดอายุ กรุณาอัปเดท <0>การตั้งค่าเข้ารหัส</0>.",
    "topline_expired_certificate": "ใบรับรอง SSL ของคุณหมดอายุแล้ว กรุณาอัปเดท <0>การตั้งค่าเข้ารหัส</0>.",
    "form_error_port_unsafe": "เป็นพอร์ทที่ไม่ปลอดภัย",
--- a/client/src/__locales/tr.json
+++ b/client/src/__locales/tr.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Sağlayan",
    "encryption_hostnames": "Ana makine adları",
    "encryption_reset": "Şifreleme ayarlarını sıfırlamak istediğinizden emin misiniz?",
-    "encryption_warning": "Uyarı",
    "topline_expiring_certificate": "SSL sertifikanızın süresi sona üzere. <0>Şifreleme ayarlarını</0> güncelleyin.",
    "topline_expired_certificate": "SSL sertifikanızın süresi sona erdi. <0>Şifreleme ayarlarını</0> güncelleyin.",
    "form_error_port_range": "80-65535 aralığında geçerli bir bağlantı noktası değeri girin",
@@ -638,8 +637,5 @@
    "safe_browsing": "Güvenli Gezinti",
    "served_from_cache": "{{value}} <i>(önbellekten kullanıldı)</i>",
    "form_error_password_length": "Parola en az {{value}} karakter uzunluğunda olmalıdır",
-    "anonymizer_notification": "<0>Not:</0> IP anonimleştirme etkinleştirildi. Bunu <1>Genel ayarlardan</1> devre dışı bırakabilirsiniz.",
-    "confirm_dns_cache_clear": "DNS önbelleğini temizlemek istediğinizden emin misiniz?",
-    "cache_cleared": "DNS önbelleği başarıyla temizlendi",
-    "clear_cache": "Önbelleği temizle"
+    "anonymizer_notification": "<0>Not:</0> IP anonimleştirme etkinleştirildi. Bunu <1>Genel ayarlardan</1> devre dışı bırakabilirsiniz."
 }
--- a/client/src/__locales/uk.json
+++ b/client/src/__locales/uk.json
@@ -371,7 +371,7 @@
    "encryption_redirect": "Автоматично перенаправляти на HTTPS",
    "encryption_redirect_desc": "Якщо встановлено, AdGuard Home автоматично перенаправить вас з HTTP на адреси HTTPS.",
    "encryption_https": "Порт HTTPS",
-    "encryption_https_desc": "Якщо HTTPS-порт налаштовано, інтерфейс адміністратора AdGuard Home буде доступний через HTTPS, а також сервер DNS-over-HTTPS буде доступний за адресою '/dns-query'.",
+    "encryption_https_desc": "Якщо HTTPS-порт налаштовано, інтерфейс адміністратора AdGuard Home буде доступний через HTTPS, а також DNS-over-HTTPS-сервер буде доступний за адресою /dns-query.",
    "encryption_dot": "Порт DNS-over-TLS",
    "encryption_dot_desc": "Якщо цей порт налаштовано, AdGuard Home запустить на цьому порту сервер DNS-over-TLS.",
    "encryption_doq": "Порт DNS-over-QUIC",
@@ -393,7 +393,6 @@
    "encryption_issuer": "Видавець",
    "encryption_hostnames": "Назви вузлів",
    "encryption_reset": "Ви впевнені, що хочете скинути налаштування шифрування?",
-    "encryption_warning": "Попередження",
    "topline_expiring_certificate": "Ваш сертифікат SSL скоро закінчиться. Оновіть <0>Налаштування шифрування</0>.",
    "topline_expired_certificate": "Термін дії вашого сертифіката SSL закінчився. Оновіть <0>Налаштування шифрування</0>.",
    "form_error_port_range": "Введіть значення порту в діапазоні 80−65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Безпечний перегляд",
    "served_from_cache": "{{value}} <i>(отримано з кешу)</i>",
    "form_error_password_length": "Пароль мусить мати принаймні {{value}} символів",
-    "anonymizer_notification": "<0>Примітка:</0> IP-анонімізацію ввімкнено. Ви можете вимкнути його в <1>Загальні налаштування</1> .",
-    "confirm_dns_cache_clear": "Ви впевнені, що бажаєте очистити кеш DNS?",
-    "cache_cleared": "Кеш DNS успішно очищено",
-    "clear_cache": "Очистити кеш"
+    "anonymizer_notification": "<0>Примітка:</0> IP-анонімізацію ввімкнено. Ви можете вимкнути його в <1>Загальні налаштування</1> ."
 }
--- a/client/src/__locales/vi.json
+++ b/client/src/__locales/vi.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "Phát hành",
    "encryption_hostnames": "Tên máy chủ",
    "encryption_reset": "Bạn có chắc chắn muốn đặt lại cài đặt mã hóa?",
-    "encryption_warning": "Cảnh báo",
    "topline_expiring_certificate": "Chứng chỉ SSL của bạn sắp hết hạn. Cập nhật <0>Cài đặt mã hóa</0>.",
    "topline_expired_certificate": "Chứng chỉ SSL của bạn đã hết hạn. Cập nhật <0>Cài đặt mã hóa</0>.",
    "form_error_port_range": "Nhập giá trị cổng trong phạm vi 80-65535",
@@ -638,8 +637,5 @@
    "safe_browsing": "Duyệt web an toàn",
    "served_from_cache": "{{value}} <i>(được phục vụ từ bộ nhớ cache)</i>",
    "form_error_password_length": "Mật khẩu phải có ít nhất {{value}} ký tự",
-    "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"
+    "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>."
 }
--- a/client/src/__locales/zh-cn.json
+++ b/client/src/__locales/zh-cn.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "颁发者",
    "encryption_hostnames": "主机名",
    "encryption_reset": "您确定想要重置加密设置？",
-    "encryption_warning": "警告",
    "topline_expiring_certificate": "您的 SSL 证书即将过期。请更新 <0>加密设置</0> 。",
    "topline_expired_certificate": "您的 SSL 证书已过期。请更新 <0>加密设置</0> 。",
    "form_error_port_range": "输入 80 - 65535 范围内的端口值",
@@ -638,8 +637,5 @@
    "safe_browsing": "安全浏览",
    "served_from_cache": "{{value}}<i>(由缓存提供)</i>",
    "form_error_password_length": "密码必须至少有 {{value}} 个字符",
-    "anonymizer_notification": "<0>注意：</0> IP 匿名化已启用。您可以在<1>常规设置</1>中禁用它。",
-    "confirm_dns_cache_clear": "您确定要清除 DNS 缓存吗？",
-    "cache_cleared": "已成功清除 DNS 缓存",
-    "clear_cache": "清除缓存"
+    "anonymizer_notification": "<0>注意：</0> IP 匿名化已启用。您可以在<1>常规设置</1>中禁用它。"
 }
--- a/client/src/__locales/zh-hk.json
+++ b/client/src/__locales/zh-hk.json
@@ -381,7 +381,6 @@
    "encryption_issuer": "簽發者",
    "encryption_hostnames": "主機名稱",
    "encryption_reset": "您確定要重設加密設定嗎？",
-    "encryption_warning": "警告",
    "topline_expiring_certificate": "您的 SSL 憑證即將到期。請前往<0>加密設定</0>更新。",
    "topline_expired_certificate": "您的 SSL 憑證已到期。請前往<0>加密設定</0>更新。",
    "form_error_port_range": "輸入範圍 80-65535 中的值",
--- a/client/src/__locales/zh-tw.json
+++ b/client/src/__locales/zh-tw.json
@@ -393,7 +393,6 @@
    "encryption_issuer": "簽發者",
    "encryption_hostnames": "主機名稱",
    "encryption_reset": "您確定您想要重置加密設定嗎？",
-    "encryption_warning": "警告",
    "topline_expiring_certificate": "您的安全通訊端層（SSL）憑證即將到期。更新<0>加密設定</0>。",
    "topline_expired_certificate": "您的安全通訊端層（SSL）憑證為已到期的。更新<0>加密設定</0>。",
    "form_error_port_range": "輸入在 80-65535 之範圍內的連接埠號碼",
@@ -638,8 +637,5 @@
    "safe_browsing": "安全瀏覽",
    "served_from_cache": "{{value}} <i>(由快取提供)</i>",
    "form_error_password_length": "密碼必須為至少長 {{value}} 個字元",
-    "anonymizer_notification": "<0>注意：</0>IP 匿名化被啟用。您可在<1>一般設定</1>中禁用它。",
-    "confirm_dns_cache_clear": "您確定您想要清除 DNS 快取嗎？",
-    "cache_cleared": "DNS 快取被成功地清除",
-    "clear_cache": "清除快取"
+    "anonymizer_notification": "<0>注意：</0>IP 匿名化被啟用。您可在<1>一般設定</1>中禁用它。"
 }
--- a/client/src/actions/dnsConfig.js
+++ b/client/src/actions/dnsConfig.js
@@ -1,5 +1,4 @@
 import { createAction } from 'redux-actions';
-import i18next from 'i18next';

 import apiClient from '../api/Api';
 import { splitByNewLine } from '../helpers/helpers';
@@ -20,22 +19,6 @@ export const getDnsConfig = () => async (dispatch) => {
    }
 };

-export const clearDnsCacheRequest = createAction('CLEAR_DNS_CACHE_REQUEST');
-export const clearDnsCacheFailure = createAction('CLEAR_DNS_CACHE_FAILURE');
-export const clearDnsCacheSuccess = createAction('CLEAR_DNS_CACHE_SUCCESS');
-
-export const clearDnsCache = () => async (dispatch) => {
-    dispatch(clearDnsCacheRequest());
-    try {
-        const data = await apiClient.clearCache();
-        dispatch(clearDnsCacheSuccess(data));
-        dispatch(addSuccessToast(i18next.t('cache_cleared')));
-    } catch (error) {
-        dispatch(addErrorToast({ error }));
-        dispatch(clearDnsCacheFailure());
-    }
-};
-
 export const setDnsConfigRequest = createAction('SET_DNS_CONFIG_REQUEST');
 export const setDnsConfigFailure = createAction('SET_DNS_CONFIG_FAILURE');
 export const setDnsConfigSuccess = createAction('SET_DNS_CONFIG_SUCCESS');
--- a/client/src/actions/services.js
+++ b/client/src/actions/services.js
@@ -32,21 +32,6 @@ export const getBlockedServices = () => async (dispatch) => {
    }
 };

-export const getAllBlockedServicesRequest = createAction('GET_ALL_BLOCKED_SERVICES_REQUEST');
-export const getAllBlockedServicesFailure = createAction('GET_ALL_BLOCKED_SERVICES_FAILURE');
-export const getAllBlockedServicesSuccess = createAction('GET_ALL_BLOCKED_SERVICES_SUCCESS');
-
-export const getAllBlockedServices = () => async (dispatch) => {
-    dispatch(getAllBlockedServicesRequest());
-    try {
-        const data = await apiClient.getAllBlockedServices();
-        dispatch(getAllBlockedServicesSuccess(data));
-    } catch (error) {
-        dispatch(addErrorToast({ error }));
-        dispatch(getAllBlockedServicesFailure());
-    }
-};
-
 export const setBlockedServicesRequest = createAction('SET_BLOCKED_SERVICES_REQUEST');
 export const setBlockedServicesFailure = createAction('SET_BLOCKED_SERVICES_FAILURE');
 export const setBlockedServicesSuccess = createAction('SET_BLOCKED_SERVICES_SUCCESS');
--- a/client/src/api/Api.js
+++ b/client/src/api/Api.js
@@ -465,18 +465,11 @@ class Api {

    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);
-    }
-
    getBlockedServices() {
        const { path, method } = this.BLOCKED_SERVICES_LIST;
        return this.makeRequest(path, method);
@@ -593,14 +586,6 @@ class Api {
        };
        return this.makeRequest(path, method, config);
    }
-
-    // Cache
-    CLEAR_CACHE = { path: 'cache_clear', method: 'POST' };
-
-    clearCache() {
-        const { path, method } = this.CLEAR_CACHE;
-        return this.makeRequest(path, method);
-    }
 }

 const apiClient = new Api();
--- a/client/src/components/Filters/DnsBlocklist.js
+++ b/client/src/components/Filters/DnsBlocklist.js
@@ -15,7 +15,7 @@ import {
    getObjDiff,
 } from '../../helpers/helpers';

-import filtersCatalog from '../../helpers/filters/filters';
+const filtersCatalog = require('../../helpers/filters/filters.json');

 class DnsBlocklist extends Component {
    componentDidMount() {
--- a/client/src/components/Filters/Form.js
+++ b/client/src/components/Filters/Form.js
@@ -7,7 +7,8 @@ import classNames from 'classnames';
 import { validatePath, validateRequiredValue } from '../../helpers/validators';
 import { CheckboxField, renderInputField } from '../../helpers/form';
 import { MODAL_OPEN_TIMEOUT, MODAL_TYPE, FORM_NAME } from '../../helpers/constants';
-import filtersCatalog from '../../helpers/filters/filters';
+
+const filtersCatalog = require('../../helpers/filters/filters.json');

 const getIconsData = (homepage, source) => ([
    {
--- a/client/src/components/Filters/Services/Form.js
+++ b/client/src/components/Filters/Services/Form.js
@@ -6,11 +6,10 @@ import flow from 'lodash/flow';

 import { toggleAllServices } from '../../../helpers/helpers';
 import { renderServiceField } from '../../../helpers/form';
-import { FORM_NAME } from '../../../helpers/constants';
+import { FORM_NAME, SERVICES } from '../../../helpers/constants';

 const Form = (props) => {
    const {
-        blockedServices,
        handleSubmit,
        change,
        pristine,
@@ -28,7 +27,7 @@ const Form = (props) => {
                            type="button"
                            className="btn btn-secondary btn-block"
                            disabled={processing || processingSet}
-                            onClick={() => toggleAllServices(blockedServices, change, true)}
+                            onClick={() => toggleAllServices(SERVICES, change, true)}
                        >
                            <Trans>block_all</Trans>
                        </button>
@@ -38,17 +37,17 @@ const Form = (props) => {
                            type="button"
                            className="btn btn-secondary btn-block"
                            disabled={processing || processingSet}
-                            onClick={() => toggleAllServices(blockedServices, change, false)}
+                            onClick={() => toggleAllServices(SERVICES, change, false)}
                        >
                            <Trans>unblock_all</Trans>
                        </button>
                    </div>
                </div>
                <div className="services">
-                    {blockedServices.map((service) => (
+                    {SERVICES.map((service) => (
                        <Field
                            key={service.id}
-                            icon={service.icon_svg}
+                            icon={`service_${service.id}`}
                            name={`blocked_services.${service.id}`}
                            type="checkbox"
                            component={renderServiceField}
@@ -73,7 +72,6 @@ const Form = (props) => {
 };

 Form.propTypes = {
-    blockedServices: PropTypes.array.isRequired,
    pristine: PropTypes.bool.isRequired,
    handleSubmit: PropTypes.func.isRequired,
    change: PropTypes.func.isRequired,
--- a/client/src/components/Filters/Services/index.js
+++ b/client/src/components/Filters/Services/index.js
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 import Form from './Form';
 import Card from '../../ui/Card';
-import { getBlockedServices, getAllBlockedServices, setBlockedServices } from '../../../actions/services';
+import { getBlockedServices, setBlockedServices } from '../../../actions/services';
 import PageTitle from '../../ui/PageTitle';

 const getInitialDataForServices = (initial) => (initial ? initial.reduce(
@@ -21,7 +21,6 @@ const Services = () => {

    useEffect(() => {
        dispatch(getBlockedServices());
-        dispatch(getAllBlockedServices());
    }, []);

    const handleSubmit = (values) => {
@@ -50,7 +49,6 @@ const Services = () => {
                <div className="form">
                    <Form
                        initialValues={initialValues}
-                        blockedServices={services.allServices}
                        processing={services.processing}
                        processingSet={services.processingSet}
                        onSubmit={handleSubmit}
--- a/client/src/components/Logs/Cells/ResponseCell.js
+++ b/client/src/components/Logs/Cells/ResponseCell.js
@@ -27,7 +27,6 @@ const ResponseCell = ({
    const filters = useSelector((state) => state.filtering.filters, shallowEqual);
    const whitelistFilters = useSelector((state) => state.filtering.whitelistFilters, shallowEqual);
    const isDetailed = useSelector((state) => state.queryLogs.isDetailed);
-    const services = useSelector((store) => store?.services);

    const formattedElapsedMs = formatElapsedMs(elapsedMs, t);

@@ -61,8 +60,8 @@ const ResponseCell = ({
        install_settings_dns: upstreamString,
        elapsed: formattedElapsedMs,
        response_code: status,
-        ...(service_name && services.allServices
-                && { service_name: getServiceName(services.allServices, service_name) }
+        ...(service_name
+                && { service_name: getServiceName(service_name) }
        ),
        ...(rules.length > 0
                && { rule_label: getRulesToFilterList(rules, filters, whitelistFilters) }
@@ -81,10 +80,10 @@ const ResponseCell = ({
    const getDetailedInfo = (reason) => {
        switch (reason) {
            case FILTERED_STATUS.FILTERED_BLOCKED_SERVICE:
-                if (!service_name || !services.allServices) {
+                if (!service_name) {
                    return formattedElapsedMs;
                }
-                return getServiceName(services.allServices, service_name);
+                return getServiceName(service_name);
            case FILTERED_STATUS.FILTERED_BLACK_LIST:
            case FILTERED_STATUS.NOT_FILTERED_WHITE_LIST:
                return getFilterNames(rules, filters, whitelistFilters).join(', ');
--- a/client/src/components/Logs/Cells/index.js
+++ b/client/src/components/Logs/Cells/index.js
@@ -52,7 +52,6 @@ const Row = memo(({
    const autoClients = useSelector((state) => state.dashboard.autoClients, shallowEqual);
    const processingSet = useSelector((state) => state.access.processingSet);
    const allowedСlients = useSelector((state) => state.access.allowed_clients, shallowEqual);
-    const services = useSelector((store) => store?.services);

    const clients = useSelector((state) => state.dashboard.clients);

@@ -176,8 +175,8 @@ const Row = memo(({
            date: formatDateTime(time, DEFAULT_SHORT_DATE_FORMAT_OPTIONS),
            encryption_status: isBlocked
                ? <div className="bg--danger">{requestStatus}</div> : requestStatus,
-            ...(FILTERED_STATUS.FILTERED_BLOCKED_SERVICE && service_name && services.allServices
-                && { service_name: getServiceName(services.allServices, service_name) }),
+            ...(FILTERED_STATUS.FILTERED_BLOCKED_SERVICE && service_name
+                && { service_name: getServiceName(service_name) }),
            domain,
            type_table_header: type,
            protocol,
--- a/client/src/components/Logs/index.js
+++ b/client/src/components/Logs/index.js
@@ -16,7 +16,6 @@ import { getFilteringStatus } from '../../actions/filtering';
 import { getClients } from '../../actions';
 import { getDnsConfig } from '../../actions/dnsConfig';
 import { getAccessList } from '../../actions/access';
-import { getAllBlockedServices } from '../../actions/services';
 import {
    getLogsConfig,
    resetFilteredLogs,
@@ -131,7 +130,6 @@ const Logs = () => {
            setIsLoading(true);
            dispatch(getFilteringStatus());
            dispatch(getClients());
-            dispatch(getAllBlockedServices());
            try {
                await Promise.all([
                    dispatch(getLogsConfig()),
--- a/client/src/components/Settings/Clients/ClientsTable/ClientsTable.js
+++ b/client/src/components/Settings/Clients/ClientsTable/ClientsTable.js
@@ -1,57 +1,25 @@
-/* eslint-disable react/display-name */
-/* eslint-disable react/prop-types */
-import React, { useEffect } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
-import { Trans, useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'react-redux';
+import { Trans, withTranslation } from 'react-i18next';
 import ReactTable from 'react-table';

-import { getAllBlockedServices } from '../../../../actions/services';
-import {
-    splitByNewLine,
-    countClientsStatistics,
-    sortIp,
-    getService,
-} from '../../../../helpers/helpers';
-import { MODAL_TYPE } from '../../../../helpers/constants';
-import Card from '../../../ui/Card';
-import CellWrap from '../../../ui/CellWrap';
-import LogsSearchLink from '../../../ui/LogsSearchLink';
-import Modal from '../Modal';
+import { MODAL_TYPE } from '../../../helpers/constants';
+import { splitByNewLine, countClientsStatistics, sortIp } from '../../../helpers/helpers';
+import Card from '../../ui/Card';
+import Modal from './Modal';
+import CellWrap from '../../ui/CellWrap';
+import LogsSearchLink from '../../ui/LogsSearchLink';

-const ClientsTable = ({
-    clients,
-    normalizedTopClients,
-    isModalOpen,
-    modalClientName,
-    modalType,
-    addClient,
-    updateClient,
-    deleteClient,
-    toggleClientModal,
-    processingAdding,
-    processingDeleting,
-    processingUpdating,
-    getStats,
-    supportedTags,
-}) => {
-    const [t] = useTranslation();
-    const dispatch = useDispatch();
-    const services = useSelector((store) => store?.services);
-
-    useEffect(() => {
-        dispatch(getAllBlockedServices());
-    }, []);
-
-    const handleFormAdd = (values) => {
-        addClient(values);
+class ClientsTable extends Component {
+    handleFormAdd = (values) => {
+        this.props.addClient(values);
    };

-    const handleFormUpdate = (values, name) => {
-        updateClient(values, name);
+    handleFormUpdate = (values, name) => {
+        this.props.updateClient(values, name);
    };

-    const handleSubmit = (values) => {
+    handleSubmit = (values) => {
        const config = values;

        if (values) {
@@ -74,21 +42,21 @@ const ClientsTable = ({
            }
        }

-        if (modalType === MODAL_TYPE.EDIT_FILTERS) {
-            handleFormUpdate(config, modalClientName);
+        if (this.props.modalType === MODAL_TYPE.EDIT_FILTERS) {
+            this.handleFormUpdate(config, this.props.modalClientName);
        } else {
-            handleFormAdd(config);
+            this.handleFormAdd(config);
        }
    };

-    const getOptionsWithLabels = (options) => (
+    getOptionsWithLabels = (options) => (
        options.map((option) => ({
            value: option,
            label: option,
        }))
    );

-    const getClient = (name, clients) => {
+    getClient = (name, clients) => {
        const client = clients.find((item) => name === item.name);

        if (client) {
@@ -97,7 +65,7 @@ const ClientsTable = ({
            } = client;
            return {
                upstreams: (upstreams && upstreams.join('\n')) || '',
-                tags: (tags && getOptionsWithLabels(tags)) || [],
+                tags: (tags && this.getOptionsWithLabels(tags)) || [],
                ...values,
            };
        }
@@ -110,17 +78,17 @@ const ClientsTable = ({
        };
    };

-    const handleDelete = (data) => {
+    handleDelete = (data) => {
        // eslint-disable-next-line no-alert
-        if (window.confirm(t('client_confirm_delete', { key: data.name }))) {
-            deleteClient(data);
-            getStats();
+        if (window.confirm(this.props.t('client_confirm_delete', { key: data.name }))) {
+            this.props.deleteClient(data);
+            this.props.getStats();
        }
    };

-    const columns = [
+    columns = [
        {
-            Header: t('table_client'),
+            Header: this.props.t('table_client'),
            accessor: 'ids',
            minWidth: 150,
            Cell: (row) => {
@@ -141,13 +109,13 @@ const ClientsTable = ({
            sortMethod: sortIp,
        },
        {
-            Header: t('table_name'),
+            Header: this.props.t('table_name'),
            accessor: 'name',
            minWidth: 120,
            Cell: CellWrap,
        },
        {
-            Header: t('settings'),
+            Header: this.props.t('settings'),
            accessor: 'use_global_settings',
            minWidth: 120,
            Cell: ({ value }) => {
@@ -165,7 +133,7 @@ const ClientsTable = ({
            },
        },
        {
-            Header: t('blocked_services'),
+            Header: this.props.t('blocked_services'),
            accessor: 'blocked_services',
            minWidth: 180,
            Cell: (row) => {
@@ -175,40 +143,25 @@ const ClientsTable = ({
                    return <Trans>settings_global</Trans>;
                }

-                if (value && services.allServices) {
-                    return (
-                        <div className="logs__row logs__row--icons">
-                            {value.map((service) => {
-                                const serviceInfo = getService(services.allServices, service);
-
-                                if (serviceInfo?.icon_svg) {
-                                    return (
-                                        <div
-                                            key={serviceInfo.name}
-                                            dangerouslySetInnerHTML={{
-                                                __html: window.atob(serviceInfo.icon_svg),
-                                            }}
-                                            className="service__icon service__icon--table"
-                                            title={serviceInfo.name}
-                                        />
-                                    );
-                                }
-
-                                return null;
-                            })}
-                        </div>
-                    );
-                }
-
                return (
                    <div className="logs__row logs__row--icons">
-                        –
+                        {value && value.length > 0
+                            ? value.map((service) => (
+                                <svg
+                                    className="service__icon service__icon--table"
+                                    title={service}
+                                    key={service}
+                                >
+                                    <use xlinkHref={`#service_${service}`} />
+                                </svg>
+                            ))
+                            : '–'}
                    </div>
                );
            },
        },
        {
-            Header: t('upstreams'),
+            Header: this.props.t('upstreams'),
            accessor: 'upstreams',
            minWidth: 120,
            Cell: ({ value }) => {
@@ -226,7 +179,7 @@ const ClientsTable = ({
            },
        },
        {
-            Header: t('tags_title'),
+            Header: this.props.t('tags_title'),
            accessor: 'tags',
            minWidth: 140,
            Cell: (row) => {
@@ -250,11 +203,11 @@ const ClientsTable = ({
            },
        },
        {
-            Header: t('requests_count'),
+            Header: this.props.t('requests_count'),
            id: 'statistics',
            accessor: (row) => countClientsStatistics(
                row.ids,
-                normalizedTopClients.auto,
+                this.props.normalizedTopClients.auto,
            ),
            sortMethod: (a, b) => b - a,
            minWidth: 120,
@@ -269,13 +222,16 @@ const ClientsTable = ({
            },
        },
        {
-            Header: t('actions_table_header'),
+            Header: this.props.t('actions_table_header'),
            accessor: 'actions',
            maxWidth: 100,
            sortable: false,
            resizable: false,
            Cell: (row) => {
                const clientName = row.original.name;
+                const {
+                    toggleClientModal, processingDeleting, processingUpdating, t,
+                } = this.props;

                return (
                    <div className="logs__row logs__row--center">
@@ -297,7 +253,7 @@ const ClientsTable = ({
                        <button
                            type="button"
                            className="btn btn-icon btn-outline-secondary btn-sm"
-                            onClick={() => handleDelete({ name: clientName })}
+                            onClick={() => this.handleDelete({ name: clientName })}
                            disabled={processingDeleting}
                            title={t('delete_table_action')}
                        >
@@ -311,61 +267,76 @@ const ClientsTable = ({
        },
    ];

-    const currentClientData = getClient(modalClientName, clients);
-    const tagsOptions = getOptionsWithLabels(supportedTags);
+    render() {
+        const {
+            t,
+            clients,
+            isModalOpen,
+            modalType,
+            modalClientName,
+            toggleClientModal,
+            processingAdding,
+            processingUpdating,
+            supportedTags,
+        } = this.props;

-    return (
-        <Card
-            title={t('clients_title')}
-            subtitle={t('clients_desc')}
-            bodyType="card-body box-body--settings"
-        >
-            <>
-                <ReactTable
-                    data={clients || []}
-                    columns={columns}
-                    defaultSorted={[
-                        {
-                            id: 'statistics',
-                            asc: true,
-                        },
-                    ]}
-                    className="-striped -highlight card-table-overflow"
-                    showPagination
-                    defaultPageSize={10}
-                    minRows={5}
-                    ofText="/"
-                    previousText={t('previous_btn')}
-                    nextText={t('next_btn')}
-                    pageText={t('page_table_footer_text')}
-                    rowsText={t('rows_table_footer_text')}
-                    loadingText={t('loading_table_status')}
-                    noDataText={t('clients_not_found')}
-                />
-                <button
-                    type="button"
-                    className="btn btn-success btn-standard mt-3"
-                    onClick={() => toggleClientModal(MODAL_TYPE.ADD_FILTERS)}
-                    disabled={processingAdding}
-                >
-                    <Trans>client_add</Trans>
-                </button>
-                <Modal
-                    isModalOpen={isModalOpen}
-                    modalType={modalType}
-                    toggleClientModal={toggleClientModal}
-                    currentClientData={currentClientData}
-                    handleSubmit={handleSubmit}
-                    processingAdding={processingAdding}
-                    processingUpdating={processingUpdating}
-                    tagsOptions={tagsOptions}
-                />
-            </>
-        </Card>
-    );
-};
+        const currentClientData = this.getClient(modalClientName, clients);
+        const tagsOptions = this.getOptionsWithLabels(supportedTags);
+
+        return (
+            <Card
+                title={t('clients_title')}
+                subtitle={t('clients_desc')}
+                bodyType="card-body box-body--settings"
+            >
+                <Fragment>
+                    <ReactTable
+                        data={clients || []}
+                        columns={this.columns}
+                        defaultSorted={[
+                            {
+                                id: 'statistics',
+                                asc: true,
+                            },
+                        ]}
+                        className="-striped -highlight card-table-overflow"
+                        showPagination
+                        defaultPageSize={10}
+                        minRows={5}
+                        ofText="/"
+                        previousText={t('previous_btn')}
+                        nextText={t('next_btn')}
+                        pageText={t('page_table_footer_text')}
+                        rowsText={t('rows_table_footer_text')}
+                        loadingText={t('loading_table_status')}
+                        noDataText={t('clients_not_found')}
+                    />
+                    <button
+                        type="button"
+                        className="btn btn-success btn-standard mt-3"
+                        onClick={() => toggleClientModal(MODAL_TYPE.ADD_FILTERS)}
+                        disabled={processingAdding}
+                    >
+                        <Trans>client_add</Trans>
+                    </button>
+                    <Modal
+                        isModalOpen={isModalOpen}
+                        modalType={modalType}
+                        toggleClientModal={toggleClientModal}
+                        currentClientData={currentClientData}
+                        handleSubmit={this.handleSubmit}
+                        processingAdding={processingAdding}
+                        processingUpdating={processingUpdating}
+                        tagsOptions={tagsOptions}
+                    />
+                </Fragment>
+            </Card>
+        );
+    }
+}

 ClientsTable.propTypes = {
+    t: PropTypes.func.isRequired,
    clients: PropTypes.array.isRequired,
    normalizedTopClients: PropTypes.object.isRequired,
    toggleClientModal: PropTypes.func.isRequired,
@@ -382,4 +353,4 @@ ClientsTable.propTypes = {
    supportedTags: PropTypes.array.isRequired,
 };

-export default ClientsTable;
+export default withTranslation()(ClientsTable);
--- a/client/src/components/Settings/Clients/ClientsTable/index.js
+++ b/client/src/components/Settings/Clients/ClientsTable/index.js
@@ -1 +0,0 @@
-export { default as ClientsTable } from './ClientsTable';
--- a/client/src/components/Settings/Clients/Form.js
+++ b/client/src/components/Settings/Clients/Form.js
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { connect, useSelector } from 'react-redux';
+import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import {
    Field, FieldArray, reduxForm, formValueSelector,
@@ -19,7 +19,7 @@ import {
    renderServiceField,
 } from '../../../helpers/form';
 import { validateClientId, validateRequiredValue } from '../../../helpers/validators';
-import { CLIENT_ID_LINK, FORM_NAME } from '../../../helpers/constants';
+import { CLIENT_ID_LINK, FORM_NAME, SERVICES } from '../../../helpers/constants';
 import './Service.css';

 const settingsCheckboxes = [
@@ -139,7 +139,6 @@ let Form = (props) => {
        invalid,
        tagsOptions,
    } = props;
-    const services = useSelector((store) => store?.services);

    const [activeTabLabel, setActiveTabLabel] = useState('settings');

@@ -181,9 +180,7 @@ let Form = (props) => {
                                type="button"
                                className="btn btn-secondary btn-block"
                                disabled={useGlobalServices}
-                                onClick={() => (
-                                    toggleAllServices(services.allServices, change, true)
-                                )}
+                                onClick={() => toggleAllServices(SERVICES, change, true)}
                            >
                                <Trans>block_all</Trans>
                            </button>
@@ -193,29 +190,25 @@ let Form = (props) => {
                                type="button"
                                className="btn btn-secondary btn-block"
                                disabled={useGlobalServices}
-                                onClick={() => (
-                                    toggleAllServices(services.allServices, change, false)
-                                )}
+                                onClick={() => toggleAllServices(SERVICES, change, false)}
                            >
                                <Trans>unblock_all</Trans>
                            </button>
                        </div>
                    </div>
-                    {services.allServices.length > 0 && (
-                        <div className="services">
-                            {services.allServices.map((service) => (
-                                <Field
-                                    key={service.id}
-                                    icon={service.icon_svg}
-                                    name={`blocked_services.${service.id}`}
-                                    type="checkbox"
-                                    component={renderServiceField}
-                                    placeholder={service.name}
-                                    disabled={useGlobalServices}
-                                />
-                            ))}
-                        </div>
-                    )}
+                    <div className="services">
+                        {SERVICES.map((service) => (
+                            <Field
+                                key={service.id}
+                                icon={`service_${service.id}`}
+                                name={`blocked_services.${service.id}`}
+                                type="checkbox"
+                                component={renderServiceField}
+                                placeholder={service.name}
+                                disabled={useGlobalServices}
+                            />
+                        ))}
+                    </div>
                </div>
            </div>,
        },
--- a/client/src/components/Settings/Clients/Service.css
+++ b/client/src/components/Settings/Clients/Service.css
@@ -9,12 +9,6 @@
    cursor: pointer;
 }

-.service__text {
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-}
-
@media screen and (min-width: 768px) {
    .services {
        display: flex;
@@ -39,7 +33,7 @@
        margin-right: 30px;
        margin-left: 0;
    }
-
+    
    .service:nth-child(3n) {
        margin-right: 0;
        margin-left: auto;
--- a/client/src/components/Settings/Clients/index.js
+++ b/client/src/components/Settings/Clients/index.js
@@ -2,7 +2,7 @@ import React, { Component, Fragment } from 'react';
 import { withTranslation } from 'react-i18next';
 import PropTypes from 'prop-types';

-import { ClientsTable } from './ClientsTable';
+import ClientsTable from './ClientsTable';
 import AutoClients from './AutoClients';
 import PageTitle from '../../ui/PageTitle';
 import Loading from '../../ui/Loading';
--- a/client/src/components/Settings/Dhcp/FormDHCPv4.js
+++ b/client/src/components/Settings/Dhcp/FormDHCPv4.js
@@ -74,6 +74,7 @@ const FormDHCPv4 = ({
                        className="form-control"
                        placeholder={t(ipv4placeholders.subnet_mask)}
                        validate={[
+                            validateIpv4,
                            validateRequired,
                            validateGatewaySubnetMask,
                        ]}
@@ -96,6 +97,7 @@ const FormDHCPv4 = ({
                                placeholder={t(ipv4placeholders.range_start)}
                                validate={[
                                    validateIpv4,
+                                    validateGatewaySubnetMask,
                                    validateIpForGatewaySubnetMask,
                                ]}
                                disabled={!isInterfaceIncludesIpv4}
@@ -111,6 +113,7 @@ const FormDHCPv4 = ({
                                validate={[
                                    validateIpv4,
                                    validateIpv4RangeEnd,
+                                    validateGatewaySubnetMask,
                                    validateIpForGatewaySubnetMask,
                                ]}
                                disabled={!isInterfaceIncludesIpv4}
--- a/client/src/components/Settings/Dns/Cache/Form.js
+++ b/client/src/components/Settings/Dns/Cache/Form.js
@@ -2,12 +2,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Field, reduxForm } from 'redux-form';
 import { Trans, useTranslation } from 'react-i18next';
-import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-
+import { shallowEqual, useSelector } from 'react-redux';
 import { renderInputField, toNumber, CheckboxField } from '../../../../helpers/form';
 import { CACHE_CONFIG_FIELDS, FORM_NAME, UINT32_RANGE } from '../../../../helpers/constants';
 import { replaceZeroWithEmptyString } from '../../../../helpers/helpers';
-import { clearDnsCache } from '../../../../actions/dnsConfig';

 const INPUTS_FIELDS = [
    {
@@ -34,7 +32,6 @@ const Form = ({
    handleSubmit, submitting, invalid,
 }) => {
    const { t } = useTranslation();
-    const dispatch = useDispatch();

    const { processingSetConfig } = useSelector((state) => state.dnsConfig, shallowEqual);
    const {
@@ -43,12 +40,6 @@ const Form = ({

    const minExceedsMax = cache_ttl_min > cache_ttl_max;

-    const handleClearCache = () => {
-        if (window.confirm(t('confirm_dns_cache_clear'))) {
-            dispatch(clearDnsCache());
-        }
-    };
-
    return <form onSubmit={handleSubmit}>
        <div className="row">
            {INPUTS_FIELDS.map(({
@@ -106,13 +97,6 @@ const Form = ({
        >
            <Trans>save_btn</Trans>
        </button>
-        <button
-            type="button"
-            className="btn btn-outline-secondary btn-standard form__button"
-            onClick={handleClearCache}
-        >
-            <Trans>clear_cache</Trans>
-        </button>
    </form>;
 };

--- a/client/src/components/Settings/Encryption/Form.js
+++ b/client/src/components/Settings/Encryption/Form.js
@@ -56,26 +56,6 @@ const clearFields = (change, setTlsConfig, t) => {
    }
 };

-const validationMessage = (warningValidation, isWarning) => {
-    if (!warningValidation) {
-        return null;
-    }
-
-    if (isWarning) {
-        return (
-            <div className="col-12">
-                <p><Trans>encryption_warning</Trans>: {warningValidation}</p>
-            </div>
-        );
-    }
-
-    return (
-        <div className="col-12">
-            <p className="text-danger">{warningValidation}</p>
-        </div>
-    );
-};
-
 let Form = (props) => {
    const {
        t,
@@ -115,8 +95,6 @@ let Form = (props) => {
        || !valid_cert
        || !valid_pair;

-    const isWarning = valid_key && valid_cert && valid_pair;
-
    return (
        <form onSubmit={handleSubmit}>
            <div className="row">
@@ -404,7 +382,11 @@ let Form = (props) => {
                        )}
                    </div>
                </div>
-                {validationMessage(warning_validation, isWarning)}
+                {warning_validation && (
+                    <div className="col-12">
+                        <p className="text-danger">{warning_validation}</p>
+                    </div>
+                )}
            </div>

            <div className="btn-list mt-2">
--- a/client/src/components/ui/Icons.js
+++ b/client/src/components/ui/Icons.js
--- a/client/src/components/ui/Tabler.css
+++ b/client/src/components/ui/Tabler.css
@@ -15452,7 +15452,6 @@ a.tag-addon:hover {
 }

 .custom-switch-indicator {
-    flex-shrink: 0;
    display: inline-block;
    height: 1.25rem;
    width: 2.25rem;
--- a/client/src/helpers/constants.js
+++ b/client/src/helpers/constants.js
@@ -202,6 +202,158 @@ export const FILTERS_URLS = {
    blocked_services: '/blocked_services',
 };

+export const SERVICES = [
+    {
+        id: '9gag',
+        name: '9GAG',
+    },
+    {
+        id: 'amazon',
+        name: 'Amazon',
+    },
+    {
+        id: 'bilibili',
+        name: 'Bilibili',
+    },
+    {
+        id: 'cloudflare',
+        name: 'CloudFlare',
+    },
+    {
+        id: 'dailymotion',
+        name: 'Dailymotion',
+    },
+    {
+        id: 'discord',
+        name: 'Discord',
+    },
+    {
+        id: 'disneyplus',
+        name: 'Disney+',
+    },
+    {
+        id: 'ebay',
+        name: 'EBay',
+    },
+    {
+        id: 'epic_games',
+        name: 'Epic Games',
+    },
+    {
+        id: 'facebook',
+        name: 'Facebook',
+    },
+    {
+        id: 'hulu',
+        name: 'Hulu',
+    },
+    {
+        id: 'imgur',
+        name: 'Imgur',
+    },
+    {
+        id: 'instagram',
+        name: 'Instagram',
+    },
+    {
+        id: 'mail_ru',
+        name: 'Mail.ru',
+    },
+    {
+        id: 'netflix',
+        name: 'Netflix',
+    },
+    {
+        id: 'ok',
+        name: 'OK.ru',
+    },
+    {
+        id: 'origin',
+        name: 'Origin',
+    },
+    {
+        id: 'pinterest',
+        name: 'Pinterest',
+    },
+    {
+        id: 'qq',
+        name: 'QQ',
+    },
+    {
+        id: 'reddit',
+        name: 'Reddit',
+    },
+    {
+        id: 'skype',
+        name: 'Skype',
+    },
+    {
+        id: 'snapchat',
+        name: 'Snapchat',
+    },
+    {
+        id: 'spotify',
+        name: 'Spotify',
+    },
+    {
+        id: 'steam',
+        name: 'Steam',
+    },
+    {
+        id: 'telegram',
+        name: 'Telegram',
+    },
+    {
+        id: 'tiktok',
+        name: 'TikTok',
+    },
+    {
+        id: 'tinder',
+        name: 'Tinder',
+    },
+    {
+        id: 'twitch',
+        name: 'Twitch',
+    },
+    {
+        id: 'twitter',
+        name: 'Twitter',
+    },
+    {
+        id: 'viber',
+        name: 'Viber',
+    },
+    {
+        id: 'vimeo',
+        name: 'Vimeo',
+    },
+    {
+        id: 'vk',
+        name: 'VK.com',
+    },
+    {
+        id: 'wechat',
+        name: 'WeChat',
+    },
+    {
+        id: 'weibo',
+        name: 'Weibo',
+    },
+    {
+        id: 'whatsapp',
+        name: 'WhatsApp',
+    },
+    {
+        id: 'youtube',
+        name: 'YouTube',
+    },
+];
+
+export const SERVICES_ID_NAME_MAP = SERVICES.reduce((acc, { id, name }) => {
+    acc[id] = name;
+    return acc;
+}, {});
+
 export const ENCRYPTION_SOURCE = {
    PATH: 'path',
    CONTENT: 'content',
--- a/client/src/helpers/filters/filters.js
+++ b/client/src/helpers/filters/filters.js
@@ -1,224 +0,0 @@
-// Code generated by go run ./scripts/vetted-filters/main.go; DO NOT EDIT.
-
-/* eslint quote-props: 'off', quotes: 'off', comma-dangle: 'off', semi: 'off' */
-
-export default {
-    "categories": {
-        "general": {
-            "name": "filter_category_general",
-            "description": "filter_category_general_desc"
-        },
-        "other": {
-            "name": "filter_category_other",
-            "description": "filter_category_other_desc"
-        },
-        "regional": {
-            "name": "filter_category_regional",
-            "description": "filter_category_regional_desc"
-        },
-        "security": {
-            "name": "filter_category_security",
-            "description": "filter_category_security_desc"
-        }
-    },
-    "filters": {
-        "1hosts_lite": {
-            "name": "1Hosts (Lite)",
-            "categoryId": "general",
-            "homepage": "https://badmojr.github.io/1Hosts/",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_24.txt"
-        },
-        "CHN_adrules": {
-            "name": "CHN: AdRules DNS List",
-            "categoryId": "regional",
-            "homepage": "https://github.com/Cats-Team/AdRules",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_29.txt"
-        },
-        "CHN_anti_ad": {
-            "name": "CHN: anti-AD",
-            "categoryId": "regional",
-            "homepage": "https://anti-ad.net/",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_21.txt"
-        },
-        "IDN_abpindo": {
-            "name": "IDN: ABPindo",
-            "categoryId": "regional",
-            "homepage": "https://github.com/ABPindo/indonesianadblockrules",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_22.txt"
-        },
-        "IRN_unwanted_iranian_domains": {
-            "name": "IRN: PersianBlocker list",
-            "categoryId": "regional",
-            "homepage": "https://github.com/MasterKia/PersianBlocker",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_19.txt"
-        },
-        "ITA_filtri_dns": {
-            "name": "ITA: Filtri-DNS",
-            "categoryId": "regional",
-            "homepage": "https://filtri-dns.ga/",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_18.txt"
-        },
-        "KOR_list_kr": {
-            "name": "KOR: List-KR DNS",
-            "categoryId": "regional",
-            "homepage": "https://github.com/List-KR/List-KR",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_25.txt"
-        },
-        "KOR_youslist": {
-            "name": "KOR: YousList",
-            "categoryId": "regional",
-            "homepage": "https://github.com/yous/YousList",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_15.txt"
-        },
-        "MKD_macedonian_pi_hole_blocklist": {
-            "name": "MKD: Macedonian Pi-hole Blocklist",
-            "categoryId": "regional",
-            "homepage": "https://github.com/cchevy/macedonian-pi-hole-blocklist",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_20.txt"
-        },
-        "NOR_dandelion_sprouts_anti_malware_list": {
-            "name": "NOR: Dandelion Sprouts nordiske filtre",
-            "categoryId": "regional",
-            "homepage": "https://github.com/DandelionSprout/adfilt",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_13.txt"
-        },
-        "POL_polish_filters_for_pi_hole": {
-            "name": "POL: Polish filters for Pi hole",
-            "categoryId": "regional",
-            "homepage": "https://www.certyficate.it/",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_14.txt"
-        },
-        "SWE_frellwit_swedish_hosts_file": {
-            "name": "SWE: Frellwit's Swedish Hosts File",
-            "categoryId": "regional",
-            "homepage": "https://github.com/lassekongo83/Frellwits-filter-lists/",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_17.txt"
-        },
-        "TUR_turk_adlist": {
-            "name": "TUR: turk-adlist",
-            "categoryId": "regional",
-            "homepage": "https://github.com/bkrucarci/turk-adlist",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_26.txt"
-        },
-        "VNM_abpvn": {
-            "name": "VNM: ABPVN List",
-            "categoryId": "regional",
-            "homepage": "http://abpvn.com/",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_16.txt"
-        },
-        "adguard_dns_filter": {
-            "name": "AdGuard DNS filter",
-            "categoryId": "general",
-            "homepage": "https://github.com/AdguardTeam/AdGuardSDNSFilter",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt"
-        },
-        "adway_default_blocklist": {
-            "name": "AdAway Default Blocklist",
-            "categoryId": "general",
-            "homepage": "https://github.com/AdAway/adaway.github.io/",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_2.txt"
-        },
-        "curben_phishing_filter": {
-            "name": "Phishing URL Blocklist (PhishTank and OpenPhish)",
-            "categoryId": "security",
-            "homepage": "https://gitlab.com/malware-filter/phishing-filter",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_30.txt"
-        },
-        "dan_pollocks_list": {
-            "name": "Dan Pollock's List",
-            "categoryId": "general",
-            "homepage": "https://someonewhocares.org/",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_4.txt"
-        },
-        "dandelion_sprouts_anti_malware_list": {
-            "name": "Dandelion Sprout's Anti-Malware List",
-            "categoryId": "security",
-            "homepage": "https://github.com/DandelionSprout/adfilt",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_12.txt"
-        },
-        "dandelion_sprouts_game_console_adblock_list": {
-            "name": "Dandelion Sprout's Game Console Adblock List",
-            "categoryId": "other",
-            "homepage": "https://github.com/DandelionSprout/adfilt",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_6.txt"
-        },
-        "energized_spark": {
-            "name": "Energized Spark",
-            "categoryId": "general",
-            "homepage": "https://energized.pro/",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_28.txt"
-        },
-        "nocoin_filter_list": {
-            "name": "NoCoin Filter List",
-            "categoryId": "security",
-            "homepage": "https://github.com/hoshsadiq/adblock-nocoin-list/",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_8.txt"
-        },
-        "notracking_hosts_blocklists": {
-            "name": "The NoTracking blocklist",
-            "categoryId": "general",
-            "homepage": "https://github.com/notracking/hosts-blocklists",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_32.txt"
-        },
-        "oisd_basic": {
-            "name": "OISD Blocklist Basic",
-            "categoryId": "general",
-            "homepage": "https://oisd.nl/",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_5.txt"
-        },
-        "oisd_full": {
-            "name": "OISD Blocklist Full",
-            "categoryId": "general",
-            "homepage": "https://oisd.nl/",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_27.txt"
-        },
-        "perflyst_dandelion_sprout_smart_tv_blocklist_for_adguard_home": {
-            "name": "Perflyst and Dandelion Sprout's Smart-TV Blocklist",
-            "categoryId": "other",
-            "homepage": "https://github.com/Perflyst/PiHoleBlocklist",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_7.txt"
-        },
-        "peter_lowe_list": {
-            "name": "Peter Lowe's Blocklist",
-            "categoryId": "general",
-            "homepage": "https://pgl.yoyo.org/adservers/",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_3.txt"
-        },
-        "scam_blocklist_by_durablenapkin": {
-            "name": "Scam Blocklist by DurableNapkin",
-            "categoryId": "security",
-            "homepage": "https://github.com/durablenapkin/scamblocklist",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_10.txt"
-        },
-        "staklerware_indicators_list": {
-            "name": "Stalkerware Indicators List",
-            "categoryId": "security",
-            "homepage": "https://github.com/AssoEchap/stalkerware-indicators",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_31.txt"
-        },
-        "steven_blacks_list": {
-            "name": "Steven Black's List",
-            "categoryId": "general",
-            "homepage": "https://github.com/StevenBlack/hosts",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_33.txt"
-        },
-        "the_big_list_of_hacked_malware_web_sites": {
-            "name": "The Big List of Hacked Malware Web Sites",
-            "categoryId": "security",
-            "homepage": "https://github.com/mitchellkrogza/The-Big-List-of-Hacked-Malware-Web-Sites",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_9.txt"
-        },
-        "urlhaus_filter_online": {
-            "name": "Malicious URL Blocklist (URLHaus)",
-            "categoryId": "security",
-            "homepage": "https://gitlab.com/malware-filter/urlhaus-filter",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_11.txt"
-        },
-        "windowsspyblocker_hosts_spy_rules": {
-            "name": "WindowsSpyBlocker - Hosts spy rules",
-            "categoryId": "other",
-            "homepage": "https://github.com/crazy-max/WindowsSpyBlocker",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_23.txt"
-        }
-    }
-}
--- a/client/src/helpers/filters/filters.json
+++ b/client/src/helpers/filters/filters.json
@@ -0,0 +1,166 @@
+{
+    "categories": {
+        "general": {
+            "name": "filter_category_general",
+            "description": "filter_category_general_desc"
+        },
+        "security": {
+            "name": "filter_category_security",
+            "description": "filter_category_security_desc"
+        },
+        "regional": {
+            "name": "filter_category_regional",
+            "description": "filter_category_regional_desc"
+        },
+        "other": {
+            "name": "filter_category_other",
+            "description": "filter_category_other_desc"
+        }
+    },
+    "filters": {
+        "adguard-dns-filter": {
+            "name": "AdGuard DNS filter",
+            "categoryId": "general",
+            "homepage": "https://github.com/AdguardTeam/AdGuardSDNSFilter",
+            "source": "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"
+        },
+        "adaway-default-blocklist": {
+            "name": "AdAway Default Blocklist",
+            "categoryId": "general",
+            "homepage": "https://github.com/AdAway/adaway.github.io/",
+            "source": "https://adaway.org/hosts.txt"
+        },
+        "peter-lowe-list": {
+            "name": "Peter Lowe's List",
+            "categoryId": "general",
+            "homepage": "https://pgl.yoyo.org/adservers/",
+            "source": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=adblockplus&showintro=1&mimetype=plaintext"
+        },
+        "dan-pollock-list": {
+            "name": "Dan Pollock's List",
+            "categoryId": "general",
+            "homepage": "https://someonewhocares.org/",
+            "source": "https://someonewhocares.org/hosts/zero/hosts"
+        },
+        "oisd": {
+            "name": "OISD Blocklist Basic",
+            "categoryId": "general",
+            "homepage": "https://oisd.nl/",
+            "source": "https://abp.oisd.nl/basic/"
+        },
+        "game-console-adblock-list": {
+            "name": "Game Console Adblock List",
+            "categoryId": "general",
+            "homepage": "https://github.com/DandelionSprout/adfilt",
+            "source": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/GameConsoleAdblockList.txt"
+        },
+        "perflyst-dandelion-sprout-smart-tv-blocklist-for-adguard-home": {
+            "name": "Perflyst and Dandelion Sprout's Smart-TV Blocklist",
+            "categoryId": "general",
+            "homepage": "https://github.com/Perflyst/PiHoleBlocklist",
+            "source": "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV-AGH.txt"
+        },
+        "nocoin-filter-list": {
+            "name": "NoCoin Filter List",
+            "categoryId": "security",
+            "homepage": "https://github.com/hoshsadiq/adblock-nocoin-list/",
+            "source": "https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt"
+        },
+        "the-big-list-of-hacked-malware-web-sites": {
+            "name": "The Big List of Hacked Malware Web Sites",
+            "categoryId": "security",
+            "homepage": "https://github.com/mitchellkrogza/The-Big-List-of-Hacked-Malware-Web-Sites",
+            "source": "https://raw.githubusercontent.com/mitchellkrogza/The-Big-List-of-Hacked-Malware-Web-Sites/master/hosts"
+        },
+        "scam-blocklist-by-durable-napkin": {
+            "name": "Scam Blocklist by DurableNapkin",
+            "categoryId": "security",
+            "homepage": "https://github.com/durablenapkin/scamblocklist",
+            "source": "https://raw.githubusercontent.com/durablenapkin/scamblocklist/master/adguard.txt"
+        },
+        "urlhaus-filter-online": {
+            "name": "Online Malicious URL Blocklist",
+            "categoryId": "security",
+            "homepage": "https://gitlab.com/malware-filter/urlhaus-filter",
+            "source": "https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-agh-online.txt"
+        },
+        "dandelion-sprouts-anti-malware-list": {
+            "name": "Dandelion Sprout's Anti-Malware List",
+            "categoryId": "security",
+            "homepage": "https://github.com/DandelionSprout/adfilt",
+            "source": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuardHome.txt"
+        },
+        "NOR-dandelion-sprouts-nordiske-filtre": {
+            "name": "NOR: Dandelion Sprouts nordiske filtre",
+            "categoryId": "regional",
+            "homepage": "https://github.com/DandelionSprout/adfilt",
+            "source": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersAdGuardHome.txt"
+        },
+        "POL-polish-filters-for-pihole": {
+            "name": "POL: Polish filters for Pi hole",
+            "categoryId": "regional",
+            "homepage": "https://www.certyficate.it/",
+            "source": "https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/hostfile.txt"
+        },
+        "KOR-youslist": {
+            "name": "KOR: YousList",
+            "categoryId": "regional",
+            "homepage": "https://github.com/yous/YousList",
+            "source": "https://raw.githubusercontent.com/yous/YousList/master/hosts.txt"
+        },
+        "VNM-abpvn-list": {
+            "name": "VNM: ABPVN List",
+            "categoryId": "regional",
+            "homepage": "http://abpvn.com/",
+            "source": "https://abpvn.com/android/abpvn.txt"
+        },
+        "SWE-frellwit-swedish-hosts-file": {
+            "name": "SWE: Frellwit's Swedish Hosts File",
+            "categoryId": "regional",
+            "homepage": "https://github.com/lassekongo83/Frellwits-filter-lists/",
+            "source": "https://raw.githubusercontent.com/lassekongo83/Frellwits-filter-lists/master/Frellwits-Swedish-Hosts-File.txt"
+        },
+        "ITA-filtri-dns": {
+            "name": "ITA: Filtri-DNS",
+            "categoryId": "regional",
+            "homepage": "https://filtri-dns.ga/",
+            "source": "https://filtri-dns.ga/filtri.txt"
+        },
+        "IRN-unwanted-iranian-domains": {
+            "name": "IRN: Unwanted Iranian domains",
+            "categoryId": "regional",
+            "homepage": "https://github.com/DRSDavidSoft/additional-hosts",
+            "source": "https://raw.githubusercontent.com/DRSDavidSoft/additional-hosts/master/domains/blacklist/unwanted-iranian.txt"
+        },
+        "MKD-macedonian-pi-hole-blocklist": {
+            "name": "MKD: Macedonian Pi-hole Blocklist",
+            "categoryId": "regional",
+            "homepage": "https://github.com/cchevy/macedonian-pi-hole-blocklist",
+            "source": "https://raw.githubusercontent.com/cchevy/macedonian-pi-hole-blocklist/master/hosts.txt"
+        },
+        "CHN-anti-ad" : {
+            "name": "CHN: anti-AD",
+            "categoryId": "regional",
+            "homepage": "https://anti-ad.net/",
+            "source": "https://anti-ad.net/easylist.txt"
+        },
+        "IDN-abpindo": {
+            "name": "IDN: ABPindo",
+            "categoryId": "regional",
+            "homepage": "https://github.com/ABPindo/indonesianadblockrules/",
+            "source": "https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt"
+        },
+        "NLD-Easylist": {
+            "name": "NLD: Easylist",
+            "categoryId": "regional",
+            "homepage": "https://forums.lanik.us/viewforum.php?f=100",
+            "source": "https://easylist-downloads.adblockplus.org/easylistdutch.txt"
+        },
+        "windows-spy-blocker" : {
+            "name": "WindowsSpyBlocker - Hosts spy rules",
+            "categoryId": "other",
+            "homepage": "https://github.com/crazy-max/WindowsSpyBlocker",
+            "source": "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
+        }
+    }
+}
--- a/client/src/helpers/form.js
+++ b/client/src/helpers/form.js
@@ -1,8 +1,6 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { Trans } from 'react-i18next';
-import cn from 'classnames';
-
 import { createOnBlurHandler } from './helpers';
 import { R_MAC_WITHOUT_COLON, R_UNIX_ABSOLUTE_PATH, R_WIN_ABSOLUTE_PATH } from './constants';

@@ -231,34 +229,24 @@ export const renderServiceField = ({
    modifier,
    icon,
    meta: { touched, error },
-}) => (
-    <>
-        <label className={cn('service custom-switch', { [modifier]: modifier })}>
-            <input
-                {...input}
-                type="checkbox"
-                className="custom-switch-input"
-                value={placeholder.toLowerCase()}
-                disabled={disabled}
-            />
-            <span className="service__switch custom-switch-indicator"></span>
-            <span className="service__text" title={placeholder}>
-                {placeholder}
-            </span>
-            {icon && (
-                <div
-                    dangerouslySetInnerHTML={{ __html: window.atob(icon) }}
-                    className="service__icon"
-                />
-            )}
-        </label>
-        {!disabled && touched && error && (
-            <span className="form__message form__message--error">
-                <Trans>{error}</Trans>
-            </span>
-        )}
-    </>
-);
+}) => <Fragment>
+    <label className={`service custom-switch ${modifier}`}>
+        <input
+            {...input}
+            type="checkbox"
+            className="custom-switch-input"
+            value={placeholder.toLowerCase()}
+            disabled={disabled}
+        />
+        <span className="service__switch custom-switch-indicator"></span>
+        <span className="service__text">{placeholder}</span>
+        <svg className="service__icon">
+            <use xlinkHref={`#${icon}`} />
+        </svg>
+    </label>
+    {!disabled && touched && error
+    && <span className="form__message form__message--error"><Trans>{error}</Trans></span>}
+</Fragment>;

 renderServiceField.propTypes = {
    input: PropTypes.object.isRequired,
--- a/client/src/helpers/helpers.js
+++ b/client/src/helpers/helpers.js
@@ -21,6 +21,7 @@ import {
    FILTERED,
    FILTERED_STATUS,
    R_CLIENT_ID,
+    SERVICES_ID_NAME_MAP,
    STANDARD_DNS_PORT,
    STANDARD_HTTPS_PORT,
    STANDARD_WEB_PORT,
@@ -990,22 +991,7 @@ export const filterOutComments = (lines) => lines
    .filter((line) => !line.startsWith(COMMENT_LINE_DEFAULT_TOKEN));

 /**
- * @param {array} services
- * @param {string} id
+ * @param {string} serviceId
 * @returns {string}
 */
-export const getService = (services, id) => services.find((s) => s.id === id);
-
-/**
- * @param {array} services
- * @param {string} id
- * @returns {string}
- */
-export const getServiceName = (services, id) => getService(services, id)?.name;
-
-/**
- * @param {array} services
- * @param {string} id
- * @returns {string}
- */
-export const getServiceIcon = (services, id) => getService(services, id)?.icon_svg;
+export const getServiceName = (serviceId) => SERVICES_ID_NAME_MAP[serviceId] || serviceId;
--- a/client/src/helpers/validators.js
+++ b/client/src/helpers/validators.js
@@ -77,11 +77,11 @@ export const validateNotInRange = (value, allValues) => {
    const { range_start, range_end } = allValues.v4;

    if (range_start && validateIpv4(range_start)) {
-        return undefined;
+        return 'form_error_ip4_range_start_format';
    }

    if (range_end && validateIpv4(range_end)) {
-        return undefined;
+        return 'form_error_ip4_range_end_format';
    }

    const isAboveMin = range_start && ip4ToInt(value) >= ip4ToInt(range_start);
@@ -94,6 +94,14 @@ export const validateNotInRange = (value, allValues) => {
        });
    }

+    if (!range_end && isAboveMin) {
+        return 'lower_range_start_error';
+    }
+
+    if (!range_start && isBelowMax) {
+        return 'greater_range_end_error';
+    }
+
    return undefined;
 };

@@ -110,7 +118,7 @@ export const validateGatewaySubnetMask = (_, allValues) => {
    const { subnet_mask, gateway_ip } = allValues.v4;

    if (validateIpv4(gateway_ip)) {
-        return 'gateway_or_subnet_invalid';
+        return 'form_error_ip4_gateway_format';
    }

    return parseSubnetMask(subnet_mask) ? undefined : 'gateway_or_subnet_invalid';
@@ -130,10 +138,6 @@ export const validateIpForGatewaySubnetMask = (value, allValues) => {
        gateway_ip, subnet_mask,
    } = allValues.v4;

-    if ((gateway_ip && validateIpv4(gateway_ip)) || (subnet_mask && validateIpv4(subnet_mask))) {
-        return undefined;
-    }
-
    const subnetPrefix = parseSubnetMask(subnet_mask);

    if (!isIpInCidr(value, `${gateway_ip}/${subnetPrefix}`)) {
--- a/client/src/reducers/services.js
+++ b/client/src/reducers/services.js
@@ -12,14 +12,6 @@ const services = handleActions(
            processing: false,
        }),

-        [actions.getAllBlockedServicesRequest]: (state) => ({ ...state, processingAll: true }),
-        [actions.getAllBlockedServicesFailure]: (state) => ({ ...state, processingAll: false }),
-        [actions.getAllBlockedServicesSuccess]: (state, { payload }) => ({
-            ...state,
-            allServices: payload.blocked_services,
-            processingAll: false,
-        }),
-
        [actions.setBlockedServicesRequest]: (state) => ({ ...state, processingSet: true }),
        [actions.setBlockedServicesFailure]: (state) => ({ ...state, processingSet: false }),
        [actions.setBlockedServicesSuccess]: (state) => ({
@@ -29,10 +21,8 @@ const services = handleActions(
    },
    {
        processing: true,
-        processingAll: true,
        processingSet: false,
        list: [],
-        allServices: [],
    },
 );

--- a/go.mod
+++ b/go.mod
@@ -3,24 +3,24 @@ module github.com/AdguardTeam/AdGuardHome
 go 1.18

 require (
-	github.com/AdguardTeam/dnsproxy v0.46.4
-	github.com/AdguardTeam/golibs v0.11.3
+	github.com/AdguardTeam/dnsproxy v0.46.1
+	github.com/AdguardTeam/golibs v0.10.9
 	github.com/AdguardTeam/urlfilter v0.16.0
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/ameshkov/dnscrypt/v2 v2.2.5
 	github.com/digineo/go-ipset/v2 v2.2.1
-	github.com/dimfeld/httptreemux/v5 v5.5.0
-	github.com/fsnotify/fsnotify v1.6.0
+	github.com/dimfeld/httptreemux/v5 v5.4.0
+	github.com/fsnotify/fsnotify v1.5.4
 	github.com/go-ping/ping v1.1.0
-	github.com/google/go-cmp v0.5.9
+	github.com/google/go-cmp v0.5.8
 	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-20221001123530-5308ebe5334c
-	github.com/kardianos/service v1.2.2
-	github.com/lucas-clemente/quic-go v0.31.0
+	github.com/insomniacslk/dhcp v0.0.0-20220822114210-de18a9d48e84
+	github.com/kardianos/service v1.2.1
+	github.com/lucas-clemente/quic-go v0.29.2
 	github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
-	github.com/mdlayher/netlink v1.6.2
+	github.com/mdlayher/netlink v1.6.0
 	// TODO(a.garipov): This package is deprecated; find a new one or use
 	// our own code for that.  Perhaps, use gopacket.
 	github.com/mdlayher/raw v0.1.0
@@ -28,10 +28,10 @@ require (
 	github.com/stretchr/testify v1.8.0
 	github.com/ti-mo/netfilter v0.4.0
 	go.etcd.io/bbolt v1.3.6
-	golang.org/x/crypto v0.1.0
-	golang.org/x/exp v0.0.0-20221106115401-f9659909a136
-	golang.org/x/net v0.1.0
-	golang.org/x/sys v0.2.0
+	golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
+	golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9
+	golang.org/x/net v0.0.0-20220927171203-f486391704dc
+	golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/yaml.v3 v3.0.1
 	howett.net/plist v1.0.0
@@ -47,20 +47,21 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/golang/mock v1.6.0 // indirect
-	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/josharian/native v1.0.0 // indirect
-	github.com/marten-seemann/qpack v0.3.0 // indirect
+	github.com/marten-seemann/qpack v0.2.1 // indirect
 	github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
 	github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
 	github.com/mdlayher/packet v1.0.0 // indirect
 	github.com/mdlayher/socket v0.2.3 // indirect
-	github.com/onsi/ginkgo/v2 v2.5.0 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
-	golang.org/x/mod v0.6.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/text v0.4.0 // indirect
-	golang.org/x/tools v0.2.0 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e // indirect
+	golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/tools v0.1.12 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,9 @@
-github.com/AdguardTeam/dnsproxy v0.46.4 h1:/+wnTG0q2TkGQyA1PeSsjv4/f5ZprGduKPSoOcG+rOU=
-github.com/AdguardTeam/dnsproxy v0.46.4/go.mod h1:yYDMAH6ay2PxLcLtfVM3FUiyv/U9B/zYO+cIIssuJNU=
+github.com/AdguardTeam/dnsproxy v0.46.1 h1:ej9iRorG+vekaXGYB854waAiS+q8OfswYZ1MQRZolHk=
+github.com/AdguardTeam/dnsproxy v0.46.1/go.mod h1:PAmRzFqls0E92XTglyY2ESAqMAzZJhHKErG1ZpRnpjA=
 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.11.3 h1:Oif+REq2WLycQ2Xm3ZPmJdfftptss0HbGWbxdFaC310=
-github.com/AdguardTeam/golibs v0.11.3/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA=
+github.com/AdguardTeam/golibs v0.10.9 h1:F9oP2da0dQ9RQDM1lGR7LxUTfUWu8hEFOs4icwAkKM0=
+github.com/AdguardTeam/golibs v0.10.9/go.mod h1:W+5rznZa1cSNSFt+gPS7f4Wytnr9fOrd5ZYqwadPw14=
 github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
 github.com/AdguardTeam/urlfilter v0.16.0 h1:IO29m+ZyQuuOnPLTzHuXj35V1DZOp1Dcryl576P2syg=
 github.com/AdguardTeam/urlfilter v0.16.0/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
@@ -25,21 +25,19 @@ github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 h1:0b2vaepXIfMsG+
 github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA=
 github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw=
 github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/digineo/go-ipset/v2 v2.2.1 h1:k6skY+0fMqeUjjeWO/m5OuWPSZUAn7AucHMnQ1MX77g=
 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/dimfeld/httptreemux/v5 v5.4.0 h1:IiHYEjh+A7pYbhWyjmGnj5HZK6gpOOvyBXCJ+BE8/Gs=
+github.com/dimfeld/httptreemux/v5 v5.4.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/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
+github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
 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=
@@ -48,7 +46,14 @@ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8Wd
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 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.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 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=
@@ -56,23 +61,21 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 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/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/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-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 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/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 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/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c h1:OCFM4+DXTWfNlyeoddrTwdup/ztkGSyAMR2UGcPckNQ=
-github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
+github.com/insomniacslk/dhcp v0.0.0-20220822114210-de18a9d48e84 h1:MJTy6H+EpXLeAn0P5WAWeLk6dJA3V0ik6S3VJfUyQuI=
+github.com/insomniacslk/dhcp v0.0.0-20220822114210-de18a9d48e84/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/josharian/native v1.0.0 h1:Ts/E8zCSEsG17dUqv7joXJFybuMLjQfWE04tsBODTxk=
 github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
@@ -81,16 +84,16 @@ github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGu
 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/kardianos/service v1.2.1 h1:AYndMsehS+ywIS6RB9KOlcXzteWUzxgMgBymJD7+BYk=
+github.com/kardianos/service v1.2.1/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/lucas-clemente/quic-go v0.31.0 h1:MfNp3fk0wjWRajw6quMFA3ap1AVtlU+2mtwmbVogB2M=
-github.com/lucas-clemente/quic-go v0.31.0/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g=
-github.com/marten-seemann/qpack v0.3.0 h1:UiWstOgT8+znlkDPOg2+3rIuYXJ2CnGDkGUXN6ki6hE=
-github.com/marten-seemann/qpack v0.3.0/go.mod h1:cGfKPBiP4a9EQdxCwEwI/GEeWAsjSekBvx/X8mh58+g=
+github.com/lucas-clemente/quic-go v0.29.2 h1:O8Mt0O6LpvEW+wfC40vZdcw0DngwYzoxq5xULZNzSI8=
+github.com/lucas-clemente/quic-go v0.29.2/go.mod h1:g6/h9YMmLuU54tL1gW25uIi3VlBp3uv+sBihplIuskE=
+github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs=
+github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
 github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
 github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
 github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
@@ -104,14 +107,15 @@ github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqc
 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.1.2-0.20201013204415-ded538f7f4be/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
-github.com/mdlayher/netlink v1.6.2 h1:D2zGSkvYsJ6NreeED3JiVTu1lj2sIYATqSaZlhPzUgQ=
-github.com/mdlayher/netlink v1.6.2/go.mod h1:O1HXX2sIWSMJ3Qn1BYZk1yZM+7iMki/uYGGiwGyq/iU=
+github.com/mdlayher/netlink v1.6.0 h1:rOHX5yl7qnlpiVkFWoqccueppMtXzeziFjWAjLg6sz0=
+github.com/mdlayher/netlink v1.6.0/go.mod h1:0o3PlBmGst1xve7wQ7j/hwpNaFaH4qCRyWCdcZk8/vA=
 github.com/mdlayher/packet v1.0.0 h1:InhZJbdShQYt6XV2GPj5XHxChzOfhJJOMbvnGAmOfQ8=
 github.com/mdlayher/packet v1.0.0/go.mod h1:eE7/ctqDhoiRhQ44ko5JZU2zxB88g+JH/6jmnjzPjOU=
 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.1.1/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5Awbj+qDs=
 github.com/mdlayher/socket v0.2.1/go.mod h1:QLlNPkFR88mRUNQIzRBMfXxwKal8H7u1h3bL1CV+f0E=
 github.com/mdlayher/socket v0.2.3 h1:XZA2X2TjdOwNoNPVPclRCURoX/hokBY8nkTmRZFEheM=
 github.com/mdlayher/socket v0.2.3/go.mod h1:bz12/FozYNH/VbvC3q7TRIK/Y6dH1kCKsXaUeXi/FmY=
@@ -120,9 +124,17 @@ github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
 github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
 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.5.0 h1:TRtrvv2vdQqzkwrQ1ke6vtXf7IK34RBUJafIy1wMwls=
-github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw=
-github.com/onsi/gomega v1.24.0 h1:+0glovB9Jd6z3VR+ScSwQqXVTIfJcGA9UBM8yzQxhqg=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
 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/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -154,21 +166,24 @@ github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcy
 github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
 github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 h1:hl6sK6aFgTLISijk6xIzeqnPzQcsLqqvL6vEfTPinME=
 github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
 go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
 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.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
-golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
-golang.org/x/exp v0.0.0-20221106115401-f9659909a136 h1:Fq7F/w7MAa1KJ5bt2aJ62ihqp9HDcRuyILskkpIAurw=
-golang.org/x/exp v0.0.0-20221106115401-f9659909a136/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A=
+golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9 h1:lNtcVz/3bOstm7Vebox+5m3nLh/BYWnhmc3AhXOW6oI=
+golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
 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.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
-golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
+golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e h1:WhB000cGjOfbJiedMGvJkMTclI18VD69w27k+sceql8=
+golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 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=
@@ -178,22 +193,28 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 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-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/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-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
-golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220927171203-f486391704dc h1:FxpXZdoBqT8RjqTy6i1E8nXHhW21wK7ptQ/EPIGxzPQ=
+golang.org/x/net v0.0.0-20220927171203-f486391704dc/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/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.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc=
+golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 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=
@@ -202,10 +223,14 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 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-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/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=
@@ -213,6 +238,7 @@ golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7/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-20210112080510-489259a85091/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=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -224,42 +250,53 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=
+golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 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 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 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.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
-golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
+golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 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=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
--- a/internal/aghnet/arpdb.go
+++ b/internal/aghnet/arpdb.go
@@ -5,11 +5,10 @@ import (
 	"bytes"
 	"fmt"
 	"net"
-	"net/netip"
 	"sync"

 	"github.com/AdguardTeam/golibs/errors"
-	"golang.org/x/exp/slices"
+	"github.com/AdguardTeam/golibs/netutil"
 )

 // ARPDB: The Network Neighborhood Database
@@ -55,7 +54,7 @@ type Neighbor struct {
 	Name string

 	// IP contains either IPv4 or IPv6.
-	IP netip.Addr
+	IP net.IP

 	// MAC contains the hardware address.
 	MAC net.HardwareAddr
@@ -65,8 +64,8 @@ type Neighbor struct {
 func (n Neighbor) Clone() (clone Neighbor) {
 	return Neighbor{
 		Name: n.Name,
-		IP:   n.IP,
-		MAC:  slices.Clone(n.MAC),
+		IP:   netutil.CloneIP(n.IP),
+		MAC:  netutil.CloneMAC(n.MAC),
 	}
 }

--- a/internal/aghnet/arpdb_bsd.go
+++ b/internal/aghnet/arpdb_bsd.go
@@ -5,7 +5,6 @@ package aghnet
 import (
 	"bufio"
 	"net"
-	"net/netip"
 	"strings"
 	"sync"

@@ -48,28 +47,22 @@ func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {

 		if ipStr := fields[1]; len(ipStr) < 2 {
 			continue
-		} else if ip, err := netip.ParseAddr(ipStr[1 : len(ipStr)-1]); err != nil {
-			log.Debug("arpdb: parsing arp output: ip: %s", err)
-
+		} else if ip := net.ParseIP(ipStr[1 : len(ipStr)-1]); ip == nil {
 			continue
 		} else {
 			n.IP = ip
 		}

 		hwStr := fields[3]
-		mac, err := net.ParseMAC(hwStr)
-		if err != nil {
-			log.Debug("arpdb: parsing arp output: mac: %s", err)
-
+		if mac, err := net.ParseMAC(hwStr); err != nil {
 			continue
 		} else {
 			n.MAC = mac
 		}

 		host := fields[0]
-		err = netutil.ValidateDomainName(host)
-		if err != nil {
-			log.Debug("arpdb: parsing arp output: host: %s", err)
+		if err := netutil.ValidateDomainName(host); err != nil {
+			log.Debug("parsing arp output: %s", err)
 		} else {
 			n.Name = host
 		}
--- a/internal/aghnet/arpdb_bsd_test.go
+++ b/internal/aghnet/arpdb_bsd_test.go
@@ -4,7 +4,6 @@ package aghnet

 import (
 	"net"
-	"net/netip"
 )

 const arpAOutput = `
@@ -18,14 +17,14 @@ hostname.two (::ffff:ffff) at ef:cd:ab:ef:cd:ab on em0 expires in 1198 seconds [

 var wantNeighs = []Neighbor{{
 	Name: "hostname.one",
-	IP:   netip.MustParseAddr("192.168.1.2"),
+	IP:   net.IPv4(192, 168, 1, 2),
 	MAC:  net.HardwareAddr{0xAB, 0xCD, 0xEF, 0xAB, 0xCD, 0xEF},
 }, {
 	Name: "hostname.two",
-	IP:   netip.MustParseAddr("::ffff:ffff"),
+	IP:   net.ParseIP("::ffff:ffff"),
 	MAC:  net.HardwareAddr{0xEF, 0xCD, 0xAB, 0xEF, 0xCD, 0xAB},
 }, {
 	Name: "",
-	IP:   netip.MustParseAddr("::1234"),
+	IP:   net.ParseIP("::1234"),
 	MAC:  net.HardwareAddr{0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF},
 }}
--- a/internal/aghnet/arpdb_linux.go
+++ b/internal/aghnet/arpdb_linux.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"io/fs"
 	"net"
-	"net/netip"
 	"strings"
 	"sync"

@@ -95,8 +94,7 @@ func (arp *fsysARPDB) Refresh() (err error) {
 		}

 		n := Neighbor{}
-		n.IP, err = netip.ParseAddr(fields[0])
-		if err != nil || n.IP.IsUnspecified() {
+		if n.IP = net.ParseIP(fields[0]); n.IP == nil || n.IP.IsUnspecified() {
 			continue
 		} else if n.MAC, err = net.ParseMAC(fields[3]); err != nil {
 			continue
@@ -137,19 +135,15 @@ func parseArpAWrt(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {

 		n := Neighbor{}

-		ip, err := netip.ParseAddr(fields[0])
-		if err != nil || n.IP.IsUnspecified() {
-			log.Debug("arpdb: parsing arp output: ip: %s", err)
-
+		if ip := net.ParseIP(fields[0]); ip == nil || n.IP.IsUnspecified() {
 			continue
 		} else {
 			n.IP = ip
 		}

 		hwStr := fields[3]
-		mac, err := net.ParseMAC(hwStr)
-		if err != nil {
-			log.Debug("arpdb: parsing arp output: mac: %s", err)
+		if mac, err := net.ParseMAC(hwStr); err != nil {
+			log.Debug("parsing arp output: %s", err)

 			continue
 		} else {
@@ -180,9 +174,7 @@ func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {

 		if ipStr := fields[1]; len(ipStr) < 2 {
 			continue
-		} else if ip, err := netip.ParseAddr(ipStr[1 : len(ipStr)-1]); err != nil {
-			log.Debug("arpdb: parsing arp output: ip: %s", err)
-
+		} else if ip := net.ParseIP(ipStr[1 : len(ipStr)-1]); ip == nil {
 			continue
 		} else {
 			n.IP = ip
@@ -190,7 +182,7 @@ func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {

 		hwStr := fields[3]
 		if mac, err := net.ParseMAC(hwStr); err != nil {
-			log.Debug("arpdb: parsing arp output: mac: %s", err)
+			log.Debug("parsing arp output: %s", err)

 			continue
 		} else {
@@ -199,7 +191,7 @@ func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {

 		host := fields[0]
 		if verr := netutil.ValidateDomainName(host); verr != nil {
-			log.Debug("arpdb: parsing arp output: host: %s", verr)
+			log.Debug("parsing arp output: %s", verr)
 		} else {
 			n.Name = host
 		}
@@ -226,18 +218,14 @@ func parseIPNeigh(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {

 		n := Neighbor{}

-		ip, err := netip.ParseAddr(fields[0])
-		if err != nil {
-			log.Debug("arpdb: parsing arp output: ip: %s", err)
-
+		if ip := net.ParseIP(fields[0]); ip == nil {
 			continue
 		} else {
 			n.IP = ip
 		}

-		mac, err := net.ParseMAC(fields[4])
-		if err != nil {
-			log.Debug("arpdb: parsing arp output: mac: %s", err)
+		if mac, err := net.ParseMAC(fields[4]); err != nil {
+			log.Debug("parsing arp output: %s", err)

 			continue
 		} else {
--- a/internal/aghnet/arpdb_linux_test.go
+++ b/internal/aghnet/arpdb_linux_test.go
@@ -4,7 +4,6 @@ package aghnet

 import (
 	"net"
-	"net/netip"
 	"sync"
 	"testing"
 	"testing/fstest"
@@ -34,10 +33,10 @@ const ipNeighOutput = `
 ::ffff:ffff dev enp0s3 lladdr ef:cd:ab:ef:cd:ab router STALE`

 var wantNeighs = []Neighbor{{
-	IP:  netip.MustParseAddr("192.168.1.2"),
+	IP:  net.IPv4(192, 168, 1, 2),
 	MAC: net.HardwareAddr{0xAB, 0xCD, 0xEF, 0xAB, 0xCD, 0xEF},
 }, {
-	IP:  netip.MustParseAddr("::ffff:ffff"),
+	IP:  net.ParseIP("::ffff:ffff"),
 	MAC: net.HardwareAddr{0xEF, 0xCD, 0xAB, 0xEF, 0xCD, 0xAB},
 }}

--- a/internal/aghnet/arpdb_openbsd.go
+++ b/internal/aghnet/arpdb_openbsd.go
@@ -5,7 +5,6 @@ package aghnet
 import (
 	"bufio"
 	"net"
-	"net/netip"
 	"strings"
 	"sync"

@@ -51,18 +50,14 @@ func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {

 		n := Neighbor{}

-		ip, err := netip.ParseAddr(fields[0])
-		if err != nil {
-			log.Debug("arpdb: parsing arp output: ip: %s", err)
-
+		if ip := net.ParseIP(fields[0]); ip == nil {
 			continue
 		} else {
 			n.IP = ip
 		}

-		mac, err := net.ParseMAC(fields[1])
-		if err != nil {
-			log.Debug("arpdb: parsing arp output: mac: %s", err)
+		if mac, err := net.ParseMAC(fields[1]); err != nil {
+			log.Debug("parsing arp output: %s", err)

 			continue
 		} else {
--- a/internal/aghnet/arpdb_openbsd_test.go
+++ b/internal/aghnet/arpdb_openbsd_test.go
@@ -4,7 +4,6 @@ package aghnet

 import (
 	"net"
-	"net/netip"
 )

 const arpAOutput = `
@@ -16,9 +15,9 @@ Host        Ethernet Address  Netif Expire    Flags
 `

 var wantNeighs = []Neighbor{{
-	IP:  netip.MustParseAddr("192.168.1.2"),
+	IP:  net.IPv4(192, 168, 1, 2),
 	MAC: net.HardwareAddr{0xAB, 0xCD, 0xEF, 0xAB, 0xCD, 0xEF},
 }, {
-	IP:  netip.MustParseAddr("::ffff:ffff"),
+	IP:  net.ParseIP("::ffff:ffff"),
 	MAC: net.HardwareAddr{0xEF, 0xCD, 0xAB, 0xEF, 0xCD, 0xAB},
 }}
--- a/internal/aghnet/arpdb_test.go
+++ b/internal/aghnet/arpdb_test.go
@@ -2,7 +2,6 @@ package aghnet

 import (
 	"net"
-	"net/netip"
 	"sync"
 	"testing"

@@ -36,7 +35,7 @@ func (arp *TestARPDB) Neighbors() (ns []Neighbor) {
 }

 func TestARPDBS(t *testing.T) {
-	knownIP := netip.MustParseAddr("1.2.3.4")
+	knownIP := net.IP{1, 2, 3, 4}
 	knownMAC := net.HardwareAddr{0xAB, 0xCD, 0xEF, 0xAB, 0xCD, 0xEF}

 	succRefrCount, failRefrCount := 0, 0
--- a/internal/aghnet/arpdb_windows.go
+++ b/internal/aghnet/arpdb_windows.go
@@ -5,7 +5,6 @@ package aghnet
 import (
 	"bufio"
 	"net"
-	"net/netip"
 	"strings"
 	"sync"
 )
@@ -44,15 +43,13 @@ func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {

 		n := Neighbor{}

-		ip, err := netip.ParseAddr(fields[0])
-		if err != nil {
+		if ip := net.ParseIP(fields[0]); ip == nil {
 			continue
 		} else {
 			n.IP = ip
 		}

-		mac, err := net.ParseMAC(fields[1])
-		if err != nil {
+		if mac, err := net.ParseMAC(fields[1]); err != nil {
 			continue
 		} else {
 			n.MAC = mac
--- a/internal/aghnet/arpdb_windows_test.go
+++ b/internal/aghnet/arpdb_windows_test.go
@@ -4,7 +4,6 @@ package aghnet

 import (
 	"net"
-	"net/netip"
 )

 const arpAOutput = `
@@ -15,9 +14,9 @@ Interface: 192.168.1.1 --- 0x7
  ::ffff:ffff           ef-cd-ab-ef-cd-ab     static`

 var wantNeighs = []Neighbor{{
-	IP:  netip.MustParseAddr("192.168.1.2"),
+	IP:  net.IPv4(192, 168, 1, 2),
 	MAC: net.HardwareAddr{0xAB, 0xCD, 0xEF, 0xAB, 0xCD, 0xEF},
 }, {
-	IP:  netip.MustParseAddr("::ffff:ffff"),
+	IP:  net.ParseIP("::ffff:ffff"),
 	MAC: net.HardwareAddr{0xEF, 0xCD, 0xAB, 0xEF, 0xCD, 0xAB},
 }}
--- a/internal/aghnet/hostscontainer.go
+++ b/internal/aghnet/hostscontainer.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"net/netip"
+	"net"
 	"path"
 	"strings"
 	"sync"
@@ -19,7 +19,6 @@ import (
 	"github.com/AdguardTeam/urlfilter/filterlist"
 	"github.com/AdguardTeam/urlfilter/rules"
 	"github.com/miekg/dns"
-	"golang.org/x/exp/maps"
 )

 // DefaultHostsPaths returns the slice of paths default for the operating system
@@ -107,10 +106,14 @@ type HostsContainer struct {
 	done chan struct{}

 	// updates is the channel for receiving updated hosts.
-	updates chan HostsRecords
+	//
+	// TODO(e.burkov):  Use map[netip.Addr]struct{} instead.
+	updates chan *netutil.IPMap

 	// last is the set of hosts that was cached within last detected change.
-	last HostsRecords
+	//
+	// TODO(e.burkov):  Use map[netip.Addr]struct{} instead.
+	last *netutil.IPMap

 	// fsys is the working file system to read hosts files from.
 	fsys fs.FS
@@ -125,27 +128,6 @@ type HostsContainer struct {
 	listID int
 }

-// HostsRecords is a mapping of an IP address to its hosts data.
-type HostsRecords map[netip.Addr]*HostsRecord
-
-// HostsRecord represents a single hosts file record.
-type HostsRecord struct {
-	Aliases   *stringutil.Set
-	Canonical string
-}
-
-// equal returns true if all fields of rec are equal to field in other or they
-// both are nil.
-func (rec *HostsRecord) equal(other *HostsRecord) (ok bool) {
-	if rec == nil {
-		return other == nil
-	} else if other == nil {
-		return false
-	}
-
-	return rec.Canonical == other.Canonical && rec.Aliases.Equal(other.Aliases)
-}
-
 // ErrNoHostsPaths is returned when there are no valid paths to watch passed to
 // the HostsContainer.
 const ErrNoHostsPaths errors.Error = "no valid paths to hosts files provided"
@@ -180,7 +162,7 @@ func NewHostsContainer(
 		},
 		listID:   listID,
 		done:     make(chan struct{}, 1),
-		updates:  make(chan HostsRecords, 1),
+		updates:  make(chan *netutil.IPMap, 1),
 		fsys:     fsys,
 		w:        w,
 		patterns: patterns,
@@ -218,8 +200,9 @@ func (hc *HostsContainer) Close() (err error) {
 	return nil
 }

-// Upd returns the channel into which the updates are sent.
-func (hc *HostsContainer) Upd() (updates <-chan HostsRecords) {
+// Upd returns the channel into which the updates are sent.  The receivable
+// map's values are guaranteed to be of type of *HostsRecord.
+func (hc *HostsContainer) Upd() (updates <-chan *netutil.IPMap) {
 	return hc.updates
 }

@@ -285,7 +268,7 @@ type hostsParser struct {

 	// table stores only the unique IP-hostname pairs.  It's also sent to the
 	// updates channel afterwards.
-	table HostsRecords
+	table *netutil.IPMap
 }

 // newHostsParser creates a new *hostsParser with buffers of size taken from the
@@ -294,7 +277,7 @@ func (hc *HostsContainer) newHostsParser() (hp *hostsParser) {
 	return &hostsParser{
 		rulesBuilder: &strings.Builder{},
 		translations: map[string]string{},
-		table:        make(HostsRecords, len(hc.last)),
+		table:        netutil.NewIPMap(hc.last.Len()),
 	}
 }

@@ -306,7 +289,7 @@ func (hp *hostsParser) parseFile(r io.Reader) (patterns []string, cont bool, err
 	s := bufio.NewScanner(r)
 	for s.Scan() {
 		ip, hosts := hp.parseLine(s.Text())
-		if ip == (netip.Addr{}) || len(hosts) == 0 {
+		if ip == nil || len(hosts) == 0 {
 			continue
 		}

@@ -317,15 +300,14 @@ func (hp *hostsParser) parseFile(r io.Reader) (patterns []string, cont bool, err
 }

 // parseLine parses the line having the hosts syntax ignoring invalid ones.
-func (hp *hostsParser) parseLine(line string) (ip netip.Addr, hosts []string) {
+func (hp *hostsParser) parseLine(line string) (ip net.IP, hosts []string) {
 	fields := strings.Fields(line)
 	if len(fields) < 2 {
-		return netip.Addr{}, nil
+		return nil, nil
 	}

-	ip, err := netip.ParseAddr(fields[0])
-	if err != nil {
-		return netip.Addr{}, nil
+	if ip = net.ParseIP(fields[0]); ip == nil {
+		return nil, nil
 	}

 	for _, f := range fields[1:] {
@@ -343,7 +325,7 @@ func (hp *hostsParser) parseLine(line string) (ip netip.Addr, hosts []string) {
 		// See https://github.com/AdguardTeam/AdGuardHome/issues/3946.
 		//
 		// TODO(e.burkov):  Investigate if hosts may contain DNS-SD domains.
-		err = netutil.ValidateDomainName(f)
+		err := netutil.ValidateDomainName(f)
 		if err != nil {
 			log.Error("%s: host %q is invalid, ignoring", hostsContainerPref, f)

@@ -356,13 +338,30 @@ func (hp *hostsParser) parseLine(line string) (ip netip.Addr, hosts []string) {
 	return ip, hosts
 }

+// HostsRecord represents a single hosts file record.
+type HostsRecord struct {
+	Aliases   *stringutil.Set
+	Canonical string
+}
+
+// Equal returns true if all fields of rec are equal to field in other or they
+// both are nil.
+func (rec *HostsRecord) Equal(other *HostsRecord) (ok bool) {
+	if rec == nil {
+		return other == nil
+	}
+
+	return rec.Canonical == other.Canonical && rec.Aliases.Equal(other.Aliases)
+}
+
 // addRecord puts the record for the IP address to the rules builder if needed.
 // The first host is considered to be the canonical name for the IP address.
 // hosts must have at least one name.
-func (hp *hostsParser) addRecord(ip netip.Addr, hosts []string) {
+func (hp *hostsParser) addRecord(ip net.IP, hosts []string) {
 	line := strings.Join(append([]string{ip.String()}, hosts...), " ")

-	rec, ok := hp.table[ip]
+	var rec *HostsRecord
+	v, ok := hp.table.Get(ip)
 	if !ok {
 		rec = &HostsRecord{
 			Aliases: stringutil.NewSet(),
@@ -370,7 +369,14 @@ func (hp *hostsParser) addRecord(ip netip.Addr, hosts []string) {

 		rec.Canonical, hosts = hosts[0], hosts[1:]
 		hp.addRules(ip, rec.Canonical, line)
-		hp.table[ip] = rec
+		hp.table.Set(ip, rec)
+	} else {
+		rec, ok = v.(*HostsRecord)
+		if !ok {
+			log.Error("%s: adding pairs: unexpected type %T", hostsContainerPref, v)
+
+			return
+		}
 	}

 	for _, host := range hosts {
@@ -385,7 +391,7 @@ func (hp *hostsParser) addRecord(ip netip.Addr, hosts []string) {
 }

 // addRules adds rules and rule translations for the line.
-func (hp *hostsParser) addRules(ip netip.Addr, host, line string) {
+func (hp *hostsParser) addRules(ip net.IP, host, line string) {
 	rule, rulePtr := hp.writeRules(host, ip)
 	hp.translations[rule], hp.translations[rulePtr] = line, line

@@ -394,9 +400,8 @@ func (hp *hostsParser) addRules(ip netip.Addr, host, line string) {

 // writeRules writes the actual rule for the qtype and the PTR for the host-ip
 // pair into internal builders.
-func (hp *hostsParser) writeRules(host string, ip netip.Addr) (rule, rulePtr string) {
-	// TODO(a.garipov):  Add a netip.Addr version to netutil.
-	arpa, err := netutil.IPToReversedAddr(ip.AsSlice())
+func (hp *hostsParser) writeRules(host string, ip net.IP) (rule, rulePtr string) {
+	arpa, err := netutil.IPToReversedAddr(ip)
 	if err != nil {
 		return "", ""
 	}
@@ -414,7 +419,7 @@ func (hp *hostsParser) writeRules(host string, ip netip.Addr) (rule, rulePtr str
 	var qtype string
 	// The validation of the IP address has been performed earlier so it is
 	// guaranteed to be either an IPv4 or an IPv6.
-	if ip.Is4() {
+	if ip.To4() != nil {
 		qtype = "A"
 	} else {
 		qtype = "AAAA"
@@ -441,8 +446,51 @@ func (hp *hostsParser) writeRules(host string, ip netip.Addr) (rule, rulePtr str
 	return rule, rulePtr
 }

+// equalSet returns true if the internal hosts table just parsed equals target.
+// target's values must be of type *HostsRecord.
+func (hp *hostsParser) equalSet(target *netutil.IPMap) (ok bool) {
+	if target == nil {
+		// hp.table shouldn't appear nil since it's initialized on each refresh.
+		return target == hp.table
+	}
+
+	if hp.table.Len() != target.Len() {
+		return false
+	}
+
+	hp.table.Range(func(ip net.IP, recVal any) (cont bool) {
+		var targetVal any
+		targetVal, ok = target.Get(ip)
+		if !ok {
+			return false
+		}
+
+		var rec *HostsRecord
+		rec, ok = recVal.(*HostsRecord)
+		if !ok {
+			log.Error("%s: comparing: unexpected type %T", hostsContainerPref, recVal)
+
+			return false
+		}
+
+		var targetRec *HostsRecord
+		targetRec, ok = targetVal.(*HostsRecord)
+		if !ok {
+			log.Error("%s: comparing: target: unexpected type %T", hostsContainerPref, targetVal)
+
+			return false
+		}
+
+		ok = rec.Equal(targetRec)
+
+		return ok
+	})
+
+	return ok
+}
+
 // sendUpd tries to send the parsed data to the ch.
-func (hp *hostsParser) sendUpd(ch chan HostsRecords) {
+func (hp *hostsParser) sendUpd(ch chan *netutil.IPMap) {
 	log.Debug("%s: sending upd", hostsContainerPref)

 	upd := hp.table
@@ -480,18 +528,14 @@ func (hc *HostsContainer) refresh() (err error) {
 		return fmt.Errorf("refreshing : %w", err)
 	}

-	// hc.last is nil on the first refresh, so let that one through.
-	//
-	// TODO(a.garipov): Once https://github.com/golang/go/issues/56621 is
-	// resolved, remove the first condition.
-	if hc.last != nil && maps.EqualFunc(hp.table, hc.last, (*HostsRecord).equal) {
+	if hp.equalSet(hc.last) {
 		log.Debug("%s: no changes detected", hostsContainerPref)

 		return nil
 	}
 	defer hp.sendUpd(hc.updates)

-	hc.last = maps.Clone(hp.table)
+	hc.last = hp.table.ShallowClone()

 	var rulesStrg *filterlist.RuleStorage
 	if rulesStrg, err = hp.newStrg(hc.listID); err != nil {
--- a/internal/aghnet/hostscontainer_test.go
+++ b/internal/aghnet/hostscontainer_test.go
@@ -3,7 +3,6 @@ package aghnet
 import (
 	"io/fs"
 	"net"
-	"net/netip"
 	"path"
 	"strings"
 	"sync/atomic"
@@ -14,7 +13,6 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/aghchan"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
 	"github.com/AdguardTeam/golibs/errors"
-	"github.com/AdguardTeam/golibs/netutil"
 	"github.com/AdguardTeam/golibs/stringutil"
 	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/AdguardTeam/urlfilter"
@@ -137,7 +135,7 @@ func TestNewHostsContainer(t *testing.T) {
 func TestHostsContainer_refresh(t *testing.T) {
 	// TODO(e.burkov):  Test the case with no actual updates.

-	ip := netutil.IPv4Localhost()
+	ip := net.IP{127, 0, 0, 1}
 	ipStr := ip.String()

 	testFS := fstest.MapFS{"dir/file1": &fstest.MapFile{Data: []byte(ipStr + ` hostname` + nl)}}
@@ -169,13 +167,17 @@ func TestHostsContainer_refresh(t *testing.T) {
 		require.True(t, ok)
 		require.NotNil(t, upd)

-		assert.Len(t, upd, 1)
+		assert.Equal(t, 1, upd.Len())

-		rec, ok := upd[ip]
+		v, ok := upd.Get(ip)
 		require.True(t, ok)
+
+		require.IsType(t, (*HostsRecord)(nil), v)
+
+		rec, _ := v.(*HostsRecord)
 		require.NotNil(t, rec)

-		assert.Truef(t, rec.equal(want), "%+v != %+v", rec, want)
+		assert.Truef(t, rec.Equal(want), "%+v != %+v", rec, want)
 	}

 	t.Run("initial_refresh", func(t *testing.T) {
@@ -560,13 +562,13 @@ func TestHostsContainer(t *testing.T) {
 }

 func TestUniqueRules_ParseLine(t *testing.T) {
-	ip := netutil.IPv4Localhost()
+	ip := net.IP{127, 0, 0, 1}
 	ipStr := ip.String()

 	testCases := []struct {
 		name      string
 		line      string
-		wantIP    netip.Addr
+		wantIP    net.IP
 		wantHosts []string
 	}{{
 		name:      "simple",
@@ -581,7 +583,7 @@ func TestUniqueRules_ParseLine(t *testing.T) {
 	}, {
 		name:      "invalid_line",
 		line:      ipStr,
-		wantIP:    netip.Addr{},
+		wantIP:    nil,
 		wantHosts: nil,
 	}, {
 		name:      "invalid_line_hostname",
@@ -596,7 +598,7 @@ func TestUniqueRules_ParseLine(t *testing.T) {
 	}, {
 		name:      "whole_comment",
 		line:      `# ` + ipStr + ` hostname`,
-		wantIP:    netip.Addr{},
+		wantIP:    nil,
 		wantHosts: nil,
 	}, {
 		name:      "partial_comment",
@@ -606,7 +608,7 @@ func TestUniqueRules_ParseLine(t *testing.T) {
 	}, {
 		name:      "empty",
 		line:      ``,
-		wantIP:    netip.Addr{},
+		wantIP:    nil,
 		wantHosts: nil,
 	}}

@@ -614,7 +616,7 @@ func TestUniqueRules_ParseLine(t *testing.T) {
 		hp := hostsParser{}
 		t.Run(tc.name, func(t *testing.T) {
 			got, hosts := hp.parseLine(tc.line)
-			assert.Equal(t, tc.wantIP, got)
+			assert.True(t, tc.wantIP.Equal(got))
 			assert.Equal(t, tc.wantHosts, hosts)
 		})
 	}
--- a/internal/aghnet/hostscontainer_windows.go
+++ b/internal/aghnet/hostscontainer_windows.go
@@ -15,7 +15,7 @@ import (
 func defaultHostsPaths() (paths []string) {
 	sysDir, err := windows.GetSystemDirectory()
 	if err != nil {
-		log.Error("aghnet: getting system directory: %s", err)
+		log.Error("getting system directory: %s", err)

 		return []string{}
 	}
--- a/internal/aghnet/net.go
+++ b/internal/aghnet/net.go
@@ -31,6 +31,12 @@ var (
 // the IP being static is available.
 const ErrNoStaticIPInfo errors.Error = "no information about static ip"

+// IPv4Localhost returns 127.0.0.1, which returns true for [netip.Addr.Is4].
+func IPv4Localhost() (ip netip.Addr) { return netip.AddrFrom4([4]byte{127, 0, 0, 1}) }
+
+// IPv6Localhost returns ::1, which returns true for [netip.Addr.Is6].
+func IPv6Localhost() (ip netip.Addr) { return netip.AddrFrom16([16]byte{15: 1}) }
+
 // IfaceHasStaticIP checks if interface is configured to have static IP address.
 // If it can't give a definitive answer, it returns false and an error for which
 // errors.Is(err, ErrNoStaticIPInfo) is true.
--- a/internal/aghnet/net_test.go
+++ b/internal/aghnet/net_test.go
@@ -11,6 +11,7 @@ import (
 	"strings"
 	"testing"

+	"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/netutil"
 	"github.com/AdguardTeam/golibs/testutil"
@@ -19,7 +20,7 @@ import (
 )

 func TestMain(m *testing.M) {
-	testutil.DiscardLogOutput(m)
+	aghtest.DiscardLogOutput(m)
 }

 // testdata is the filesystem containing data for testing the package.
@@ -188,14 +189,17 @@ func TestBroadcastFromIPNet(t *testing.T) {
 }

 func TestCheckPort(t *testing.T) {
-	laddr := netip.AddrPortFrom(netutil.IPv4Localhost(), 0)
+	laddr := netip.AddrPortFrom(IPv4Localhost(), 0)

 	t.Run("tcp_bound", func(t *testing.T) {
 		l, err := net.Listen("tcp", laddr.String())
 		require.NoError(t, err)
 		testutil.CleanupAndRequireSuccess(t, l.Close)

-		ipp := testutil.RequireTypeAssert[*net.TCPAddr](t, l.Addr()).AddrPort()
+		addr := l.Addr()
+		require.IsType(t, new(net.TCPAddr), addr)
+
+		ipp := addr.(*net.TCPAddr).AddrPort()
 		require.Equal(t, laddr.Addr(), ipp.Addr())
 		require.NotZero(t, ipp.Port())

@@ -211,7 +215,10 @@ func TestCheckPort(t *testing.T) {
 		require.NoError(t, err)
 		testutil.CleanupAndRequireSuccess(t, conn.Close)

-		ipp := testutil.RequireTypeAssert[*net.UDPAddr](t, conn.LocalAddr()).AddrPort()
+		addr := conn.LocalAddr()
+		require.IsType(t, new(net.UDPAddr), addr)
+
+		ipp := addr.(*net.UDPAddr).AddrPort()
 		require.Equal(t, laddr.Addr(), ipp.Addr())
 		require.NotZero(t, ipp.Port())

--- a/internal/aghnet/systemresolvers_others_test.go
+++ b/internal/aghnet/systemresolvers_others_test.go
@@ -6,7 +6,6 @@ import (
 	"context"
 	"testing"

-	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -18,8 +17,9 @@ func createTestSystemResolversImpl(
 	t.Helper()

 	sr := createTestSystemResolvers(t, hostGenFunc)
+	require.IsType(t, (*systemResolvers)(nil), sr)

-	return testutil.RequireTypeAssert[*systemResolvers](t, sr)
+	return sr.(*systemResolvers)
 }

 func TestSystemResolvers_Refresh(t *testing.T) {
--- a/internal/aghos/aghos_test.go
+++ b/internal/aghos/aghos_test.go
@@ -3,9 +3,9 @@ package aghos_test
 import (
 	"testing"

-	"github.com/AdguardTeam/golibs/testutil"
+	"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
 )

 func TestMain(m *testing.M) {
-	testutil.DiscardLogOutput(m)
+	aghtest.DiscardLogOutput(m)
 }
--- a/internal/aghos/os.go
+++ b/internal/aghos/os.go
@@ -168,11 +168,11 @@ func IsOpenWrt() (ok bool) {
 	return isOpenWrt()
 }

-// RootDirFS returns the [fs.FS] rooted at the operating system's root.  On
-// Windows it returns the fs.FS rooted at the volume of the system directory
-// (usually, C:).
+// RootDirFS returns the fs.FS rooted at the operating system's root.
 func RootDirFS() (fsys fs.FS) {
-	return rootDirFS()
+	// Use empty string since os.DirFS implicitly prepends a slash to it.  This
+	// behavior is undocumented but it currently works.
+	return os.DirFS("")
 }

 // NotifyReconfigureSignal notifies c on receiving reconfigure signals.
--- a/internal/aghos/os_unix.go
+++ b/internal/aghos/os_unix.go
@@ -3,17 +3,12 @@
 package aghos

 import (
-	"io/fs"
 	"os"
 	"os/signal"

 	"golang.org/x/sys/unix"
 )

-func rootDirFS() (fsys fs.FS) {
-	return os.DirFS("/")
-}
-
 func notifyReconfigureSignal(c chan<- os.Signal) {
 	signal.Notify(c, unix.SIGHUP)
 }
--- a/internal/aghos/os_windows.go
+++ b/internal/aghos/os_windows.go
@@ -3,29 +3,13 @@
 package aghos

 import (
-	"io/fs"
 	"os"
 	"os/signal"
-	"path/filepath"
 	"syscall"

-	"github.com/AdguardTeam/golibs/log"
 	"golang.org/x/sys/windows"
 )

-func rootDirFS() (fsys fs.FS) {
-	// TODO(a.garipov): Use a better way if golang/go#44279 is ever resolved.
-	sysDir, err := windows.GetSystemDirectory()
-	if err != nil {
-		log.Error("aghos: getting root filesystem: %s; using C:", err)
-
-		// Assume that C: is the safe default.
-		return os.DirFS("C:")
-	}
-
-	return os.DirFS(filepath.VolumeName(sysDir))
-}
-
 func setRlimit(val uint64) (err error) {
 	return Unsupported("setrlimit")
 }
@@ -71,7 +55,9 @@ func isReconfigureSignal(sig os.Signal) (ok bool) {

 func isShutdownSignal(sig os.Signal) (ok bool) {
 	switch sig {
-	case os.Interrupt, syscall.SIGTERM:
+	case
+		os.Interrupt,
+		syscall.SIGTERM:
 		return true
 	default:
 		return false
--- a/internal/aghtest/aghtest.go
+++ b/internal/aghtest/aghtest.go
@@ -3,11 +3,21 @@ package aghtest

 import (
 	"io"
+	"os"
 	"testing"

 	"github.com/AdguardTeam/golibs/log"
 )

+// DiscardLogOutput runs tests with discarded logger output.
+func DiscardLogOutput(m *testing.M) {
+	// TODO(e.burkov): Refactor code and tests to not use the global mutable
+	// logger.
+	log.SetOutput(io.Discard)
+
+	os.Exit(m.Run())
+}
+
 // ReplaceLogWriter moves logger output to w and uses Cleanup method of t to
 // revert changes.
 func ReplaceLogWriter(t testing.TB, w io.Writer) {
--- a/internal/aghtest/interface.go
+++ b/internal/aghtest/interface.go
@@ -1,10 +1,12 @@
 package aghtest

 import (
+	"context"
 	"io/fs"
 	"net"

 	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
+	"github.com/AdguardTeam/AdGuardHome/internal/next/agh"
 	"github.com/AdguardTeam/dnsproxy/upstream"
 	"github.com/miekg/dns"
 )
@@ -116,6 +118,36 @@ func (w *FSWatcher) Close() (err error) {
 	return w.OnClose()
 }

+// Package agh
+
+// type check
+var _ agh.ServiceWithConfig[struct{}] = (*ServiceWithConfig[struct{}])(nil)
+
+// ServiceWithConfig is a mock [agh.ServiceWithConfig] implementation for tests.
+type ServiceWithConfig[ConfigType any] struct {
+	OnStart    func() (err error)
+	OnShutdown func(ctx context.Context) (err error)
+	OnConfig   func() (c ConfigType)
+}
+
+// Start implements the [agh.ServiceWithConfig] interface for
+// *ServiceWithConfig.
+func (s *ServiceWithConfig[_]) Start() (err error) {
+	return s.OnStart()
+}
+
+// Shutdown implements the [agh.ServiceWithConfig] interface for
+// *ServiceWithConfig.
+func (s *ServiceWithConfig[_]) Shutdown(ctx context.Context) (err error) {
+	return s.OnShutdown(ctx)
+}
+
+// Config implements the [agh.ServiceWithConfig] interface for
+// *ServiceWithConfig.
+func (s *ServiceWithConfig[ConfigType]) Config() (c ConfigType) {
+	return s.OnConfig()
+}
+
 // Module dnsproxy

 // Package upstream
--- a/internal/aghtest/upstream.go
+++ b/internal/aghtest/upstream.go
@@ -5,12 +5,13 @@ import (
 	"encoding/hex"
 	"fmt"
 	"net"
-	"net/netip"
 	"strings"
+	"testing"

 	"github.com/AdguardTeam/dnsproxy/upstream"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/miekg/dns"
+	"github.com/stretchr/testify/require"
 )

 // Additional Upstream Testing Utilities
@@ -25,10 +26,51 @@ type Upstream struct {
 	IPv4 map[string][]net.IP
 	// IPv6 is a map of hostname to IPv6.
 	IPv6 map[string][]net.IP
+	// Reverse is a map of address to domain name.
+	Reverse map[string][]string
+	// Addr is the address for Address method.
+	Addr string
 }

 var _ upstream.Upstream = (*Upstream)(nil)

+// RespondTo returns a response with answer if req has class cl, question type
+// qt, and target targ.
+func RespondTo(t testing.TB, req *dns.Msg, cl, qt uint16, targ, answer string) (resp *dns.Msg) {
+	t.Helper()
+
+	require.NotNil(t, req)
+	require.Len(t, req.Question, 1)
+
+	q := req.Question[0]
+	targ = dns.Fqdn(targ)
+	if q.Qclass != cl || q.Qtype != qt || q.Name != targ {
+		return nil
+	}
+
+	respHdr := dns.RR_Header{
+		Name:   targ,
+		Rrtype: qt,
+		Class:  cl,
+		Ttl:    60,
+	}
+
+	resp = new(dns.Msg).SetReply(req)
+	switch qt {
+	case dns.TypePTR:
+		resp.Answer = []dns.RR{
+			&dns.PTR{
+				Hdr: respHdr,
+				Ptr: answer,
+			},
+		}
+	default:
+		t.Fatalf("unsupported question type: %s", dns.Type(qt))
+	}
+
+	return resp
+}
+
 // Exchange implements the [upstream.Upstream] interface for *Upstream.
 //
 // TODO(a.garipov): Split further into handlers.
@@ -63,6 +105,10 @@ func (u *Upstream) Exchange(m *dns.Msg) (resp *dns.Msg, err error) {
 		for _, ip := range u.IPv6[name] {
 			resp.Answer = append(resp.Answer, &dns.AAAA{Hdr: hdr, AAAA: ip})
 		}
+	case dns.TypePTR:
+		for _, name := range u.Reverse[name] {
+			resp.Answer = append(resp.Answer, &dns.PTR{Hdr: hdr, Ptr: name})
+		}
 	}
 	if len(resp.Answer) == 0 {
 		resp.SetRcode(m, dns.RcodeNameError)
@@ -73,7 +119,7 @@ func (u *Upstream) Exchange(m *dns.Msg) (resp *dns.Msg, err error) {

 // Address implements [upstream.Upstream] interface for *Upstream.
 func (u *Upstream) Address() string {
-	return "todo.upstream.example"
+	return u.Addr
 }

 // Close implements [upstream.Upstream] interface for *Upstream.
@@ -81,98 +127,6 @@ func (u *Upstream) Close() (err error) {
 	return nil
 }

-// MatchedResponse is a test helper that returns a response with answer if req
-// has question type qt, and target targ.  Otherwise, it returns nil.
-//
-// req must not be nil and req.Question must have a length of 1.  Answer is
-// interpreted in the following ways:
-//
-//   - For A and AAAA queries, answer must be an IP address of the corresponding
-//     protocol version.
-//
-//   - For PTR queries, answer should be a domain name in the response.
-//
-// If the answer does not correspond to the question type, MatchedResponse panics.
-// Panics are used instead of [testing.TB], because the helper is intended to
-// use in [UpstreamMock.OnExchange] callbacks, which are usually called in a
-// separate goroutine.
-//
-// TODO(a.garipov): Consider adding version with DNS class as well.
-func MatchedResponse(req *dns.Msg, qt uint16, targ, answer string) (resp *dns.Msg) {
-	if req == nil || len(req.Question) != 1 {
-		panic(fmt.Errorf("bad req: %+v", req))
-	}
-
-	q := req.Question[0]
-	targ = dns.Fqdn(targ)
-	if q.Qclass != dns.ClassINET || q.Qtype != qt || q.Name != targ {
-		return nil
-	}
-
-	respHdr := dns.RR_Header{
-		Name:   targ,
-		Rrtype: qt,
-		Class:  dns.ClassINET,
-		Ttl:    60,
-	}
-
-	resp = new(dns.Msg).SetReply(req)
-	switch qt {
-	case dns.TypeA:
-		resp.Answer = mustAnsA(respHdr, answer)
-	case dns.TypeAAAA:
-		resp.Answer = mustAnsAAAA(respHdr, answer)
-	case dns.TypePTR:
-		resp.Answer = []dns.RR{&dns.PTR{
-			Hdr: respHdr,
-			Ptr: answer,
-		}}
-	default:
-		panic(fmt.Errorf("aghtest: bad question type: %s", dns.Type(qt)))
-	}
-
-	return resp
-}
-
-// mustAnsA returns valid answer records if s is a valid IPv4 address.
-// Otherwise, mustAnsA panics.
-func mustAnsA(respHdr dns.RR_Header, s string) (ans []dns.RR) {
-	ip, err := netip.ParseAddr(s)
-	if err != nil || !ip.Is4() {
-		panic(fmt.Errorf("aghtest: bad A answer: %+v", s))
-	}
-
-	return []dns.RR{&dns.A{
-		Hdr: respHdr,
-		A:   ip.AsSlice(),
-	}}
-}
-
-// mustAnsAAAA returns valid answer records if s is a valid IPv6 address.
-// Otherwise, mustAnsAAAA panics.
-func mustAnsAAAA(respHdr dns.RR_Header, s string) (ans []dns.RR) {
-	ip, err := netip.ParseAddr(s)
-	if err != nil || !ip.Is6() {
-		panic(fmt.Errorf("aghtest: bad AAAA answer: %+v", s))
-	}
-
-	return []dns.RR{&dns.AAAA{
-		Hdr:  respHdr,
-		AAAA: ip.AsSlice(),
-	}}
-}
-
-// NewUpstreamMock returns an [*UpstreamMock], fields OnAddress and OnClose of
-// which are set to stubs that return "upstream.example" and nil respectively.
-// The field OnExchange is set to onExc.
-func NewUpstreamMock(onExc func(req *dns.Msg) (resp *dns.Msg, err error)) (u *UpstreamMock) {
-	return &UpstreamMock{
-		OnAddress:  func() (addr string) { return "upstream.example" },
-		OnExchange: onExc,
-		OnClose:    func() (err error) { return nil },
-	}
-}
-
 // NewBlockUpstream returns an [*UpstreamMock] that works like an upstream that
 // supports hash-based safe-browsing/adult-blocking feature.  If shouldBlock is
 // true, hostname's actual hash is returned, blocking it.  Otherwise, it returns
@@ -198,7 +152,9 @@ func NewBlockUpstream(hostname string, shouldBlock bool) (u *UpstreamMock) {
 	}

 	return &UpstreamMock{
-		OnAddress: func() (addr string) { return "sbpc.upstream.example" },
+		OnAddress: func() (addr string) {
+			return "sbpc.upstream.example"
+		},
 		OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
 			resp = respTmpl.Copy()
 			resp.SetReply(req)
@@ -206,7 +162,6 @@ func NewBlockUpstream(hostname string, shouldBlock bool) (u *UpstreamMock) {

 			return resp, nil
 		},
-		OnClose: func() (err error) { return nil },
 	}
 }

@@ -218,10 +173,11 @@ const ErrUpstream errors.Error = "test upstream error"
 // its Exchange method.
 func NewErrorUpstream() (u *UpstreamMock) {
 	return &UpstreamMock{
-		OnAddress: func() (addr string) { return "error.upstream.example" },
+		OnAddress: func() (addr string) {
+			return "error.upstream.example"
+		},
 		OnExchange: func(_ *dns.Msg) (resp *dns.Msg, err error) {
 			return nil, errors.Error("test upstream error")
 		},
-		OnClose: func() (err error) { return nil },
 	}
 }
--- a/internal/aghtls/aghtls.go
+++ b/internal/aghtls/aghtls.go
@@ -3,9 +3,7 @@ package aghtls

 import (
 	"crypto/tls"
-	"crypto/x509"
 	"fmt"
-	"net/netip"

 	"github.com/AdguardTeam/golibs/log"
 )
@@ -71,19 +69,3 @@ func SaferCipherSuites() (safe []uint16) {

 	return safe
 }
-
-// CertificateHasIP returns true if cert has at least a single IP address among
-// its subjectAltNames.
-func CertificateHasIP(cert *x509.Certificate) (ok bool) {
-	if len(cert.IPAddresses) > 0 {
-		return true
-	}
-
-	for _, name := range cert.DNSNames {
-		if _, err := netip.ParseAddr(name); err == nil {
-			return true
-		}
-	}
-
-	return false
-}
--- a/internal/aghtls/aghtls_test.go
+++ b/internal/aghtls/aghtls_test.go
@@ -4,13 +4,14 @@ import (
 	"crypto/tls"
 	"testing"

+	"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghtls"
 	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/stretchr/testify/assert"
 )

 func TestMain(m *testing.M) {
-	testutil.DiscardLogOutput(m)
+	aghtest.DiscardLogOutput(m)
 }

 func TestParseCiphers(t *testing.T) {
--- a/internal/dhcpd/config.go
+++ b/internal/dhcpd/config.go
@@ -137,14 +137,14 @@ func (c *V4ServerConf) Validate() (err error) {

 	gatewayIP, err := ensureV4(c.GatewayIP, "address")
 	if err != nil {
-		// Don't wrap the error since it's informative enough as is and there is
+		// Don't wrap an errors since it's informative enough as is and there is
 		// an annotation deferred already.
 		return err
 	}

 	subnetMask, err := ensureV4(c.SubnetMask, "subnet mask")
 	if err != nil {
-		// Don't wrap the error since it's informative enough as is and there is
+		// Don't wrap an errors since it's informative enough as is and there is
 		// an annotation deferred already.
 		return err
 	}
@@ -155,21 +155,20 @@ func (c *V4ServerConf) Validate() (err error) {

 	rangeStart, err := ensureV4(c.RangeStart, "address")
 	if err != nil {
-		// Don't wrap the error since it's informative enough as is and there is
+		// Don't wrap an errors since it's informative enough as is and there is
 		// an annotation deferred already.
 		return err
 	}
-
 	rangeEnd, err := ensureV4(c.RangeEnd, "address")
 	if err != nil {
-		// Don't wrap the error since it's informative enough as is and there is
+		// Don't wrap an errors since it's informative enough as is and there is
 		// an annotation deferred already.
 		return err
 	}

 	c.ipRange, err = newIPRange(rangeStart.AsSlice(), rangeEnd.AsSlice())
 	if err != nil {
-		// Don't wrap the error since it's informative enough as is and there is
+		// Don't wrap an errors since it's informative enough as is and there is
 		// an annotation deferred already.
 		return err
 	}
--- a/internal/dhcpd/dhcpd.go
+++ b/internal/dhcpd/dhcpd.go
@@ -9,8 +9,8 @@ import (
 	"time"

 	"github.com/AdguardTeam/golibs/log"
+	"github.com/AdguardTeam/golibs/netutil"
 	"github.com/AdguardTeam/golibs/timeutil"
-	"golang.org/x/exp/slices"
 )

 const (
@@ -54,8 +54,8 @@ func (l *Lease) Clone() (clone *Lease) {
 	return &Lease{
 		Expiry:   l.Expiry,
 		Hostname: l.Hostname,
-		HWAddr:   slices.Clone(l.HWAddr),
-		IP:       slices.Clone(l.IP),
+		HWAddr:   netutil.CloneMAC(l.HWAddr),
+		IP:       netutil.CloneIP(l.IP),
 	}
 }

@@ -219,6 +219,8 @@ var _ Interface = (*server)(nil)

 // Create initializes and returns the DHCP server handling both address
 // families.  It also registers the corresponding HTTP API endpoints.
+//
+// TODO(e.burkov):  Don't register handlers, see TODO on [aghhttp.RegisterFunc].
 func Create(conf *ServerConfig) (s *server, err error) {
 	s = &server{
 		conf: &ServerConfig{
@@ -235,8 +237,6 @@ func Create(conf *ServerConfig) (s *server, err error) {
 		},
 	}

-	// TODO(e.burkov):  Don't register handlers, see TODO on
-	// [aghhttp.RegisterFunc].
 	s.registerHandlers()

 	v4conf := conf.Conf4
@@ -250,7 +250,7 @@ func Create(conf *ServerConfig) (s *server, err error) {
 			return nil, fmt.Errorf("creating dhcpv4 srv: %w", err)
 		}

-		log.Debug("dhcpd: warning: creating dhcpv4 srv: %s", err)
+		log.Error("creating dhcpv4 srv: %s", err)
 	}

 	v6conf := conf.Conf6
--- a/internal/dhcpd/dhcpd_unix_test.go
+++ b/internal/dhcpd/dhcpd_unix_test.go
@@ -9,14 +9,15 @@ import (
 	"testing"
 	"time"

+	"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
+	"github.com/AdguardTeam/golibs/netutil"
 	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
 )

 func TestMain(m *testing.M) {
-	testutil.DiscardLogOutput(m)
+	aghtest.DiscardLogOutput(m)
 }

 func testNotify(flags uint32) {
@@ -156,7 +157,7 @@ func TestV4Server_badRange(t *testing.T) {
 // cloneUDPAddr returns a deep copy of a.
 func cloneUDPAddr(a *net.UDPAddr) (clone *net.UDPAddr) {
 	return &net.UDPAddr{
-		IP:   slices.Clone(a.IP),
+		IP:   netutil.CloneIP(a.IP),
 		Port: a.Port,
 		Zone: a.Zone,
 	}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`export { default as ClientsTable } from './ClientsTable';`