Bump version to v0.8.20260118

luci: updater: Using 3 buttons and fix execAndRead
luci: Fix error "XHR request timed out" into execAndRead
2026-01-27 21:00:37 +03:00 · 2026-01-18 13:35:06 +03:00 · 2026-01-18 13:34:55 +03:00 · 2026-01-18 10:01:27 +03:00 · 2026-01-17 17:36:54 +03:00 · 2026-01-17 15:52:46 +03:00
46 changed files with 692 additions and 1675 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report_en.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report_en.yml
@@ -1,80 +0,0 @@
---
-name: 🐛 Bug Report
-description: Report a reproducible bug
-title: "[BUG] "
-labels: ["bug"]
-assignees: []
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for reporting a bug! Please fill out the form below.
-        
-        Before sending, please:
-        - Check [existing issues](https://github.com/remittor/zapret-openwrt/issues)
-        - Read [documentation](https://github.com/remittor/zapret-openwrt/wiki/)
-
-  - type: textarea
-    id: description
-    attributes:
-      label: 📝 Bug description
-      description: A clear and concise description of what is not working
-      placeholder: A clear and concise description of the bug
-    validations:
-      required: true
-
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Steps to reproduce
-      description: Steps to reproduce the problem. If you're following a manual, please include a link to it.
-      placeholder: |
-        1. 
-        2. 
-        3. 
-        4. 
-    validations:
-      required: true
-
-  - type: textarea
-    id: expected
-    attributes:
-      label: ✅ Expected behavior
-      description: A clear and concise description of what was to happen
-      placeholder: Describe the expected behavior
-    validations:
-      required: true
-
-  - type: textarea
-    id: environment
-    attributes:
-      label: 🖥️ System Information
-      description: |
-        Information about your system (fill in all that used)
-      value: |
-        - **OpenWrt version**: 
-        - **Zapret version**: 
-        - **Router model**: 
-      render: markdown
-    validations:
-      required: true
-
-  - type: textarea
-    id: strategy
-    attributes:
-      label: ✅ The NFQWS strategy used
-      description: All parameters of the NFQWS strategy, or its name
-      placeholder: If the problem is caused by the NFQWS strategy
-
-  - type: textarea
-    id: config
-    attributes:
-      label: ⚙️ System Configurations
-      description: |
-        Relevant parts of the configuration (remove sensitive information!)
-      placeholder: |
-        For example:
-        - Contents of /etc/config/zapret
-        - Firewall configuration (Flow offloading, etc.)
-        - Additional configurations required for wireless/network/dhcp, etc.
-      render: shell
--- a/.github/ISSUE_TEMPLATE/bug_report_ru.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report_ru.yml
@@ -1,80 +0,0 @@
---
-name: 🐛 Сообщение об ошибке
-description: Сообщить об ошибке
-title: "[BUG] "
-labels: ["bug"]
-assignees: []
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Спасибо за создание отчета об ошибке!
-        
-        Перед отправкой, пожалуйста:
-        - Проверьте [существующие issues](https://github.com/remittor/zapret-openwrt/issues)
-        - Просмотрите [документацию](https://github.com/remittor/zapret-openwrt/wiki/)
-
-  - type: textarea
-    id: description
-    attributes:
-      label: 📝 Описание проблемы
-      description: Четкое и краткое описание того, что не работает
-      placeholder: Опишите проблему
-    validations:
-      required: true
-
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Шаги для воспроизведения
-      description: Шаги для воспроизведения проблемы. Если вы настраваете что-то по какому либо мануалу, приложите ссылку на него.
-      placeholder: |
-        1. 
-        2. 
-        3. 
-        4. 
-    validations:
-      required: true
-
-  - type: textarea
-    id: expected
-    attributes:
-      label: ✅ Ожидаемое поведение
-      description: Четкое и краткое описание того, что должно было произойти
-      placeholder: Опишите ожидаемое поведение
-    validations:
-      required: true
-
-  - type: textarea
-    id: environment
-    attributes:
-      label: 🖥️ Информация о системе
-      description: |
-        Информация о вашей системе (заполните всё применяемое)
-      value: |
-        - **OpenWrt версия**: 
-        - **Zapret версия**: 
-        - **Роутер модель**: 
-      render: markdown
-    validations:
-      required: true
-
-  - type: textarea
-    id: strategy
-    attributes:
-      label: ✅ Используемая стратегия NFQWS
-      description: Все параметры стратегии NFQWS, либо её название
-      placeholder: Если проблема вызвана стратегией NFQWS
-
-  - type: textarea
-    id: config
-    attributes:
-      label: ⚙️ Конфигурация
-      description: |
-        Релевантные части конфигурации (удалите чувствительную информацию!)
-      placeholder: |
-        Например:
-        - Содержимое /etc/config/zapret
-        - Конфигурация файервола (опция Flow offloading и т.п.)
-        - Дополнительные конфиги, которые потребуются wireless/network/dhcp и т.д.
-      render: shell
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,9 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: 💬 Installation instructions / Инструкция по установке 
-    url: https://github.com/remittor/zapret-openwrt/wiki/Installing-zapret%E2%80%90openwrt-package
-    about: Installation instructions / Инструкция по установке
-
-  - name: 📚 Original documetation / Оригинальная документация к zapret'у
-    url: https://github.com/bol-van/zapret/blob/master/docs/readme.md
-    about: README zapret
--- a/.github/ISSUE_TEMPLATE/feature_request_en.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request_en.yml
@@ -1,66 +0,0 @@
---
-name: ✨ Feature Request
-description: Suggest a new feature or improvement
-title: "[FEATURE] "
-labels: ["enhancement", "needs-discussion"]
-assignees: []
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Before sending, please:
-        - Check [existing requests](https://github.com/remittor/zapret-openwrt/issues?q=is%3Aissue+label%3Aenhancement)
-        - Make sure the function doesn't exist in [documentation](https://github.com/remittor/zapret-openwrt/wiki/)
-
-  - type: textarea
-    id: summary
-    attributes:
-      label: Brief description
-      description: Brief description of the proposed function
-      placeholder: In one sentence, describe what you want to add...
-    validations:
-      required: true
-
-  - type: textarea
-    id: problem
-    attributes:
-      label: The problem it solves
-      description: |
-        Description of the problem or inconvenience this feature will solve
-      placeholder: |
-        There is no possibility now [...]
-    validations:
-      required: true
-
-  - type: textarea
-    id: solution
-    attributes:
-      label: 💡 Proposed solution
-      description: A clear and concise description of what you want to achieve
-      placeholder: |
-        I want Zapret to be able to [...]
-        I suggest adding a feature that [...]
-        Could be improved [...]
-    validations:
-      required: true
-
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Workaround
-      description: |
-        Describe any alternative solutions or features you considered.
-        Are there any workarounds you currently use?
-      placeholder: |
-        I'm currently solving this problem by [...]
-        An alternative would be [...]
-        I tried using [...], but it doesn't work because [...]
-
-  - type: textarea
-    id: implementation
-    attributes:
-      label: Implementation ideas (optional)
-      description: |
-        If you have any ideas on how this could be implemented, please share them. Please keep LuCI's limitations in mind.
-      placeholder: |
-        This can be achieved using [...]
--- a/.github/ISSUE_TEMPLATE/feature_request_ru.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request_ru.yml
@@ -1,68 +0,0 @@
---
-name: ✨ Запрос новой функции
-description: Предложите новую функцию или улучшение для Zapret
-title: "[FEATURE] "
-labels: ["enhancement", "needs-discussion"]
-assignees: []
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Спасибо за предложение новой функции!
-        
-        Перед отправкой, пожалуйста:
-        - Проверьте [существующие запросы](https://github.com/remittor/zapret-openwrt/issues?q=is%3Aissue+label%3Aenhancement)
-        - Убедитесь, что функции не существует в [документации](https://github.com/remittor/zapret-openwrt/wiki/)
-
-  - type: textarea
-    id: summary
-    attributes:
-      label: Краткое описание
-      description: Краткое описание предлагаемой функции
-      placeholder: В одном предложении опишите, что вы хотите добавить...
-    validations:
-      required: true
-
-  - type: textarea
-    id: problem
-    attributes:
-      label: Проблема, которую решает
-      description: |
-        Описание проблемы или неудобства, которое решит эта функция
-      placeholder: |
-        Сейчас нет возможности [...]
-    validations:
-      required: true
-
-  - type: textarea
-    id: solution
-    attributes:
-      label: 💡 Предлагаемое решение
-      description: Четкое и краткое описание того, что вы хотите реализовать
-      placeholder: |
-        Я хочу, чтобы Zapret мог [...]
-        Предлагаю добавить функцию, которая [...]
-        Можно было бы улучшить [...] путем [...]
-    validations:
-      required: true
-
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Workaround
-      description: |
-        Опишите альтернативные решения или функции, которые вы рассматривали
-        Есть ли обходные пути, которые вы используете сейчас?
-      placeholder: |
-        Сейчас я решаю это проблему путем [...]
-        Альтернативой могло бы быть [...]
-        Пробовал использовать [...], но это не подходит потому что [...]
-
-  - type: textarea
-    id: implementation
-    attributes:
-      label: Идеи реализации (опционально)
-      description: |
-        Если у вас есть идеи о том, как это можно реализовать, поделитесь ими. Помните про ограничения LuCI.
-      placeholder: |
-        Это можно реализовать с помощью [...]
--- a/.github/ISSUE_TEMPLATE/help_wanted_en.yml
+++ b/.github/ISSUE_TEMPLATE/help_wanted_en.yml
@@ -1,78 +0,0 @@
---
-name: 🆘 Help wanted
-description: Ask for help or propose to help
-title: "[HELP] "
-labels: ["help wanted"]
-assignees: []
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Before sending, please:
-        - Check [existing issues](https://github.com/remittor/zapret-openwrt/issues)
-        - Read [documentation](https://github.com/remittor/zapret-openwrt/wiki/)
-
-  - type: textarea
-    id: description
-    attributes:
-      label: 📝 Problem description
-      description: What do you need help with?
-      placeholder: A clear and concise description of the problem
-    validations:
-      required: true
-
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Steps to reproduce
-      description: Steps to reproduce the problem. If you're following a manual, please include a link to it.
-      placeholder: |
-        1. 
-        2. 
-        3. 
-        4. 
-    validations:
-      required: true
-
-  - type: textarea
-    id: expected
-    attributes:
-      label: ✅ Expected behavior
-      description: A clear and concise description of what was to happen
-      placeholder: Describe the expected behavior
-    validations:
-      required: true
-
-  - type: textarea
-    id: environment
-    attributes:
-      label: 🖥️ System Information
-      description: |
-        Information about your system (fill in all that used)
-      value: |
-        - **OpenWrt version**: 
-        - **Zapret version**: 
-        - **Router model**: 
-      render: markdown
-    validations:
-      required: true
-
-  - type: textarea
-    id: strategy
-    attributes:
-      label: ✅ The NFQWS strategy used
-      description: All parameters of the NFQWS strategy, or its name
-      placeholder: If the problem is caused by the NFQWS strategy
-
-  - type: textarea
-    id: config
-    attributes:
-      label: ⚙️ System Configurations
-      description: |
-        Relevant parts of the configuration (remove sensitive information!)
-      placeholder: |
-        For example:
-        - Contents of /etc/config/zapret
-        - Firewall configuration (Flow offloading, etc.)
-        - Additional configurations required for wireless/network/dhcp, etc.
-      render: shell
--- a/.github/ISSUE_TEMPLATE/help_wanted_ru.yml
+++ b/.github/ISSUE_TEMPLATE/help_wanted_ru.yml
@@ -1,78 +0,0 @@
---
-name: 🆘 Нужна помощь
-description: Нужна помощь
-title: "[HELP] "
-labels: ["help wanted"]
-assignees: []
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Перед отправкой, пожалуйста:
-        - Проверьте [существующие issues](https://github.com/remittor/zapret-openwrt/issues)
-        - Просмотрите [документацию](https://github.com/remittor/zapret-openwrt/wiki/)
-
-  - type: textarea
-    id: description
-    attributes:
-      label: 📝 Описание проблемы
-      description: В чём именно нужна помощь?
-      placeholder: Опишите проблему
-    validations:
-      required: true
-
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Шаги для воспроизведения
-      description: Шаги для воспроизведения проблемы. Если вы настраваете что-то по какому либо мануалу, приложите ссылку на него.
-      placeholder: |
-        1. 
-        2. 
-        3. 
-        4. 
-    validations:
-      required: true
-
-  - type: textarea
-    id: expected
-    attributes:
-      label: ✅ Ожидаемое поведение
-      description: Четкое и краткое описание того, что должно было произойти
-      placeholder: Опишите ожидаемое поведение
-    validations:
-      required: true
-
-  - type: textarea
-    id: environment
-    attributes:
-      label: 🖥️ Информация о системе
-      description: |
-        Информация о вашей системе (заполните всё применяемое)
-      value: |
-        - **OpenWrt версия**: 
-        - **Zapret версия**: 
-        - **Роутер модель**: 
-      render: markdown
-    validations:
-      required: true
-
-  - type: textarea
-    id: strategy
-    attributes:
-      label: ✅ Используемая стратегия NFQWS
-      description: Все параметры стратегии NFQWS, либо её название
-      placeholder: Если проблема вызвана стратегией NFQWS
-
-  - type: textarea
-    id: config
-    attributes:
-      label: ⚙️ Конфигурация
-      description: |
-        Релевантные части конфигурации (удалите чувствительную информацию!)
-      placeholder: |
-        Например:
-        - Содержимое /etc/config/zapret
-        - Конфигурация файервола (опция Flow offloading и т.п.)
-        - Дополнительные конфиги, которые потребуются wireless/network/dhcp и т.д.
-      render: shell
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -155,8 +155,6 @@ jobs:
          - mipsel_24kc_24kf
          - mipsel_74kc
          - mipsel_mips32
-          - riscv64_riscv64
-          - riscv64_generic
          - x86_64
        isTestOrFake:
          - ${{ needs.check.outputs.test_build == 'true' || needs.check.outputs.fake_build == 'true' }}
@@ -165,10 +163,6 @@ jobs:
            arch: arm_cortex-a9_vfpv3-d16
          - branch: ${{ needs.var.outputs.APK_BRANCH }}
            arch: mips_4kec
-          - branch: ${{ needs.var.outputs.APK_BRANCH }}
-            arch: riscv64_riscv64
-          - branch: ${{ needs.var.outputs.IPK_BRANCH }}
-            arch: riscv64_generic
          - { isTestOrFake: true }
        include:
          - branch: ${{ needs.var.outputs.IPK_BRANCH }}
@@ -276,8 +270,6 @@ jobs:
        run: |
          make defconfig
          sed -i 's/CONFIG_LUCI_JSMIN=y/CONFIG_LUCI_JSMIN=n/g' .config
-          sed -i 's/CONFIG_LUCI_CSSMIN=y/CONFIG_LUCI_CSSMIN=n/g' .config
-          grep -q '^CONFIG_LUCI_CSSMIN=' .config || echo 'CONFIG_LUCI_CSSMIN=n' >> .config
          echo "status=success" >> $GITHUB_OUTPUT

      - name: Show config
@@ -292,9 +284,9 @@ jobs:
        env:
          ARCH_TAG: ${{ matrix.arch }}
        run: |
-          PKGLIST="package/zapret-openwrt/zapret/compile"
+          PKGLIST="package/zapret-openwrt/zapret2/compile"
          if [ "$ARCH_TAG" = "$LUCI_ARCH" ]; then
-              PKGLIST="$PKGLIST package/zapret-openwrt/luci-app-zapret/compile"
+              PKGLIST="$PKGLIST package/zapret-openwrt/luci-app-zapret2/compile"
          fi
          MAKE_JOBS=$(nproc)
          echo "$MAKE_JOBS thread compile"
@@ -314,8 +306,8 @@ jobs:
        run: |
          OUT_DIR=./bin/packages/dev_x/base
          mkdir -p $OUT_DIR
-          touch $OUT_DIR/zapret_$PKGVER-$ARCH_TAG.$PKGTYPE
-          touch $OUT_DIR/luci-app-zapret_$PKGVER-all.$PKGTYPE
+          touch $OUT_DIR/zapret2_$PKGVER-$ARCH_TAG.$PKGTYPE
+          touch $OUT_DIR/luci-app-zapret2_$PKGVER-all.$PKGTYPE
          echo "status=success" >> $GITHUB_OUTPUT

      - name: Install packages
@@ -326,7 +318,7 @@ jobs:
          ARCH_TAG: ${{ matrix.arch }}
          SIGN_KEY: ${{ secrets.SIGN_PRIVATE_KEY }}
        run: |
-          find ./bin/packages/*/base -type f ! -regex ".*\(zapret\).*\.[ai]pk$" -delete
+          find ./bin/packages/*/base -type f ! -regex ".*\(zapret2\).*\.[ai]pk$" -delete
          #echo ">>>>>>> build a repository index to make the output directory usable as local OPKG source"
          #ln -s `which usign` staging_dir/host/bin/usign
          #echo "$SIGN_KEY" | base64 -d > key-build
@@ -392,7 +384,7 @@ jobs:
          find ./sorted -mindepth 1 -maxdepth 1 -type d -exec cp -f "$LUCI_IPK" "{}/" \;
          find ./sorted -mindepth 2 -maxdepth 2 -type d -name "apk" -exec cp -f "$LUCI_APK" "{}/" \;
          mkdir -p public
-          find ./sorted -mindepth 1 -maxdepth 1 -type d -exec sh -c '7z a ./public/zapret_v${PKGVER}_$(basename "{}" | cut -d, -f3).zip {}/*' \;
+          find ./sorted -mindepth 1 -maxdepth 1 -type d -exec sh -c '7z a ./public/zapret2_v${PKGVER}_$(basename "{}" | cut -d, -f3).zip {}/*' \;
          ls -lh ./public/*.zip

      - name: Upload assets
@@ -404,7 +396,7 @@ jobs:
          draft: ${{ env.TEST_BUILD == 'true' || env.FAKE_BUILD == 'true' }}
          prerelease: true
          tag_name: v${{ needs.build.outputs.pkgver }}${{ env.TAG_SUFFIX }}
-          name: zapret v${{ needs.build.outputs.pkgver }}
+          name: zapret2 v${{ needs.build.outputs.pkgver }}
          body: |
-            zapret v${{ needs.build.outputs.pkgver }} for OpenWrt
+            zapret2 v${{ needs.build.outputs.pkgver }} for OpenWrt
          files: ./public/*.zip
--- a/README.md
+++ b/README.md
@@ -2,12 +2,13 @@
 [![Github All Releases](https://img.shields.io/github/downloads/remittor/zapret-openwrt/total.svg)](https://github.com/remittor/zapret-openwrt/releases)
 [![Github Latest Release](https://img.shields.io/github/downloads/remittor/zapret-openwrt/latest/total.svg)](https://github.com/remittor/zapret-openwrt/releases)
 [![ViewCount](https://views.whatilearened.today/views/github/remittor/zapret-openwrt.svg)](https://github.com/remittor/zapret-openwrt)
+[![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Fremittor%2Fzapret-openwrt&count_bg=%2379C83D&title_bg=%23555555&icon=&icon_color=%23E7E7E7&title=hits&edge_flat=false)](https://github.com/remittor/zapret-openwrt/releases)
 [![Donations Page](https://github.com/andry81-cache/gh-content-static-cache/raw/master/common/badges/donate/donate.svg)](https://github.com/remittor/donate)
 # zapret-openwrt

-Zapret is not a VPN! Zapret is an Anti-DPI utility!
+Zapret2 is not a VPN! Zapret2 is an Anti-DPI utility!

-[Instructions for installing](https://github.com/remittor/zapret-openwrt/wiki)
+[Instructions for installing](https://github.com/remittor/zapret-openwrt/wiki/Installing-zapret‐openwrt-package)

 [Download page](https://github.com/remittor/zapret-openwrt/releases)

--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/env.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/env.js
@@ -1,55 +0,0 @@
-'use strict';
-'require baseclass';
-
-return baseclass.extend({
-    packager          : { },
-    appName           : 'zapret',
-    AppName           : 'Zapret',
-    execPath          : '/etc/init.d/zapret',
-    appDir            : '/opt/zapret',
-    syncCfgPath       : '/opt/zapret/sync_config.sh',
-    defCfgPath        : '/opt/zapret/def-cfg.sh',
-    defaultCfgPath    : '/opt/zapret/restore-def-cfg.sh',
-
-    hostsGoogleFN     : '/opt/zapret/ipset/zapret-hosts-google.txt',
-    hostsUserFN       : '/opt/zapret/ipset/zapret-hosts-user.txt',
-    hostsUserExcludeFN: '/opt/zapret/ipset/zapret-hosts-user-exclude.txt',
-    iplstExcludeFN    : '/opt/zapret/ipset/zapret-ip-exclude.txt',
-    iplstUserFN       : '/opt/zapret/ipset/zapret-ip-user.txt',
-    iplstUserExcludeFN: '/opt/zapret/ipset/zapret-ip-user-exclude.txt',
-    custFileMax       : 4,
-    custFileTemplate  : '/opt/zapret/ipset/cust%s.txt',
-    customdPrefixList : [ 10, 20, 50, 60, 90 ] ,
-    customdFileFormat : '/opt/zapret/init.d/openwrt/custom.d/%s-script.sh',
-    discord_num       : 50,
-    discord_url       : [ 'https://github.com/bol-van/zapret/blob/4e8e3a9ed9dbeb1156db68dfaa7b353051c13797/init.d/custom.d.examples.linux/50-discord',
-                          'https://github.com/bol-van/zapret/blob/b251ea839cc8f04c45090314ef69fce69f2c00f2/init.d/custom.d.examples.linux/50-discord-media',
-                          'https://github.com/bol-van/zapret/blob/b251ea839cc8f04c45090314ef69fce69f2c00f2/init.d/custom.d.examples.linux/50-stun4all',
-                          'https://github.com/bol-van/zapret/tree/master/init.d/custom.d.examples.linux'
-                        ],
-    nfqws_opt_url     : 'https://github.com/remittor/zapret-openwrt/discussions/168',
-
-    autoHostListFN    : '/opt/zapret/ipset/zapret-hosts-auto.txt',
-    autoHostListDbgFN : '/opt/zapret/ipset/zapret-hosts-auto-debug.log',
-
-    load_env: function(dst_obj) {
-        let env_proto = Object.getPrototypeOf(this);
-        Object.getOwnPropertyNames(env_proto).forEach(function(key) {
-            if (key === 'constructor' || key === 'load_env' || key.startsWith('__'))
-                return;
-            dst_obj[key] = env_proto[key];
-        });
-        dst_obj.packager = { };
-        if (L.hasSystemFeature('apk')) {
-            dst_obj.packager.name = 'apk';
-            dst_obj.packager.path = '/usr/bin/apk';
-            dst_obj.packager.args = [ 'list', '-I', '*'+this.appName+'*' ];
-        } else {
-            dst_obj.packager.name = 'opkg';
-            dst_obj.packager.path = '/bin/opkg';
-            dst_obj.packager.args = [ 'list-installed', '*'+this.appName+'*' ];
-        }
-        dst_obj.skey_pkg_dict = this.appName + '-pkg-dict';
-        dst_obj.skey_deffered_action = this.appName + '-deffered-action';
-    }
-});
--- a/luci-app-zapret/root/usr/share/luci/menu.d/luci-app-zapret.json
+++ b/luci-app-zapret/root/usr/share/luci/menu.d/luci-app-zapret.json
@@ -1,46 +0,0 @@
-{
-	"admin/services/zapret": {
-		"title": "Zapret",
-		"order": 61,
-		"action": {
-			"type": "alias",
-			"path": "admin/services/zapret/service"
-		},
-		"depends": {
-			"acl": [ "luci-app-zapret" ],
-			"fs": {
-				"/opt/zapret/sync_config.sh": "executable",
-				"/opt/zapret/restore-def-cfg.sh": "executable",
-				"/etc/init.d/zapret": "executable"
-			},
-			"uci": { "zapret": true }
-		}
-	},
-
-	"admin/services/zapret/service": {
-		"title": "Service",
-		"order": 10,
-		"action": {
-			"type": "view",
-			"path": "zapret/service"
-		}
-	},
-
-	"admin/services/zapret/settings": {
-		"title": "Settings",
-		"order": 20,
-		"action": {
-			"type": "view",
-			"path": "zapret/settings"
-		}
-	},
-
-	"admin/services/zapret/dmnlog": {
-		"title": "Log Viewer",
-		"order": 30,
-		"action": {
-			"type": "view",
-			"path": "zapret/dmnlog"
-		}
-	}
-}
--- a/luci-app-zapret/root/usr/share/rpcd/acl.d/luci-app-zapret.json
+++ b/luci-app-zapret/root/usr/share/rpcd/acl.d/luci-app-zapret.json
@@ -1,40 +0,0 @@
-{
-	"luci-app-zapret": {
-		"description": "Grant access to zapret procedures",
-		"read": {
-			"cgi-io": [ "exec" ],
-			"file": {
-				"/opt/zapret/config": [ "read" ],
-				"/opt/zapret/ipset/*": [ "read" ],
-				"/opt/zapret/init.d/openwrt/custom.d/*": [ "read" ],
-				"/etc/crontabs/root": [ "read" ],
-				"/tmp/zapret*": [ "read" ],
-				"/etc/init.d/zapret*": [ "exec" ],
-				"/bin/ps*": [ "exec" ],
-				"/bin/cat*": [ "exec" ],
-				"/bin/busybox*": [ "exec" ],
-				"/bin/opkg*": [ "exec" ],
-				"/usr/bin/apk*": [ "exec" ],
-				"/usr/bin/find*": [ "exec" ],
-				"/opt/zapret/restore-def-cfg.sh*": [ "exec" ],
-				"/opt/zapret/script-exec.sh*": [ "exec" ],
-				"/opt/zapret/update-pkg.sh*": [ "exec" ],
-				"/opt/zapret/sync_config.sh*": [ "exec" ]
-			},
-			"uci": [ "zapret", "network" ],
-			"ubus": {
-				"luci": [ "getInitList", "setInitAction" ],
-				"service": [ "list" ]
-			}
-		},
-		"write": {
-			"file": {
-				"/opt/zapret/config": [ "write" ],
-				"/opt/zapret/ipset/*": [ "write" ],
-				"/opt/zapret/init.d/openwrt/custom.d/*": [ "write" ],
-				"/etc/crontabs/root": [ "write" ]
-			},
-			"uci": [ "zapret" ]
-		}
-	}
-}
--- a/luci-app-zapret2/Makefile
+++ b/luci-app-zapret2/Makefile
@@ -4,14 +4,14 @@

 include $(TOPDIR)/rules.mk

-PKG_NAME:=luci-app-zapret
-PKG_VERSION:=72.20260126
+PKG_NAME:=luci-app-zapret2
+PKG_VERSION:=0.8.20260118
 PKG_RELEASE:=1
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=remittor <https://github.com/remittor>

-LUCI_TITLE:=LuCI support for zapret
-LUCI_DEPENDS:=+zapret
+LUCI_TITLE:=LuCI support for zapret2
+LUCI_DEPENDS:=+zapret2
 LUCI_PKGARCH:=all

 define Package/$(PKG_NAME)/postinst
--- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/diagnost.js
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/diagnost.js
@@ -5,7 +5,7 @@
 'require uci';
 'require ui';
 'require view';
-'require view.zapret.tools as tools';
+'require view.zapret2.tools as tools';

 const btn_style_neutral  = 'btn';
 const btn_style_action   = 'btn cbi-button-action';
@@ -23,17 +23,9 @@ return baseclass.extend({
        this.logArea.scrollTop = this.logArea.scrollHeight;
    },

-    setBtnMode: function(check1, check2, cancel)
-    {
-        this.btn_dpicheck.disabled   = check1  ? false : true;
-        this.btn_sitescheck.disabled = check2  ? false : true;
-        this.btn_cancel.disabled     = cancel  ? false : true;
-    },
-
    dpiCheck: async function()
    {
        this._action = 'dpiCheck';
-        this.setBtnMode(0, 0, 0);
        this.appendLog('DPI check [tcp 16-20]...');
        this.appendLog('Original sources: https://github.com/hyperion-cs/dpi-checkers');
        this.appendLog('WEB-version: https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/');
@@ -44,53 +36,30 @@ return baseclass.extend({
            cmd.push(...[ '-d', dns_ip.trim() ]);
        }
        cmd.push('-R');  // show recommendations
-        return tools.execAndRead({
-            cmd: cmd,
-            log: '/tmp/'+tools.appName+'_dwc.log',
-            logArea: this.logArea,
-            callback: this.execAndReadCallback,
-            ctx: this,
-        });
+        let log = '/tmp/'+tools.appName+'_dwc.log';
+        let callback = this.execAndReadCallback;
+        let wnd = this;
+        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, callback: callback, cbarg: wnd });
    },

-    sitesCheck: async function()
+    execAndReadCallback: function(wnd, rc, txt = '')
    {
-        this._action = 'dpiCheck';
-        this.setBtnMode(0, 0, 0);
-        this.appendLog('Sites check...');
-        let cmd = [ fn_dwc_sh ];
-        let resolve_dns = document.getElementById('cfg_resolve_dns');
-        let dns_ip = resolve_dns.options[resolve_dns.selectedIndex].text;
-        if (dns_ip && dns_ip != 'default') {
-            cmd.push(...[ '-d', dns_ip.trim() ]);
-        }
-        cmd.push('-s');  // mode: check sites
-        return tools.execAndRead({
-            cmd: cmd,
-            log: '/tmp/'+tools.appName+'_dwc.log',
-            logArea: this.logArea,
-            callback: this.execAndReadCallback,
-            ctx: this,
-        });
-    },
-
-    execAndReadCallback: function(rc, txt = '')
-    {
-        this.setBtnMode(1, 1, 1);
        if (rc == 0 && txt) {
-            this.appendLog('=========================================================');
-            return;
+            if (wnd._action == 'dpiCheck') {
+                wnd.appendLog('=========================================================');
+                return;
+            }
        }
        if (rc >= 500) {
            if (txt) {
-                this.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
+                wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
            } else {
-                this.appendLog('ERROR: ' + this._action + ': Terminated with error code = ' + rc);
+                wnd.appendLog('ERROR: ' + wnd._action + ': Terminated with error code = ' + rc);
            }
        } else {
-            this.appendLog('ERROR: Process finished with retcode = ' + rc);
+            wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
        }
-        this.appendLog('=========================================================');
+        wnd.appendLog('=========================================================');
    },

    openDiagnostDialog: function(pkg_arch)
@@ -142,15 +111,8 @@ return baseclass.extend({
            'id': 'btn_dpicheck',
            'name': 'btn_dpicheck',
            'class': btn_style_action,
-        }, _('DPI check'));
-        this.btn_dpicheck.onclick = ui.createHandlerFn(this, this.dpiCheck);
-
-        this.btn_sitescheck = E('button', {
-            'id': 'btn_sitescheck',
-            'name': 'btn_sitescheck',
-            'class': btn_style_action,
-        }, _('Sites check'));
-        this.btn_sitescheck.onclick = ui.createHandlerFn(this, this.sitesCheck);
+        }, _('DPI check [tcp 16-20]'));
+        this.btn_dpicheck.onclick = ui.createHandlerFn(this, () => { this.dpiCheck() });
        
        ui.showModal(_('Diagnostics'), [
            E('div', { 'class': 'cbi-section' }, [
@@ -159,8 +121,6 @@ return baseclass.extend({
                this.logArea,
            ]),
            E('div', { 'class': 'right' }, [
-                this.btn_sitescheck,
-                ' ',
                this.btn_dpicheck,
                ' ',
                this.btn_cancel,
--- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/dmnlog.js
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/dmnlog.js
@@ -5,7 +5,7 @@
 'require poll';
 'require uci';
 'require ui';
-'require view.zapret.tools as tools';
+'require view.zapret2.tools as tools';

 return view.extend({
    retrieveLog: async function() {
--- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/env.js
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/env.js
@@ -0,0 +1,52 @@
+'use strict';
+'require baseclass';
+
+return baseclass.extend({
+    packager          : { },
+    appName           : 'zapret2',
+    AppName           : 'Zapret2',
+    execPath          : '/etc/init.d/zapret2',
+    appDir            : '/opt/zapret2',
+    syncCfgPath       : '/opt/zapret2/sync_config.sh',
+    defCfgPath        : '/opt/zapret2/def-cfg.sh',
+    defaultCfgPath    : '/opt/zapret2/restore-def-cfg.sh',
+
+    hostsGoogleFN     : '/opt/zapret2/ipset/zapret-hosts-google.txt',
+    hostsUserFN       : '/opt/zapret2/ipset/zapret-hosts-user.txt',
+    hostsUserExcludeFN: '/opt/zapret2/ipset/zapret-hosts-user-exclude.txt',
+    iplstExcludeFN    : '/opt/zapret2/ipset/zapret-ip-exclude.txt',
+    iplstUserFN       : '/opt/zapret2/ipset/zapret-ip-user.txt',
+    iplstUserExcludeFN: '/opt/zapret2/ipset/zapret-ip-user-exclude.txt',
+    custFileMax       : 4,
+    custFileTemplate  : '/opt/zapret2/ipset/cust%s.txt',
+    customdPrefixList : [ 10, 20, 50, 60, 90 ] ,
+    customdFileFormat : '/opt/zapret2/init.d/openwrt/custom.d/%s-script.sh',
+    discord_num       : 50,
+    discord_url       : [ 'https://github.com/bol-van/zapret2/blob/master/init.d/custom.d.examples.linux/50-discord-media',
+                          'https://github.com/bol-van/zapret2/blob/master/init.d/custom.d.examples.linux/50-stun4all',
+                          'https://github.com/bol-van/zapret2/tree/master/init.d/custom.d.examples.linux'
+                        ],
+    nfqws_opt_url     : 'https://github.com/remittor/zapret-openwrt/discussions/',
+
+    autoHostListFN    : '/opt/zapret2/ipset/zapret-hosts-auto.txt',
+    autoHostListDbgFN : '/opt/zapret2/ipset/zapret-hosts-auto-debug.log',
+
+    load_env: function(dst_obj) {
+        let env_proto = Object.getPrototypeOf(this);
+        Object.getOwnPropertyNames(env_proto).forEach(function(key) {
+            if (key === 'constructor' || key === 'load_env' || key.startsWith('__'))
+                return;
+            dst_obj[key] = env_proto[key];
+        });
+        dst_obj.packager = { };
+        if (L.hasSystemFeature('apk')) {
+            dst_obj.packager.name = 'apk';
+            dst_obj.packager.path = '/usr/bin/apk';
+            dst_obj.packager.args = [ 'list', '-I', '*'+this.appName+'*' ];
+        } else {
+            dst_obj.packager.name = 'opkg';
+            dst_obj.packager.path = '/bin/opkg';
+            dst_obj.packager.args = [ 'list-installed', '*'+this.appName+'*' ];
+        }
+    }
+});
--- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/service.js
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/service.js
@@ -4,9 +4,9 @@
 'require uci';
 'require ui';
 'require view';
-'require view.zapret.tools as tools';
-'require view.zapret.diagnost as diagnost';
-'require view.zapret.updater as updater';
+'require view.zapret2.tools as tools';
+'require view.zapret2.diagnost as diagnost';
+'require view.zapret2.updater as updater';

 const btn_style_neutral  = 'btn';
 const btn_style_action   = 'btn cbi-button-action';
@@ -18,14 +18,14 @@ const btn_style_success  = 'btn cbi-button-success important';
 return view.extend({
    get_svc_buttons: function(elems = { }) {
        return {
-            "enable"  : elems.btn_enable  || document.getElementById('btn_enable'),
-            "disable" : elems.btn_disable || document.getElementById('btn_disable'),
-            "start"   : elems.btn_start   || document.getElementById('btn_start'),
-            "restart" : elems.btn_restart || document.getElementById('btn_restart'),
-            "stop"    : elems.btn_stop    || document.getElementById('btn_stop'),
-            "reset"   : elems.btn_reset   || document.getElementById('btn_reset'),
-            "diag"    : elems.btn_diag    || document.getElementById('btn_diag'),
-            "update"  : elems.btn_update  || document.getElementById('btn_update'),
+            enable  : elems.btn_enable  || document.getElementById('btn_enable'),
+            disable : elems.btn_disable || document.getElementById('btn_disable'),
+            start   : elems.btn_start   || document.getElementById('btn_start'),
+            restart : elems.btn_restart || document.getElementById('btn_restart'),
+            stop    : elems.btn_stop    || document.getElementById('btn_stop'),
+            reset   : elems.btn_reset   || document.getElementById('btn_reset'),
+            diag    : elems.btn_diag    || document.getElementById('btn_diag'),
+            update  : elems.btn_update  || document.getElementById('btn_update'),
        };
    },
    
@@ -50,7 +50,7 @@ return view.extend({
            fs.exec(tools.execPath, [ 'enabled' ]), // svc_en
            tools.getSvcInfo(),                     // svc_info
            fs.exec('/bin/busybox', [ 'ps' ]),      // process list
-            tools.getPackageDict(),                 // installed packages
+            fs.exec(tools.packager.path, tools.packager.args),  // installed packages
            tools.getStratList(),                   // nfqws strategy list
            fs.exec('/bin/cat', [ '/etc/openwrt_release' ]),  // CPU arch
            uci.load(tools.appName),              // config
@@ -62,9 +62,7 @@ return view.extend({
        });
    },

-    setAppStatus: function(status_array, elems = { }, force_app_status = 0)
-    {
-        tools.execDefferedAction();
+    setAppStatus: function(status_array, elems = { }, force_app_status = 0) {
        let cfg = uci.get(tools.appName, 'config');
        if (!status_array || cfg == null || typeof(cfg) !== 'object') {
            let elem_status = elems.status || document.getElementById("status");
@@ -75,9 +73,9 @@ return view.extend({
        }
        let svc_boot  = status_array[0] ? true : false;
        let svc_en    = status_array[1];   // stdout: empty or error text
-        let svc_info  = status_array[2];   // dict for services
+        let svc_info  = status_array[2];   // stdout: JSON as text
        let proc_list = status_array[3];   // stdout: multiline text
-        let pkg_dict  = status_array[4];   // stdout: installed packages
+        let pkg_list  = status_array[4];   // stdout: installed packages
        let stratlist = status_array[5];   // array of strat names
        let sys_info  = status_array[6];   // stdout: openwrt distrib info
        
@@ -97,8 +95,8 @@ return view.extend({
            this.disableButtons(true, -1, elems);
            return;
        }
-        if (!pkg_dict) {
-            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': getPackageDict()'));
+        if (pkg_list.code != 0) {
+            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
            this.disableButtons(true, -1, elems);
            return;
        }
@@ -137,37 +135,89 @@ return view.extend({
        }
    },

-    serviceActionEx: async function(action, button, args = [ ], hide_modal = false, btn_dis = true)
-    {
-        let btn = document.getElementById(button);
-        this.disableButtons(true, btn);
+    serviceAction: function(action, button) {
+        if (button) {
+            let elem = document.getElementById(button);
+            this.disableButtons(true, elem);
+        }
        poll.stop();
-        try {
-            if (action == 'start' || action == 'restart') {
-                let apply_exec = tools.checkUnsavedChanges();
-                if (apply_exec) {
-                    ui.changes.apply(true);  // apply_rollback
-                    await new Promise(resolve => setTimeout(resolve, 1000));
-                    tools.setDefferedAction(action, null, true);
-                    return;
+        
+        let _this = this;
+        
+        return tools.handleServiceAction(tools.appName, action)
+        .then(() => {
+            return _this.getAppStatus().then(
+                (status_array) => {
+                    _this.setAppStatus(status_array);
                }
+            );
+        })
+        .catch(e => { 
+            ui.addNotification(null, E('p', _('Unable to run service action.') + ' Error: ' + e.message));
+        });
+    },
+
+    serviceActionEx: function(action, button, args = [ ], hide_modal = false) {
+        if (button) {
+            let elem = document.getElementById(button);
+            this.disableButtons(true, elem);
+        }
+        poll.stop();
+        
+        let _this = this;
+        let exec_cmd = null;
+        let exec_arg = [ ];
+        let errmsg = 'ERROR:';
+        if (action == 'start' || action == 'restart') {
+            exec_cmd = tools.syncCfgPath;
+            errmsg = _('Unable to run sync_config.sh script.');
+        }
+        else if (action == 'reset') {
+            exec_cmd = tools.defaultCfgPath;
+            exec_arg = args;  // (reset_ipset)(sync) ==> restore all configs + sync config
+            errmsg = _('Unable to run restore-def-cfg.sh script.');
+            action = null;
+        } else {
+            ui.addNotification(null, E('p', 'ERROR: unknown action'));
+            return null;
+        }
+        return fs.exec(exec_cmd, exec_arg)
+        .then(function(res) { 
+            if (res.code != 0) {
+                ui.addNotification(null, E('p', errmsg + ' res.code = ' + res.code));
+                action = null;  // return with error
            }
-            await tools.serviceActionEx(action, args, false);
            if (hide_modal) {
                ui.hideModal();
            }
-        } catch(e) { 
-            //ui.addNotification(null, E('p', 'Error: ' + e.message));
-        } finally {
-            setTimeout(() => {
-                if (btn && btn_dis) {
-                    btn.disabled = true;
-                }
-                if (!poll.active()) {
-                    poll.start();
-                }
-            }, 0);
+            if (!action) {
+                return _this.getAppStatus().then(
+                    (status_array) => {
+                        _this.setAppStatus(status_array);
+                    }
+                );
+            }
+            return _this.serviceAction(action, null);
+        })
+        .catch(e => { 
+            ui.addNotification(null, E('p', errmsg + ' Error: ' + e.message));
+        });
+    },
+
+    appAction: function(action, button) {
+        if (button) {
+            let elem = document.getElementById(button);
+            this.disableButtons(true, elem);
        }
+        poll.stop();
+        return fs.exec_direct(tools.execPath, [ action ]).then(res => {
+            return this.getAppStatus().then(
+                (status_array) => {
+                    this.setAppStatus(status_array);
+                    ui.hideModal();
+                }
+            );
+        });
    },

    statusPoll: function() {
@@ -176,12 +226,7 @@ return view.extend({
        );
    },

-    dialogResetCfg: function(ev)
-    {
-        if (tools.checkUnsavedChanges()) {
-            ui.addNotification(null, E('p', _('You have unapplied changes')));
-            return;
-        }
+    dialogResetCfg: function(ev) {
        ev.target.blur();

        let reset_base = E('label', [
@@ -229,7 +274,7 @@ return view.extend({
        let resetcfg_btn = E('button', {
            'class': btn_style_action,
        }, _('Reset settings'));
-        resetcfg_btn.onclick = ui.createHandlerFn(this, async () => {
+        resetcfg_btn.onclick = ui.createHandlerFn(this, () => {
            //cancel_button.disabled = true;
            let opt_flags = '';
            if (document.getElementById('cfg_reset_base').checked == false) {
@@ -297,9 +342,9 @@ return view.extend({
        }
        let cfg = uci.get(tools.appName, 'config');

-        let pkgdict = status_array[4];
-        if (pkgdict == null) {
-            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': render()'));
+        let pkg_list = status_array[4];
+        if (pkg_list === undefined || typeof(pkg_list) !== 'object' || pkg_list.code != 0) {
+            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
            return;
        }

@@ -345,9 +390,9 @@ return view.extend({
        };
        
        let btn_enable      = create_btn('btn_enable',  btn_style_success, _('Enable'));
-        btn_enable.onclick  = ui.createHandlerFn(this, this.serviceActionEx, 'enable', 'btn_enable');
+        btn_enable.onclick  = ui.createHandlerFn(this, this.serviceAction, 'enable', 'btn_enable');
        let btn_disable     = create_btn('btn_disable', btn_style_warning, _('Disable'));
-        btn_disable.onclick = ui.createHandlerFn(this, this.serviceActionEx, 'disable', 'btn_disable');
+        btn_disable.onclick = ui.createHandlerFn(this, this.serviceAction, 'disable', 'btn_disable');
        layout_append(_('Service autorun control'), null, [ btn_enable, btn_disable ] );

        let btn_start       = create_btn('btn_start',   btn_style_action, _('Start'));
@@ -355,7 +400,7 @@ return view.extend({
        let btn_restart     = create_btn('btn_restart', btn_style_action, _('Restart'));
        btn_restart.onclick = ui.createHandlerFn(this, this.serviceActionEx, 'restart', 'btn_restart');
        let btn_stop        = create_btn('btn_stop',    btn_style_warning, _('Stop'));
-        btn_stop.onclick    = ui.createHandlerFn(this, this.serviceActionEx, 'stop', 'btn_stop');
+        btn_stop.onclick    = ui.createHandlerFn(this, this.serviceAction, 'stop', 'btn_stop');
        layout_append(_('Service daemons control'), null, [ btn_start, btn_restart, btn_stop ] );

        let btn_reset       = create_btn('btn_reset', btn_style_action, _('Reset settings'));
@@ -383,15 +428,15 @@ return view.extend({
        };
        this.setAppStatus(status_array, elems);

-        poll.add(L.bind(this.statusPoll, this), 2);  // interval 2 sec
+        poll.add(L.bind(this.statusPoll, this));

        let page_title = tools.AppName;
+        let pkgdict = tools.decode_pkg_list(pkg_list.stdout, false);
        page_title += ' &nbsp ';
        if (pkgdict[tools.appName] === undefined || pkgdict[tools.appName] == '') {
            page_title += 'unknown version';
        } else {
            page_title += 'v' + pkgdict[tools.appName];
-            page_title = page_title.replace(/-r1$/, '');
        }
        let aux1 = E('em');
        let aux2 = E('em');
--- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/settings.js
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/settings.js
@@ -5,26 +5,51 @@
 'require uci';
 'require ui';
 'require view';
-'require view.zapret.tools as tools';
+'require view.zapret2.tools as tools';

 document.head.appendChild(E('link', {
    rel: 'stylesheet',
-    href: L.resource('view/zapret/styles.css')
+    href: L.resource('view/zapret2/styles.css')
 }));

 return view.extend({
-    svc_info: null,
+    parsers: { },
+
+    appStatusCode: null,
+
+    depends: function(elem, key, array, empty=true) {
+        if (empty && array.length === 0) {
+            elem.depends(key, '_dummy');
+        } else {
+            array.forEach(e => elem.depends(key, e));
+        }
+    },
+
+    validateIpPort: function(section, value) {
+        return (/^$|^([0-9]{1,3}\.){3}[0-9]{1,3}(#[\d]{2,5})?$/.test(value)) ? true : _('Expecting:')
+            + ` ${_('One of the following:')}\n - ${_('valid IP address')}\n - ${_('valid address#port')}\n`;
+    },
+
+    validateUrl: function(section, value) {
+        return (/^$|^https?:\/\/[\w.-]+(:[0-9]{2,5})?[\w\/~.&?+=-]*$/.test(value)) ? true : _('Expecting:')
+            + ` ${_('valid URL')}\n`;
+    },

    load: function() {
-        return tools.baseLoad();
+        return Promise.all([
+            { code: -1}, // L.resolveDefault(fs.exec(tools.execPath, [ 'raw-status' ]), 1),
+            null, // L.resolveDefault(fs.list(tools.parsersDir), null),
+            uci.load(tools.appName),
+        ]).catch(e => {
+            ui.addNotification(null, E('p', _('Unable to read the contents') + ': %s '.format(e.message) ));
+        });
    },

    render: function(data) {
        if (!data) {
            return;
        }
-        this.svc_info = data.svc_info;
-        tools.execDefferedAction(this.svc_info);
+        this.appStatusCode = data[0].code;

        let m, s, o, tabname;

@@ -455,18 +480,12 @@ return view.extend({
        return map_promise;
    },

-    handleSaveApply: function(ev, mode)
-    {
+    handleSaveApply: function(ev, mode) {
        return this.handleSave(ev).then(() => {
-            let apply_exec = tools.checkUnsavedChanges();
-            if (apply_exec) {
-                ui.changes.apply(mode == '0');
-                tools.setDefferedAction('restart', this.svc_info);
-            } else {
-                if (this.svc_info?.dmn.inited) {
-                    tools.serviceActionEx('restart');
-                }
-            }
+            ui.changes.apply(mode == '0');
+            //if (this.appStatusCode != 1 && this.appStatusCode != 2) {
+            //    window.setTimeout(() => fs.exec(tools.execPath, [ 'restart' ]), 3000);
+            //}
        });
    },
 });
--- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/styles.css
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/styles.css
--- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/tools.js
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/tools.js
@@ -4,7 +4,7 @@
 'require rpc';
 'require ui';
 'require uci';
-'require view.zapret.env as env_tools';
+'require view.zapret2.env as env_tools';

 document.head.append(E('style', {'type': 'text/css'},
 `
@@ -101,29 +101,6 @@ return baseclass.extend({
        });
    },

-    getPackageDict: function()
-    {
-        let exec_cmd = this.packager.path;
-        let exec_arg = this.packager.args;
-        return fs.exec(exec_cmd, exec_arg).then(res => {
-            let pdict_json = localStorage.getItem(this.skey_pkg_dict);
-            if (res.code != 0) {
-                console.log(this.appName + ': Unable to enumerate installed packages. code = ' + res.code);
-                if (pdict_json != null) {
-                    return JSON.parse(pdict_json);  // return cached value
-                }
-                return null;
-            }
-            let pdict = this.decode_pkg_list(res.stdout);
-            if (pdict != pdict_json) {
-                localStorage.setItem(this.skey_pkg_dict, JSON.stringify(pdict));  // renew cache
-            }
-            return pdict;
-        }).catch(e => {
-            ui.addNotification(null, E('p', _('Unable to enumerate installed packages.') + ' Error: %s'.format(e)));
-        });
-    },
-
    getStratList: function() {
        let exec_cmd = '/bin/busybox';
        let exec_arg = [ 'awk', '-F', '"', '/if \\[ "\\$strat" = "/ {print $4}', this.defCfgPath ];
@@ -137,9 +114,7 @@ return baseclass.extend({
        });
    },

-    handleServiceAction: function(name, action, throwed = false)
-    {
-        console.log('handleServiceAction: '+name+' '+action);
+    handleServiceAction: function(name, action) {
        return this.callInitAction(name, action).then(success => {
            if (!success) {
                throw _('Command failed');
@@ -147,122 +122,9 @@ return baseclass.extend({
            return true;
        }).catch(e => {
            ui.addNotification(null, E('p', _('Service action failed "%s %s": %s').format(name, action, e)));
-            if (throwed) {
-                throw e;
-            }
        });
    },

-    serviceActionEx: async function(action, args = [ ], throwed = false)
-    {
-        let errmsg = null;
-        try {
-            let exec_cmd = null;
-            let exec_arg = [ ];
-            if (action == 'start' || action == 'restart') {
-                exec_cmd = this.syncCfgPath;
-                errmsg = _('Unable to run sync_config.sh script.');
-            }
-            if (action == 'reset') {
-                exec_cmd = this.defaultCfgPath;
-                exec_arg = args;  // (reset_ipset)(sync) ==> restore all configs + sync config
-                errmsg = _('Unable to run restore-def-cfg.sh script.');
-                action = null;
-            }
-            if (exec_cmd) {
-                let res = await fs.exec(exec_cmd, exec_arg);
-                if (res.code != 0) {
-                    throw Error('res.code = ' + res.code);
-                }
-            }
-            errmsg = null;
-            await this.handleServiceAction(this.appName, action, throwed);
-        } catch(e) { 
-            if (throwed) {
-                throw e;
-            } else {
-                let msg = errmsg ? errmsg : _('Unable to run service action') + ' "' + action + '".';
-                ui.addNotification(null, E('p', msg + ' Error: ' + e.message));
-            }
-        }
-    },
-    
-    baseLoad: function(callback, cbarg)
-    {
-        return Promise.all([
-            this.getSvcInfo(),           // svc_info
-            uci.load(this.appName),
-        ])
-        .then( ([svcInfo, uci_data]) => {
-            let svc_info = this.decodeSvcInfo(svcInfo);
-            let ret = { svc_info, uci_data };
-            if (typeof callback === 'function') {
-                const res = callback(cbarg, ret);
-                if (res && typeof res.then === 'function') {
-                    return res.then(() => ret);
-                }
-                return ret;
-            }
-            return ret;
-        })
-        .catch(e => {
-            ui.addNotification(null, E('p', _('Unable to read the contents') + ' (baseLoad): %s '.format(e.message) ));
-            return null;
-        });
-    },
-
-    decodeSvcInfo: function(svc_info, svc_autorun = true, proc_list = [ ])
-    {
-        if (svc_info?.autorun !== undefined && svc_info?.dmn !== undefined) {
-            return svc_info;
-        }
-        if (svc_info != null && typeof(svc_info) == 'object') {
-            return this.decode_svc_info(svc_autorun, svc_info, proc_list);
-        }
-        return null;
-    },
-
-    setDefferedAction: function(action, svcInfo = null, forced = false)
-    {
-        let svc_info = this.decodeSvcInfo(svcInfo);
-        if (action == 'start' && svc_info?.dmn.inited) {
-            action = 'restart';
-        }
-        if (action == 'start') {
-            if (!forced && svc_info?.dmn.inited) {
-                action = null;
-            }
-        }
-        if (action == 'restart') {
-            if (!forced && !svc_info?.dmn.inited) {
-                action = null;
-            }
-        }
-        if (action && localStorage.getItem(this.skey_deffered_action) == null) {
-            localStorage.setItem(this.skey_deffered_action, action);
-            console.log('setDefferedAction: '+this.skey_deffered_action+' = '+action);
-        }
-    },
-    
-    execDefferedAction: function(svcInfo = null)
-    {
-        let svc_info = this.decodeSvcInfo(svcInfo);
-        //console.log('execDefferedAction: svc_info = '+JSON.stringify(svc_info));
-        let action = localStorage.getItem(this.skey_deffered_action);
-        if (action) {
-            localStorage.removeItem(this.skey_deffered_action);
-            console.log('execDefferedAction: '+action);
-            this.serviceActionEx(action);
-        }
-    },
-    
-    checkUnsavedChanges: function()
-    {
-        if (!ui.changes) return false;
-        if (!ui.changes.changes) return false;
-        return ui.changes.changes[this.appName] ? true : false;
-    },
-
    normalizeValue: function(v) {
        return (v && typeof(v) === 'string') ? v.trim().replace(/\r?\n/g, '') : v;
    },
@@ -279,7 +141,7 @@ return baseclass.extend({
        return m ? m[2] : defval;        
    },

-    decode_pkg_list: function(pkg_list) {
+    decode_pkg_list: function(pkg_list, with_suffix_r1 = true) {
        let pkg_dict = { };
        if (!pkg_list) {
            return pkg_dict;
@@ -318,7 +180,11 @@ return baseclass.extend({
                }
            }
            if (rev >= 0) {
-                ver += '-r' + rev;
+                if (rev == 1 && !with_suffix_r1) {
+                    // nothing
+                } else {
+                    ver += '-r' + rev;
+                }
            }
            pkg_dict[name] = ver;
        }
@@ -342,8 +208,7 @@ return baseclass.extend({
        return plist;
    },

-    decode_svc_info: function(svc_autorun, svc_info, proc_list, cfg = null)
-    {
+    decode_svc_info: function(svc_autorun, svc_info, proc_list, cfg) {
        let result = {
            "autorun": svc_autorun,
            "dmn": {
@@ -354,18 +219,13 @@ return baseclass.extend({
            },
            "status": this.statusDict.error,
        };
-        let plist = proc_list;
-        if (proc_list?.code !== undefined) {
-            if (proc_list.code != 0) {
-                return -2;
-            }        
-            plist = this.get_pid_list(proc_list.stdout);
-            if (plist.length < 4) {
-                return -3;
-            }
-        }
-        if (svc_info == null) {
-            return null;
+        if (proc_list.code != 0) {
+            return -2;
+        }        
+        let plist = this.get_pid_list(proc_list.stdout);
+        
+        if (plist.length < 4) {
+            return -3;
        }
        if (typeof(svc_info) !== 'object') {
            return -4;
@@ -740,7 +600,7 @@ return baseclass.extend({
        },
    }),

-    execAndRead: async function({ cmd = [ ], log = '', logArea = null, callback = null, ctx = null, hiderow = [ ], rpc_timeout = 5, rpc_root = false } = {})
+    execAndRead: async function({ cmd = [ ], log = '', logArea = null, callback = null, cbarg = null, hiderow = [ ], rpc_timeout = 5, rpc_root = false } = {})
    {
        function appendLog(msg, end = '\n')
        {
@@ -764,23 +624,23 @@ return baseclass.extend({
            await fs.exec('/bin/busybox', [ 'rm', '-f', logFile + '*' ], null, rpc_opt);
            appendLog('Output file cleared!');
        } catch (e) {
-            return callback.call(ctx, 500, 'ERROR: Failed to clear output file');
+            return callback(cbarg, 500, 'ERROR: Failed to clear output file');
        }
        try {
            let opt_list = [ logFile ];
            opt_list.push(...cmd);
            let res = await fs.exec(this.appDir+'/script-exec.sh', opt_list, null, rpc_opt);
            if (res.code != 0) {
-                return callback.call(ctx, 525, 'ERROR: cannot run "' + cmd[0] + '" script! (error = ' + res.code + ')');
+                return callback(cbarg, 525, 'ERROR: cannot run "' + cmd[0] + '" script! (error = ' + res.code + ')');
            }
            appendLog('Process started...');
        } catch (e) {
-            return callback.call(ctx, 520, 'ERROR: Failed on execute process: ' + e.message);
+            return callback(cbarg, 520, 'ERROR: Failed on execute process: ' + e.message);
        }
        let lastLen = 0;
        let retCode = -1;
        return await new Promise(async (resolve, reject) => {
-            async function epoll()
+            async function poll()
            {
                try {
                    let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
@@ -796,7 +656,7 @@ return baseclass.extend({
                        let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
                        if (rc.code != 0) {
                            fixLogEnd();
-                            resolve(callback.call(ctx, 545, 'ERROR: cannot read file "' + rcFile + '"'));
+                            resolve(callback(cbarg, 545, 'ERROR: cannot read file "' + rcFile + '"'));
                            return;
                        }
                        if (rc.stdout) {
@@ -806,13 +666,13 @@ return baseclass.extend({
                    if (retCode >= 0) {
                        fixLogEnd();
                        if (retCode == 0 && res.stdout) {
-                            resolve(callback.call(ctx, 0, res.stdout));
+                            resolve(callback(cbarg, 0, res.stdout));
                            return;
                        }
-                        resolve(callback.call(ctx, retCode, 'ERROR: Process failed with error ' + retCode));
+                        resolve(callback(cbarg, retCode, 'ERROR: Process failed with error ' + retCode));
                        return;
                    }
-                    setTimeout(epoll, 500);
+                    setTimeout(poll, 500);
                } catch (e) {
                    let skip_err = false;
                    if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
@@ -823,17 +683,17 @@ return baseclass.extend({
                    }
                    if (skip_err) {
                        console.warn('WARN: execAndRead: ' + e.message);
-                        setTimeout(epoll, 500);
-                        return;  // goto next epoll iteration
+                        setTimeout(poll, 500);
+                        return;  // goto next poll iteration
                    }
                    fixLogEnd();
                    let errtxt = 'ERROR: execAndRead: ' + e.message;
                    errtxt    += 'ERROR: execAndRead: ' + e.stack?.trim().split('\n')[0];
-                    callback.call(ctx, 540, errtxt);
+                    callback(cbarg, 540, errtxt);
                    reject(e);
                }
            }
-            epoll();
+            poll();
        });
    },

--- a/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/updater.js
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/updater.js
@@ -5,7 +5,7 @@
 'require uci';
 'require ui';
 'require view';
-'require view.zapret.tools as tools';
+'require view.zapret2.tools as tools';

 const btn_style_neutral  = 'btn';
 const btn_style_action   = 'btn cbi-button-action';
@@ -59,7 +59,7 @@ return baseclass.extend({
            log: '/tmp/'+tools.appName+'_pkg_check.log',
            logArea: this.logArea,
            callback: this.execAndReadCallback,
-            ctx: this,
+            cbarg: this,  // wnd
        });
    },

@@ -84,62 +84,56 @@ return baseclass.extend({
            logArea: this.logArea,
            hiderow: /^ \* resolve_conffiles.*(?:\r?\n|$)/gm,
            callback: this.execAndReadCallback,
-            ctx: this,
+            cbarg: this,  // wnd
        });
    },

-    execAndReadCallback: function(rc, txt = '')
+    execAndReadCallback: function(wnd, rc, txt = '')
    {
-        //console.log('execAndReadCallback = ' + rc + '; _action = ' + this._action);
+        //console.log('execAndReadCallback = ' + rc + '; _action = ' + wnd._action);
        if (rc == 0 && txt) {
            let code = txt.match(/^RESULT:\s*\(([^)]+)\)\s+.+$/m);
-            if (this._action == 'checkUpdates') {
-                this.appendLog('=========================================================');
+            if (wnd._action == 'checkUpdates') {
+                wnd.appendLog('=========================================================');
                if (code && code[1] == 'E') {
-                    this.btn_install.textContent = _('Reinstall');
+                    wnd.btn_install.textContent = _('Reinstall');
                } else {
-                    this.btn_install.textContent = _('Install');
+                    wnd.btn_install.textContent = _('Install');
                }
                let pkg_url = txt.match(/^ZAP_PKG_URL\s*=\s*(.+)$/m);
                if (code && pkg_url) {
-                    if (!this.forced_reinstall) {
-                        if (code[1] == 'E' || code[1] == 'G') {
-                            this.setStage(0);  // install not needed
-                            return;
-                        }
+                    if (code[1] == 'E' && !wnd.forced_reinstall) {
+                        wnd.setStage(0);  // install not needed
+                        return;
                    }
-                    this.pkg_url = pkg_url[1];
-                    this.setStage(2);  // enable all buttons
+                    wnd.pkg_url = pkg_url[1];
+                    wnd.setStage(2);  // enable all buttons
                    return;  // install allowed
                }
            }
-            if (this._action == 'installUpdates') {
-                if (this._test || (code && code[1] == '+')) {
-                    this.setStage(9);
-                    this.appendLog('Please update WEB-page (press F5)');
+            if (wnd._action == 'installUpdates') {
+                if (wnd._test || (code && code[1] == '+')) {
+                    wnd.setStage(9);
+                    wnd.appendLog('Please update WEB-page (press F5)');
                    return;
                }
            }
        }
-        this.setStage(0);
+        wnd.setStage(0);
        if (rc >= 500) {
            if (txt) {
-                this.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
+                wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
            } else {
-                this.appendLog('ERROR: ' + this._action + ': Terminated with error code = ' + rc);
+                wnd.appendLog('ERROR: ' + wnd._action + ': Terminated with error code = ' + rc);
            }
        } else {
-            this.appendLog('ERROR: Process finished with retcode = ' + rc);
+            wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
        }
-        this.appendLog('=========================================================');
+        wnd.appendLog('=========================================================');
    },

    openUpdateDialog: function(pkg_arch)
    {
-        if (tools.checkUnsavedChanges()) {
-            ui.addNotification(null, E('p', _('You have unapplied changes')));
-            return;
-        }
        this.stage = 0;
        this.pkg_arch = pkg_arch;
        this.pkg_url = null;
--- a/luci-app-zapret2/root/usr/share/luci/menu.d/luci-app-zapret2.json
+++ b/luci-app-zapret2/root/usr/share/luci/menu.d/luci-app-zapret2.json
@@ -0,0 +1,41 @@
+{
+	"admin/services/zapret2": {
+		"title": "Zapret2",
+		"order": 62,
+		"action": {
+			"type": "alias",
+			"path": "admin/services/zapret2/service"
+		},
+		"depends": {
+			"acl": [ "luci-app-zapret2" ],
+			"uci": { "zapret2": true }
+		}
+	},
+
+	"admin/services/zapret2/service": {
+		"title": "Service",
+		"order": 10,
+		"action": {
+			"type": "view",
+			"path": "zapret2/service"
+		}
+	},
+
+	"admin/services/zapret2/settings": {
+		"title": "Settings",
+		"order": 20,
+		"action": {
+			"type": "view",
+			"path": "zapret2/settings"
+		}
+	},
+
+	"admin/services/zapret2/dmnlog": {
+		"title": "Log Viewer",
+		"order": 30,
+		"action": {
+			"type": "view",
+			"path": "zapret2/dmnlog"
+		}
+	}
+}
--- a/luci-app-zapret2/root/usr/share/rpcd/acl.d/luci-app-zapret2.json
+++ b/luci-app-zapret2/root/usr/share/rpcd/acl.d/luci-app-zapret2.json
@@ -0,0 +1,40 @@
+{
+	"luci-app-zapret2": {
+		"description": "Grant access to zapret2 procedures",
+		"read": {
+			"cgi-io": [ "exec" ],
+			"file": {
+				"/opt/zapret2/config": [ "read" ],
+				"/opt/zapret2/ipset/*": [ "read" ],
+				"/opt/zapret2/init.d/openwrt/custom.d/*": [ "read" ],
+				"/etc/crontabs/root": [ "read" ],
+				"/tmp/zapret*": [ "read" ],
+				"/etc/init.d/zapret2*": [ "exec" ],
+				"/bin/ps*": [ "exec" ],
+				"/bin/cat*": [ "exec" ],
+				"/bin/busybox*": [ "exec" ],
+				"/bin/opkg*": [ "exec" ],
+				"/usr/bin/apk*": [ "exec" ],
+				"/usr/bin/find*": [ "exec" ],
+				"/opt/zapret2/restore-def-cfg.sh*": [ "exec" ],
+				"/opt/zapret2/script-exec.sh*": [ "exec" ],
+				"/opt/zapret2/update-pkg.sh*": [ "exec" ],
+				"/opt/zapret2/sync_config.sh*": [ "exec" ]
+			},
+			"uci": [ "zapret2", "network" ],
+			"ubus": {
+				"luci": [ "getInitList", "setInitAction" ],
+				"service": [ "list" ]
+			}
+		},
+		"write": {
+			"file": {
+				"/opt/zapret2/config": [ "write" ],
+				"/opt/zapret2/ipset/*": [ "write" ],
+				"/opt/zapret2/init.d/openwrt/custom.d/*": [ "write" ],
+				"/etc/crontabs/root": [ "write" ]
+			},
+			"uci": [ "zapret2" ]
+		}
+	}
+}
--- a/zapret/def-cfg.sh
+++ b/zapret/def-cfg.sh
@@ -1,458 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2024 remittor
-
-function set_cfg_reset_values
-{
-	local cfgname=${1:-$ZAPRET_CFG_NAME}
-	local TAB="$( printf '\t' )"
-	uci batch <<-EOF
-		set $cfgname.config.run_on_boot='0'
-		# settings for zapret service
-		set $cfgname.config.FWTYPE='nftables'
-		set $cfgname.config.POSTNAT='1'
-		set $cfgname.config.FLOWOFFLOAD='none'
-		set $cfgname.config.INIT_APPLY_FW='1'
-		set $cfgname.config.DISABLE_IPV4='0'
-		set $cfgname.config.DISABLE_IPV6='1'
-		set $cfgname.config.FILTER_TTL_EXPIRED_ICMP='1'
-		set $cfgname.config.MODE_FILTER='hostlist'
-		set $cfgname.config.DISABLE_CUSTOM='1'
-		set $cfgname.config.WS_USER='daemon'
-		set $cfgname.config.DAEMON_LOG_ENABLE='0'
-		set $cfgname.config.DAEMON_LOG_FILE='/tmp/zapret+<DAEMON_NAME>+<DAEMON_IDNUM>+<DAEMON_CFGNAME>.log'
-		# autohostlist options
-		set $cfgname.config.AUTOHOSTLIST_RETRANS_THRESHOLD='3'
-		set $cfgname.config.AUTOHOSTLIST_FAIL_THRESHOLD='3'
-		set $cfgname.config.AUTOHOSTLIST_FAIL_TIME='60'
-		set $cfgname.config.AUTOHOSTLIST_DEBUGLOG='0'
-		# nfqws options
-		set $cfgname.config.NFQWS_ENABLE='1'
-		set $cfgname.config.DESYNC_MARK='0x40000000'
-		set $cfgname.config.DESYNC_MARK_POSTNAT='0x20000000'
-		set $cfgname.config.FILTER_MARK='$TAB'
-		set $cfgname.config.NFQWS_PORTS_TCP='80,443'
-		set $cfgname.config.NFQWS_PORTS_UDP='443'
-		set $cfgname.config.NFQWS_TCP_PKT_OUT='9'
-		set $cfgname.config.NFQWS_TCP_PKT_IN='3'
-		set $cfgname.config.NFQWS_UDP_PKT_OUT='9'
-		set $cfgname.config.NFQWS_UDP_PKT_IN='0'
-		set $cfgname.config.NFQWS_PORTS_TCP_KEEPALIVE='0'
-		set $cfgname.config.NFQWS_PORTS_UDP_KEEPALIVE='0'
-		# save changes
-		commit $cfgname
-	EOF
-	return 0
-}
-
-function clear_nfqws_strat
-{
-	local cfgname=${1:-$ZAPRET_CFG_NAME}
-	local TAB="$( printf '\t' )"
-	uci batch <<-EOF
-		set $cfgname.config.MODE_FILTER='hostlist'
-		set $cfgname.config.NFQWS_PORTS_TCP='80,443'
-		set $cfgname.config.NFQWS_PORTS_UDP='443'
-		set $cfgname.config.NFQWS_OPT='$TAB'
-		commit $cfgname
-	EOF
-}
-
-function set_cfg_nfqws_strat
-{
-	local strat=${1:--}
-	local cfgname=${2:-$ZAPRET_CFG_NAME}
-	local TAB="$( printf '\t' )"
-    
-	uci batch <<-EOF
-		set $cfgname.config.MODE_FILTER='hostlist'
-		commit $cfgname
-	EOF
-	if [ "$strat" = "empty" ]; then
-		clear_nfqws_strat $cfgname
-	fi
-	if [ "$strat" = "v1_by_StressOzz" ]; then
-		uci batch <<-EOF
-			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
-			set $cfgname.config.NFQWS_PORTS_UDP='443'
-			set $cfgname.config.NFQWS_OPT="
-				--comment=Strategy__$strat
-				
-				--filter-tcp=443 <HOSTLIST>
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--dpi-desync=fake,multidisorder
-				--dpi-desync-split-seqovl=681
-				--dpi-desync-split-pos=1
-				--dpi-desync-fooling=badseq
-				--dpi-desync-badseq-increment=10000000
-				--dpi-desync-repeats=2
-				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
-				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=fonts.google.com
-				
-				--new
-				--filter-udp=443
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-				--dpi-desync=fake
-				--dpi-desync-repeats=6
-				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
-			"
-			commit $cfgname
-		EOF
-	fi
-	if [ "$strat" = "v2_by_StressOzz" ]; then
-		uci batch <<-EOF
-			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
-			set $cfgname.config.NFQWS_PORTS_UDP='443'
-			set $cfgname.config.NFQWS_OPT="
-				--comment=Strategy__$strat
-				
-				--filter-tcp=443 <HOSTLIST>
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--hostlist-exclude-domains=openwrt.org
-				--dpi-desync=fake,fakeddisorder
-				--dpi-desync-split-pos=10,midsld
-				--dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
-				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=fonts.google.com
-				--dpi-desync-fake-tls=0x0F0F0F0F
-				--dpi-desync-fake-tls-mod=none
-				--dpi-desync-fakedsplit-pattern=/opt/zapret/files/fake/tls_clienthello_vk_com.bin
-				--dpi-desync-split-seqovl=336
-				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_gosuslugi_ru.bin
-				--dpi-desync-fooling=badseq,badsum
-				--dpi-desync-badseq-increment=0
-				
-				--new
-				--filter-udp=443
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-				--dpi-desync=fake
-				--dpi-desync-repeats=6
-				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
-			"
-			commit $cfgname
-		EOF
-	fi
-	if [ "$strat" = "v3_by_StressOzz" ]; then
-		uci batch <<-EOF
-			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
-			set $cfgname.config.NFQWS_PORTS_UDP='443'
-			set $cfgname.config.NFQWS_OPT="
-				--comment=Strategy__$strat
-				
-				--filter-tcp=443 <HOSTLIST>
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--hostlist-exclude-domains=openwrt.org
-				--dpi-desync=fake,fakeddisorder
-				--dpi-desync-split-pos=10,midsld
-				--dpi-desync-fake-tls=/opt/zapret/files/fake/t2.bin
-				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=m.ok.ru
-				--dpi-desync-fake-tls=0x0F0F0F0F
-				--dpi-desync-fake-tls-mod=none
-				--dpi-desync-fakedsplit-pattern=/opt/zapret/files/fake/tls_clienthello_vk_com.bin
-				--dpi-desync-split-seqovl=336
-				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_gosuslugi_ru.bin
-				--dpi-desync-fooling=badseq,badsum
-				--dpi-desync-badseq-increment=0
-				
-				--new
-				--filter-udp=443
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-				--dpi-desync=fake
-				--dpi-desync-repeats=6
-				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
-			"
-			commit $cfgname
-		EOF
-	fi
-	if [ "$strat" = "v4_by_StressOzz" ]; then
-		uci batch <<-EOF
-			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
-			set $cfgname.config.NFQWS_PORTS_UDP='443'
-			set $cfgname.config.NFQWS_OPT="
-				--comment=Strategy__$strat
-				
-				--filter-tcp=443
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-				--hostlist-exclude-domains=openwrt.org
-				--dpi-desync=fake,multisplit
-				--dpi-desync-split-pos=2,sld
-				--dpi-desync-fake-tls=0x0F0F0F0F
-				--dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
-				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=google.com
-				--dpi-desync-split-seqovl=2108
-				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
-				--dpi-desync-fooling=badseq
-				
-				--new
-				--filter-tcp=443 <HOSTLIST>
-				--hostlist-exclude-domains=openwrt.org
-				--dpi-desync-any-protocol=1
-				--dpi-desync-cutoff=n5
-				--dpi-desync=multisplit
-				--dpi-desync-split-seqovl=582
-				--dpi-desync-split-pos=1
-				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/4pda.bin
-				
-				--new
-				--filter-udp=443
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-				--dpi-desync=fake
-				--dpi-desync-repeats=6
-				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
-			"
-			commit $cfgname
-		EOF
-	fi
-	if [ "$strat" = "v5_by_StressOzz" ]; then
-		uci batch <<-EOF
-			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
-			set $cfgname.config.NFQWS_PORTS_UDP='443'
-			set $cfgname.config.NFQWS_OPT="
-				--comment=Strategy__$strat
-				
-				--filter-tcp=443
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-				--hostlist-exclude-domains=openwrt.org
-				--ip-id=zero
-				--dpi-desync=multisplit
-				--dpi-desync-split-seqovl=681
-				--dpi-desync-split-pos=1
-				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
-				
-				--new
-				--filter-tcp=443 <HOSTLIST>
-				--hostlist-exclude-domains=openwrt.org
-				--dpi-desync=fake,fakeddisorder
-				--dpi-desync-split-pos=10,midsld
-				--dpi-desync-fake-tls=/opt/zapret/files/fake/max.bin
-				--dpi-desync-fake-tls-mod=rnd,dupsid
-				--dpi-desync-fake-tls=0x0F0F0F0F
-				--dpi-desync-fake-tls-mod=none
-				--dpi-desync-fakedsplit-pattern=/opt/zapret/files/fake/tls_clienthello_vk_com.bin
-				--dpi-desync-fooling=badseq,badsum
-				--dpi-desync-badseq-increment=0
-				
-				--new
-				--filter-udp=443
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-				--dpi-desync=fake
-				--dpi-desync-repeats=6
-				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
-			"
-			commit $cfgname
-		EOF
-	fi
-	if [ "$strat" = "v6_by_StressOzz" ]; then
-		uci batch <<-EOF
-			set $cfgname.config.NFQWS_PORTS_TCP='80,443,2053,2083,2087,2096,8443'
-			set $cfgname.config.NFQWS_PORTS_UDP='443,19294-19344,50000-50100'
-			set $cfgname.config.NFQWS_OPT="
-				--comment=Strategy__$strat
-				
-				--filter-tcp=443
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--dpi-desync=multisplit
-				--dpi-desync-split-pos=1,sniext+1
-				--dpi-desync-split-seqovl=1
-
-				--new
-				--filter-tcp=443 <HOSTLIST>
-				--dpi-desync=hostfakesplit
-				--dpi-desync-hostfakesplit-mod=host=rzd.ru
-				--dpi-desync-hostfakesplit-midhost=host-2
-				--dpi-desync-split-seqovl=726
-				--dpi-desync-fooling=badsum,badseq
-				--dpi-desync-badseq-increment=0
-
-				--new
-				--filter-udp=443 <HOSTLIST_NOAUTO>
-				--dpi-desync=fake
-				--dpi-desync-repeats=6
-				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
-
-				--new
-				--filter-udp=19294-19344,50000-50100
-				--filter-l7=discord,stun
-				--dpi-desync=fake
-				--dpi-desync-repeats=6
-
-				--new
-				--filter-tcp=2053,2083,2087,2096,8443
-				--hostlist-domains=discord.media
-				--dpi-desync=multisplit
-				--dpi-desync-split-seqovl=652
-				--dpi-desync-split-pos=2
-				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
-			"
-			commit $cfgname
-		EOF
-	fi
-	if [ "$strat" = "v7_by_StressOzz" ]; then
-		uci batch <<-EOF
-			set $cfgname.config.NFQWS_PORTS_TCP='80,443,2053,2083,2087,2096,8443'
-			set $cfgname.config.NFQWS_PORTS_UDP='443,19294-19344,50000-50100'
-			set $cfgname.config.NFQWS_OPT="
-				--comment=Strategy__$strat
-				
-				--filter-tcp=443
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--dpi-desync=fake,multisplit
-				--dpi-desync-split-pos=2,sld
-				--dpi-desync-fake-tls=0x0F0F0F0F
-				--dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
-				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=ggpht.com
-				--dpi-desync-split-seqovl=620
-				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
-				--dpi-desync-fooling=badsum,badseq
-
-				--new
-				--filter-tcp=443 <HOSTLIST>
-				--dpi-desync=fake,multisplit
-				--dpi-desync-split-seqovl=654
-				--dpi-desync-split-pos=1
-				--dpi-desync-fooling=ts
-				--dpi-desync-repeats=8
-				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/max.bin
-				--dpi-desync-fake-tls=/opt/zapret/files/fake/max.bin
-
-				--new
-				--filter-udp=443 <HOSTLIST_NOAUTO>
-				--dpi-desync=fake
-				--dpi-desync-repeats=6
-				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
-
-				--new
-				--filter-udp=19294-19344,50000-50100
-				--filter-l7=discord,stun
-				--dpi-desync=fake
-				--dpi-desync-repeats=6
-
-				--new
-				--filter-tcp=2053,2083,2087,2096,8443
-				--hostlist-domains=discord.media
-				--dpi-desync=multisplit
-				--dpi-desync-split-seqovl=652
-				--dpi-desync-split-pos=2
-				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
-			"
-			commit $cfgname
-		EOF
-	fi
-	if [ "$strat" = "ALT7_by_Flowseal" ]; then
-		uci batch <<-EOF
-			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
-			set $cfgname.config.NFQWS_PORTS_UDP='443'
-			set $cfgname.config.NFQWS_OPT="
-				--comment=Strategy__$strat
-				
-				--filter-tcp=443
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-				--hostlist-exclude-domains=openwrt.org
-				--ip-id=zero
-				--dpi-desync=multisplit
-				--dpi-desync-split-pos=2,sniext+1
-				--dpi-desync-split-seqovl=679
-				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
-				
-				--new
-				--filter-tcp=80,443 <HOSTLIST>
-				--hostlist-exclude-domains=openwrt.org
-				--dpi-desync=multisplit
-				--dpi-desync-split-pos=2,sniext+1
-				--dpi-desync-split-seqovl=679
-				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
-				
-				--new
-				--filter-udp=443
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-				--dpi-desync=fake
-				--dpi-desync-repeats=6
-				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
-			"
-			commit $cfgname
-		EOF
-	fi
-	if [ "$strat" = "TLS_AUTO_ALT3_by_Flowseal" ]; then
-		uci batch <<-EOF
-			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
-			set $cfgname.config.NFQWS_PORTS_UDP='443'
-			set $cfgname.config.NFQWS_OPT="
-				--comment=Strategy__$strat
-				
-				--filter-tcp=443
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-				--hostlist-exclude-domains=openwrt.org
-				--ip-id=zero
-				--dpi-desync=fake,multisplit
-				--dpi-desync-split-seqovl=681
-				--dpi-desync-split-pos=1
-				--dpi-desync-fooling=ts
-				--dpi-desync-repeats=8
-				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
-				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=www.google.com
-				
-				--new
-				--filter-tcp=80,443 <HOSTLIST>
-				--hostlist-exclude-domains=openwrt.org
-				--dpi-desync=fake,multisplit
-				--dpi-desync-split-seqovl=681
-				--dpi-desync-split-pos=1
-				--dpi-desync-fooling=ts
-				--dpi-desync-repeats=8
-				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
-				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=www.google.com
-				
-				--new
-				--filter-udp=443
-				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
-				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-				--dpi-desync=fake
-				--dpi-desync-repeats=11
-				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
-			"
-			commit $cfgname
-		EOF
-	fi
-	return 0
-}
-
-function set_cfg_default_values
-{
-	local opt_flags=${1:--}
-	local opt_strat=${2:-v6_by_StressOzz}
-	local cfgname=${3:-$ZAPRET_CFG_NAME}
-
-	if ! echo "$opt_flags" | grep -q "(skip_base)"; then
-		set_cfg_reset_values $cfgname
-	fi
-	if [ "$opt_strat" != "-" ]; then
-		set_cfg_nfqws_strat "$opt_strat" $cfgname
-	fi
-	if echo "$opt_flags" | grep -q "(set_mode_autohostlist)"; then
-		uci batch <<-EOF
-			set $cfgname.config.MODE_FILTER='autohostlist'
-			commit $cfgname
-		EOF
-	fi
-	if echo "$opt_flags" | grep -q "(enable_custom_d)"; then
-		uci batch <<-EOF
-			set $cfgname.config.DISABLE_CUSTOM='0'
-			commit $cfgname
-		EOF
-	fi
-	if echo "$opt_flags" | grep -q "(disable_custom_d)"; then
-		uci batch <<-EOF
-			set $cfgname.config.DISABLE_CUSTOM='1'
-			commit $cfgname
-		EOF
-	fi
-	return 0
-}
--- a/zapret2/Makefile
+++ b/zapret2/Makefile
@@ -1,40 +1,55 @@
 #
-# Copyright (c) 2024 remittor
+# Copyright (c) 2025 remittor
 #

 include $(TOPDIR)/rules.mk

-PKG_NAME:=zapret
-PKG_VERSION:=72.20260126
+PKG_NAME:=zapret2
+PKG_VERSION:=0.8.20260118
 PKG_RELEASE:=1

 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=docs/LICENSE.txt

-PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
+PKG_SOURCE_URL:=https://github.com/bol-van/zapret2.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=119e243b3664d6a512ed8b6ab61dcba00987105c
-PKG_SOURCE_DATE:=2026-01-26
+PKG_SOURCE_VERSION:=8e67260a23deeaa14b9de325bb911e5594b2d225
+PKG_SOURCE_DATE:=2026-01-18

 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-#PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?
+#PKG_SOURCE_URL:=https://github.com/bol-van/zapret2/archive/refs/tags/v$(PKG_VERSION).tar.gz?
 #PKG_HASH:=skip

+LUA_JIT?=1
+
+ifeq ($(LUA_JIT),1)
+	LUAJIT_VER?=2.1
+	LUA_VER?=5.1
+	LUA_DEPEND:=luajit
+	LUA_INCLUDE:=-I$(STAGING_DIR)/usr/include/luajit-$(LUAJIT_VER)
+	LUA_LIBRARY:=-L$(STAGING_DIR)/usr/lib -lluajit-$(LUA_VER)
+else
+	LUA_VER?=5.3
+	LUA_DEPEND:=lua$(LUA_VER)
+	LUA_INCLUDE:=-I$(STAGING_DIR)/usr/include/lua$(LUA_VER)
+	LUA_LIBRARY:=-L$(STAGING_DIR)/usr/lib -llua$(LUA_VER)
+endif
+
 include $(INCLUDE_DIR)/package.mk

 #TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
 #TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)

-MAKE_PATH:=nfq
+MAKE_PATH:=nfq2

 define Package/$(PKG_NAME)
 	SECTION:=net
 	CATEGORY:=Network
 	TITLE:=$(PKG_NAME)
-	SUBMENU:=Zapret
-	URL:=https://github.com/bol-van/zapret
-	DEPENDS:= +nftables +curl +gzip
+	SUBMENU:=Zapret2
+	URL:=https://github.com/bol-van/zapret2
+	DEPENDS:= +nftables +curl +gzip +$(LUA_DEPEND)
 	DEPENDS+= +coreutils +coreutils-sort +coreutils-sleep
 	DEPENDS+= +kmod-nft-nat +kmod-nft-offload +kmod-nft-queue
 	DEPENDS+= +libnetfilter-queue +libcap +zlib
@@ -42,7 +57,7 @@ endef

 define Build/Prepare
 	$(Build/Prepare/Default)
-	rm -f $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws
+	rm -f $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws2
 	rm -f $(PKG_BUILD_DIR)/ip2net/ip2net
 	rm -f $(PKG_BUILD_DIR)/mdig/mdig
 endef
@@ -51,12 +66,12 @@ endef
 #endef

 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(TARGET_CONFIGURE_OPTS)
+	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(TARGET_CONFIGURE_OPTS) LUA_JIT=$(LUA_JIT) LUA_CFLAGS="$(LUA_INCLUDE)" LUA_LIB="$(LUA_LIBRARY)"
 	$(MAKE) -C $(PKG_BUILD_DIR)/ip2net $(TARGET_CONFIGURE_OPTS)
 	$(MAKE) -C $(PKG_BUILD_DIR)/mdig $(TARGET_CONFIGURE_OPTS)
 endef

-ZAPRET_DIR := /opt/zapret
+ZAPRET_DIR := /opt/zapret2

 define ZAPRET_CONFFILES_LIST
 $(ZAPRET_DIR)/config
@@ -85,33 +100,37 @@ endef
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/$(MAKE_PATH)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws $(1)$(ZAPRET_DIR)/$(MAKE_PATH)/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws2 $(1)$(ZAPRET_DIR)/$(MAKE_PATH)/
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/ip2net
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip2net/ip2net $(1)$(ZAPRET_DIR)/ip2net/
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/mdig
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdig/mdig $(1)$(ZAPRET_DIR)/mdig/
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/common
 	$(CP) $(PKG_BUILD_DIR)/common/* $(1)$(ZAPRET_DIR)/common/
-	#$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/docs
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/lua
+	$(CP) $(PKG_BUILD_DIR)/lua/* $(1)$(ZAPRET_DIR)/lua/
+	#$(INSTALL_DIR) $(1)$(ZAPRET_DIR)docs
 	#$(CP) $(PKG_BUILD_DIR)/docs/* $(1)$(ZAPRET_DIR)/docs/
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/files
 	$(CP) $(PKG_BUILD_DIR)/files/* $(1)$(ZAPRET_DIR)/files/
 	$(CP)                ./files/* $(1)$(ZAPRET_DIR)/files/
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/ipset
 	$(CP) $(PKG_BUILD_DIR)/ipset/* $(1)$(ZAPRET_DIR)/ipset/
-	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/blockcheck.sh  $(1)$(ZAPRET_DIR)/blockcheck.sh
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/blockcheck2.d
+	$(CP) $(PKG_BUILD_DIR)/blockcheck2.d/* $(1)$(ZAPRET_DIR)/blockcheck2.d/
+	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/blockcheck2.sh  $(1)$(ZAPRET_DIR)/blockcheck2.sh
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/tmp
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d/openwrt
 	$(CP) $(PKG_BUILD_DIR)/init.d/openwrt/* $(1)$(ZAPRET_DIR)/init.d/openwrt/
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/openwrt/90-zapret $(1)/etc/hotplug.d/iface/90-zapret
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/openwrt/90-zapret2 $(1)/etc/hotplug.d/iface/90-zapret2
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./init.d.sh $(1)/etc/init.d/zapret
+	$(INSTALL_BIN) ./init.d.sh $(1)/etc/init.d/zapret2
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d/openwrt
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d/openwrt/custom.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./uci-def-cfg.sh     $(1)/etc/uci-defaults/zapret-uci-def-cfg.sh
+	$(INSTALL_BIN) ./uci-def-cfg.sh     $(1)/etc/uci-defaults/zapret2-uci-def-cfg.sh
 	# install all sh-scripts
 	$(CP) ./*.sh $(1)$(ZAPRET_DIR)/
 	rm -f $(1)$(ZAPRET_DIR)/init.d.sh
@@ -147,21 +166,19 @@ define Package/$(PKG_NAME)/install
 	chmod 755 $(1)$(ZAPRET_DIR)/$(MAKE_PATH)/*
 	chmod 755 $(1)$(ZAPRET_DIR)/ip2net/*
 	chmod 755 $(1)$(ZAPRET_DIR)/mdig/*
-	# Disable TPWS in blockcheck
-	grep -q '^SKIP_TPWS=' $(1)$(ZAPRET_DIR)/blockcheck.sh || sed -i '/^NFT_TABLE=blockcheck$$$$/a SKIP_TPWS=$$$${SKIP_TPWS:-1}' $(1)$(ZAPRET_DIR)/blockcheck.sh
 endef

 define Package/$(PKG_NAME)/preinst
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	ZAPRET_DIR=/opt/zapret
-	ZAPRET_INITD=/etc/init.d/zapret
-	ZAPRET_CFG=/etc/config/zapret
+	ZAPRET_DIR=/opt/zapret2
+	ZAPRET_INITD=/etc/init.d/zapret2
+	ZAPRET_CFG=/etc/config/zapret2
 	if [ -f "$${ZAPRET_INITD}" ]; then
 		SCRIPT=$$( readlink "$${ZAPRET_INITD}" )
 		if [ -n "$${SCRIPT}" ]; then
-			echo "Please uninstall incompatible \"zapret\" service!"
+			echo "Please uninstall incompatible \"zapret2\" service!"
 			exit 44
 		fi
 	fi
@@ -180,20 +197,20 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 			$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
 		fi
 	fi
-	if $${PKG_CHECK} zapret >/dev/null 2>&1; then
-		if [ ! -f "/opt/zapret/sync_config.sh" ]; then
-			echo "Please uninstall incompatible \"zapret\" package!"
+	if $${PKG_CHECK} zapret2 >/dev/null 2>&1; then
+		if [ ! -f "/opt/zapret2/sync_config.sh" ]; then
+			echo "Please uninstall incompatible \"zapret2\" package!"
 			exit 47
 		fi
 		if [ -f "$${ZAPRET_CFG}" ] && ! grep -q "run_on_boot" "$${ZAPRET_CFG}"; then
-			echo "Please uninstall incompatible \"zapret\" package!"
+			echo "Please uninstall incompatible \"zapret2\" package!"
 			exit 48
 		fi
 	fi
-	if $${PKG_CHECK} luci-app-zapret >/dev/null 2>&1; then
-		SVC_FILE=/www/luci-static/resources/view/zapret/service.js
+	if $${PKG_CHECK} luci-app-zapret2 >/dev/null 2>&1; then
+		SVC_FILE=/www/luci-static/resources/view/zapret2/service.js
 		if [ ! -f "$${SVC_FILE}" ] || ! grep -Fq "/remittor/zapret-openwrt" "$${SVC_FILE}"; then
-			echo "Please uninstall incompatible \"luci-app-zapret\" package!"
+			echo "Please uninstall incompatible \"luci-app-zapret2\" package!"
 			exit 55
 		fi
 	fi
@@ -206,23 +223,15 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 		[ -d "$${ZAPRET_DIR}" ] && rm -rf $${ZAPRET_DIR}
 		echo "All files of the previously installed package have been removed!"
 	fi
-	if $${PKG_CHECK} zapret-mdig >/dev/null 2>&1; then
-		$${PKG_REMOVE} zapret-mdig
+	if $${PKG_CHECK} zapret2-mdig >/dev/null 2>&1; then
+		$${PKG_REMOVE} zapret2-mdig
 	fi
-	if $${PKG_CHECK} zapret-ip2net >/dev/null 2>&1; then
-		$${PKG_REMOVE} zapret-ip2net
+	if $${PKG_CHECK} zapret2-ip2net >/dev/null 2>&1; then
+		$${PKG_REMOVE} zapret2-ip2net
 	fi
 	if [ ! -d "$${ZAPRET_DIR}" ]; then
 		mkdir -p $${ZAPRET_DIR}
 	fi
-	if [ ! -f "/opt/zapret/ipset/zapret-hosts-google.txt" ]; then
-		if [ -f "/opt/zapret/ipset/zapret-hosts-user.txt" ]; then
-			CFGLISTHASH=$$( md5sum "/opt/zapret/ipset/zapret-hosts-user.txt" | awk '{print $$1;}' )
-			if [ "$${CFGLISTHASH}" = "79e35df62b0d1ae455d0a7e04c4cecac" ]; then
-				rm -f "/opt/zapret/ipset/zapret-hosts-user.txt"
-			fi
-		fi
-	fi
 fi
 exit 0
 endef
@@ -231,44 +240,32 @@ define Package/$(PKG_NAME)/postinst
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	ZAPRET_DIR=/opt/zapret
-	ZAPRET_INITD=/etc/init.d/zapret
-	ZAPRET_CFG=/etc/config/zapret
-	ZAPRET_CONFIG=/opt/zapret/config
-	ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
+	ZAPRET_DIR=/opt/zapret2
+	ZAPRET_INITD=/etc/init.d/zapret2
+	ZAPRET_CFG=/etc/config/zapret2
+	ZAPRET_CONFIG=/opt/zapret2/config
+	ZAPRET_CONFIG_DEF="/opt/zapret2/config.default"
 	# Fix permissions
 	chmod 644 $${ZAPRET_CFG} >/dev/null 2>&1
 	chmod 644 $${ZAPRET_DIR}/ipset/*.txt >/dev/null 2>&1
 	chmod 644 $${ZAPRET_DIR}/ipset_def/*.txt >/dev/null 2>&1
 	chmod 644 $${ZAPRET_DIR}/init.d/openwrt/custom.d/*.sh >/dev/null 2>&1
 	chmod 644 $${ZAPRET_DIR}/config* >/dev/null 2>&1
-	# cleanup custom.d directory
-	rm -f $${ZAPRET_DIR}/init.d/openwrt/custom.d/*-opkg*
-	rm -f $${ZAPRET_DIR}/init.d/openwrt/custom.d/*.opkg*
-	rm -f $${ZAPRET_DIR}/init.d/openwrt/custom.d/*.apk*
 	# creating main config if its not exists
 	if [ ! -f "$${ZAPRET_CONFIG}" ]; then
 		cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
 	fi
-	# check obsolete format for main config
-	if grep -qE "^NFQWS_OPT_DESYNC=|^MODE_HTTP=|^MODE_HTTPS=|^MODE_QUIC=|^MODE=" "$${ZAPRET_CONFIG}" ; then
-		echo "Detect obsolute format for main config!"
-		ZAPRET_CONFIG_BACKUP="$${ZAPRET_CONFIG}.backup"
-		cp -f "$${ZAPRET_CONFIG}" "$${ZAPRET_CONFIG_BACKUP}"
-		echo "Current file $${ZAPRET_CONFIG} backuped to $${ZAPRET_CONFIG_BACKUP}"
-		cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
-	fi
 	# remove fake uci-config
 	[ -f "$${ZAPRET_CFG}" ] && [ ! -s "$${ZAPRET_CFG}" ] && rm -f "$${ZAPRET_CFG}"
 	# check existing uci-config
 	[ -f "$${ZAPRET_CFG}" ] && ZAPRET_CFG_EXISTS=1 || ZAPRET_CFG_EXISTS=0
 	# create or merge uci-config
-	/opt/zapret/uci-def-cfg.sh
-	[ "$${ZAPRET_CFG_EXISTS}" = "1" ] && echo "Config /etc/config/zapret merged with default uci-config"
+	/opt/zapret2/uci-def-cfg.sh
+	[ "$${ZAPRET_CFG_EXISTS}" = "1" ] && echo "Config /etc/config/zapret2 merged with default uci-config"
 	# remove uci-default script from system dir (used into /etc/init.d/boot)
-	rm -f /etc/uci-defaults/zapret-uci-def-cfg.sh
+	rm -f /etc/uci-defaults/zapret2-uci-def-cfg.sh
 	# copy (sync) all params from uci-config to main config
-	/opt/zapret/sync_config.sh
+	/opt/zapret2/sync_config.sh
 	# check main config
 	sh -n "$${ZAPRET_CONFIG}" 2>/dev/null || cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
 	sh -n "$${ZAPRET_CONFIG}" 2>/dev/null || exit 58
@@ -277,7 +274,7 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	# stop all
 	$${ZAPRET_INITD} stop_fw >/dev/null 2>&1
 	$${ZAPRET_INITD} stop_daemons >/dev/null 2>&1
-	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
+	ps w | grep '/opt/zapret2/nfq2/nfqws2' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
 	# start main service
 	$${ZAPRET_INITD} start
 	# restart firewall
@@ -290,17 +287,17 @@ define Package/$(PKG_NAME)/prerm
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	ZAPRET_DIR=/opt/zapret
-	ZAPRET_BASE=/opt/zapret
-	ZAPRET_INITD=/etc/init.d/zapret
-	ZAPRET_CFG=/etc/config/zapret
-	ZAPRET_CONFIG=/opt/zapret/config
-	ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
-	OPENWRT_FW_INCLUDE=/etc/firewall.zapret
+	ZAPRET_DIR=/opt/zapret2
+	ZAPRET_BASE=/opt/zapret2
+	ZAPRET_INITD=/etc/init.d/zapret2
+	ZAPRET_CFG=/etc/config/zapret2
+	ZAPRET_CONFIG=/opt/zapret2/config
+	ZAPRET_CONFIG_DEF="/opt/zapret2/config.default"
+	OPENWRT_FW_INCLUDE=/etc/firewall.zapret2
 	# check main config
 	sh -n "$${ZAPRET_CONFIG}" 2>/dev/null || cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
 	if ! sh -n "$${ZAPRET_CONFIG}" 2>/dev/null ; then
-		ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
+		ps w | grep '/opt/zapret2/nfq2/nfqws2' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
 		exit 0
 	fi
 	. "$${ZAPRET_CONFIG}"
@@ -310,7 +307,7 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	. "$${ZAPRET_BASE}/common/installer.sh"
 	$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
 	$${ZAPRET_INITD} disable >/dev/null 2>&1
-	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
+	ps w | grep '/opt/zapret2/nfq2/nfqws2' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
 	remove_openwrt_firewall
 	nft_del_table
 	restart_openwrt_firewall
@@ -322,12 +319,12 @@ define Package/$(PKG_NAME)/postrm
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	rm -f /etc/config/zapret-opkg*
-	rm -f /etc/config/zapret.opkg*
-	rm -f /etc/config/zapret.apk*
-	[ -f "/opt/zapret/config" ] && cp -f /opt/zapret/config "/opt/zapret/config.backup"
-	#rm -rf /opt/zapret
-	#echo "Directory /opt/zapret removed!"
+	rm -f /etc/config/zapret2-opkg*
+	rm -f /etc/config/zapret2.opkg*
+	rm -f /etc/config/zapret2.apk*
+	[ -f "/opt/zapret2/config" ] && cp -f /opt/zapret2/config "/opt/zapret2/config.backup"
+	#rm -rf /opt/zapret2
+	#echo "Directory /opt/zapret2 removed!"
 fi
 exit 0
 endef
--- a/zapret2/comfunc.sh
+++ b/zapret2/comfunc.sh
@@ -1,20 +1,20 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor

-EXEDIR=/opt/zapret
-ZAPRET_BASE=/opt/zapret
+EXEDIR=/opt/zapret2
+ZAPRET_BASE=/opt/zapret2

-ZAPRET_INITD=/etc/init.d/zapret
-ZAPRET_ORIG_INITD="$ZAPRET_BASE/init.d/openwrt/zapret"
+ZAPRET_INITD=/etc/init.d/zapret2
+ZAPRET_ORIG_INITD="$ZAPRET_BASE/init.d/openwrt/zapret2"

-ZAP_LOG_TAG=ZAPRET
+ZAP_LOG_TAG=ZAPRET2

 ZAPRET_CONFIG="$ZAPRET_BASE/config"
 ZAPRET_CONFIG_NEW="$ZAPRET_BASE/config.new"
 ZAPRET_CONFIG_DEF="$ZAPRET_BASE/config.default"

-ZAPRET_CFG=/etc/config/zapret
-ZAPRET_CFG_NAME=zapret
+ZAPRET_CFG=/etc/config/zapret2
+ZAPRET_CFG_NAME=zapret2
 ZAPRET_CFG_SEC=$ZAPRET_CFG_NAME.config
 ZAPRET_CFG_SEC_NAME="$( uci -q get $ZAPRET_CFG_SEC )"

@@ -193,9 +193,6 @@ function init_before_start
 	[ ! -f "$HOSTLIST_FN" ] && touch "$HOSTLIST_FN"
 	chmod 644 $ZAPRET_BASE/ipset/*.txt
 	chmod 666 $ZAPRET_BASE/ipset/*.log
-	rm -f $ZAPRET_BASE/init.d/openwrt/custom.d/*-opkg*
-	rm -f $ZAPRET_BASE/init.d/openwrt/custom.d/*.opkg*
-	rm -f $ZAPRET_BASE/init.d/openwrt/custom.d/*.apk*
 	rm -f /tmp/$ZAPRET_CFG_NAME+*.log
 	#*/
 	if [ "$DAEMON_LOG_ENABLE" = "1" ]; then
--- a/zapret2/config.default
+++ b/zapret2/config.default
@@ -30,14 +30,25 @@ IP2NET_OPT4="--prefix-length=22-30 --v4-threshold=3/4"
 IP2NET_OPT6="--prefix-length=56-64 --v6-threshold=5"

 # options for auto hostlist
+# NOTE : in order for these adjustment to work it's required to redirect enough starting packets
+# NOTE : set PKT_IN, PKT_OUT variables appropriately
+AUTOHOSTLIST_INCOMING_MAXSEQ=4096
+AUTOHOSTLIST_RETRANS_MAXSEQ=32768
+AUTOHOSTLIST_RETRANS_RESET=1
 AUTOHOSTLIST_RETRANS_THRESHOLD=3
 AUTOHOSTLIST_FAIL_THRESHOLD=3
 AUTOHOSTLIST_FAIL_TIME=60
+AUTOHOSTLIST_UDP_IN=1
+AUTOHOSTLIST_UDP_OUT=4
 # 1 = debug autohostlist positives to ipset/zapret-hosts-auto-debug.log
 AUTOHOSTLIST_DEBUGLOG=0

 # number of parallel threads for domain list resolves
 MDIG_THREADS=30
+# EAI_AGAIN retries
+MDIG_EAGAIN=10
+# delay between EAI_AGAIN retries (ms)
+MDIG_EAGAIN_DELAY=500

 # ipset/*.sh can compress large lists
 GZIP_LISTS=0
@@ -63,47 +74,30 @@ DESYNC_MARK_POSTNAT=0x20000000
 FILTER_MARK=""


-TPWS_SOCKS_ENABLE=0
-# tpws socks listens on this port on localhost and LAN interfaces
-TPPORT_SOCKS=987
-# use <HOSTLIST> and <HOSTLIST_NOAUTO> placeholders to engage standard hostlists and autohostlist in ipset dir
-# hostlist markers are replaced to empty string if MODE_FILTER does not satisfy
-# <HOSTLIST_NOAUTO> appends ipset/zapret-hosts-auto.txt as normal list
-TPWS_SOCKS_OPT="--filter-tcp=80 --methodeol <HOSTLIST> --new --filter-tcp=443 --split-tls=sni --disorder <HOSTLIST>"
-
-TPWS_ENABLE=0
-TPWS_PORTS="80,443"
-# use <HOSTLIST> and <HOSTLIST_NOAUTO> placeholders to engage standard hostlists and autohostlist in ipset dir
-# hostlist markers are replaced to empty string if MODE_FILTER does not satisfy
-# <HOSTLIST_NOAUTO> appends ipset/zapret-hosts-auto.txt as normal list
-TPWS_OPT="--filter-tcp=80 --methodeol <HOSTLIST> --new --filter-tcp=443 --split-tls=sni --disorder <HOSTLIST>"
-
-
-NFQWS_ENABLE=1
+NFQWS2_ENABLE=1

 # redirect outgoing traffic with connbytes limiter applied in both directions.
-NFQWS_PORTS_TCP="80,443"
-NFQWS_PORTS_UDP="443"
+NFQWS2_PORTS_TCP="80,443"
+NFQWS2_PORTS_UDP="443"

 # PKT_OUT means connbytes dir original
 # PKT_IN means connbytes dir reply
-# this is --dpi-desync-cutoff=nX kernel mode implementation for linux. it saves a lot of CPU.
-NFQWS_TCP_PKT_OUT="9"
-NFQWS_TCP_PKT_IN="3"
-NFQWS_UDP_PKT_OUT="9"
-NFQWS_UDP_PKT_IN="0"
+NFQWS2_TCP_PKT_OUT="20"
+NFQWS2_TCP_PKT_IN="10"
+NFQWS2_UDP_PKT_OUT="5"
+NFQWS2_UDP_PKT_IN="3"

 # redirect outgoing traffic without connbytes limiter and incoming with connbytes limiter
 # normally it's needed only for stateless DPI that matches every packet in a single TCP session
 # typical example are plain HTTP keep alives
 # this mode can be very CPU consuming. enable with care !
-NFQWS_PORTS_TCP_KEEPALIVE=""
-NFQWS_PORTS_UDP_KEEPALIVE=""
+NFQWS2_PORTS_TCP_KEEPALIVE=""
+NFQWS2_PORTS_UDP_KEEPALIVE=""

 # use <HOSTLIST> and <HOSTLIST_NOAUTO> placeholders to engage standard hostlists and autohostlist in ipset dir
 # hostlist markers are replaced to empty string if MODE_FILTER does not satisfy
 # <HOSTLIST_NOAUTO> appends ipset/zapret-hosts-auto.txt as normal list
-NFQWS_OPT="--filter-tcp=80 <HOSTLIST> --dpi-desync=fake,fakedsplit --dpi-desync-autottl=2 --dpi-desync-fooling=badsum --new --filter-tcp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt --dpi-desync=fake,multidisorder --dpi-desync-split-pos=1,midsld --dpi-desync-repeats=11 --dpi-desync-fooling=badsum --dpi-desync-fake-tls-mod=rnd,dupsid,sni=www.google.com --new --filter-udp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt --dpi-desync=fake --dpi-desync-repeats=11 --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin --new --filter-udp=443 <HOSTLIST_NOAUTO> --dpi-desync=fake --dpi-desync-repeats=11 --new --filter-tcp=443 <HOSTLIST> --dpi-desync=multidisorder --dpi-desync-split-pos=1,sniext+1,host+1,midsld-2,midsld,midsld+2,endhost-1"
+NFQWS2_OPT="--filter-tcp=80 --filter-l7=http <HOSTLIST> --payload=http_req --lua-desync=fake:blob=fake_default_http:tcp_md5 --lua-desync=multisplit:pos=method+2 --new --filter-tcp=443 --filter-l7=tls <HOSTLIST> --payload=tls_client_hello --lua-desync=fake:blob=fake_default_tls:tcp_md5:tcp_seq=-10000 --lua-desync=multidisorder:pos=1,midsld --new --filter-udp=443 --filter-l7=quic <HOSTLIST_NOAUTO> --payload=quic_initial --lua-desync=fake:blob=fake_default_quic:repeats=6"


 DISABLE_CUSTOM=1
@@ -121,9 +115,8 @@ FLOWOFFLOAD=none
 # for routers based on desktop linux and macos. has no effect in openwrt.
 # CHOOSE LAN and optinally WAN/WAN6 NETWORK INTERFACES
 # or leave them commented if its not router
-# it's possible to specify multiple interfaces like this : IFACE_LAN="eth0 eth1 eth2"
+# it's possible to specify multiple interfaces like this : IFACE_WAN="eth0 eth1 eth2"
 # if IFACE_WAN6 is not defined it take the value of IFACE_WAN
-#IFACE_LAN=eth0
 #IFACE_WAN=eth1
 #IFACE_WAN6="ipsec0 wireguard0 he_net"

@@ -132,10 +125,10 @@ FLOWOFFLOAD=none
 INIT_APPLY_FW=1

 # firewall apply hooks
-#INIT_FW_PRE_UP_HOOK="/etc/firewall.zapret.hook.pre_up"
-#INIT_FW_POST_UP_HOOK="/etc/firewall.zapret.hook.post_up"
-#INIT_FW_PRE_DOWN_HOOK="/etc/firewall.zapret.hook.pre_down"
-#INIT_FW_POST_DOWN_HOOK="/etc/firewall.zapret.hook.post_down"
+#INIT_FW_PRE_UP_HOOK="/etc/firewall.zapret2.hook.pre_up"
+#INIT_FW_POST_UP_HOOK="/etc/firewall.zapret2.hook.post_up"
+#INIT_FW_PRE_DOWN_HOOK="/etc/firewall.zapret2.hook.pre_down"
+#INIT_FW_POST_DOWN_HOOK="/etc/firewall.zapret2.hook.post_down"

 # do not work with ipv4
 DISABLE_IPV4=0
@@ -156,4 +149,4 @@ FILTER_TTL_EXPIRED_ICMP=1

 DAEMON_LOG_ENABLE=0

-DAEMON_LOG_FILE="/tmp/zapret+<DAEMON_NAME>+<DAEMON_IDNUM>+<DAEMON_CFGNAME>.log"
+DAEMON_LOG_FILE="/tmp/zapret2+<DAEMON_NAME>+<DAEMON_IDNUM>+<DAEMON_CFGNAME>.log"
--- a/zapret2/custom.d/50-script.sh
+++ b/zapret2/custom.d/50-script.sh
@@ -3,7 +3,7 @@
 # NOTE: @ih requires nft 1.0.1+ and updated kernel version. it's confirmed to work on 5.15 (openwrt 23) and not work on 5.10 (openwrt 22)

 # can override in config :
-NFQWS_OPT_DESYNC_STUN="${NFQWS_OPT_DESYNC_STUN:---dpi-desync=fake --dpi-desync-repeats=2}"
+NFQWS_OPT_DESYNC_STUN="${NFQWS_OPT_DESYNC_STUN:---payload stun --lua-desync=fake:blob=0x00000000000000000000000000000000:repeats=2}"

 alloc_dnum DNUM_STUN4ALL
 alloc_qnum QNUM_STUN4ALL
@@ -17,14 +17,14 @@ zapret_custom_daemons()
 }
 zapret_custom_firewall()
 {
-        # $1 - 1 - run, 0 - stop
+	# $1 - 1 - run, 0 - stop

 	local f='-p udp -m u32 --u32'
 	fw_nfqws_post $1 "$f 0>>22&0x3C@4>>16=28:65535&&0>>22&0x3C@12=0x2112A442&&0>>22&0x3C@8&0xC0000003=0" "$f 44>>16=28:65535&&52=0x2112A442&&48&0xC0000003=0" $QNUM_STUN4ALL
 }
 zapret_custom_firewall_nft()
 {
-        # stop logic is not required
+	# stop logic is not required

 	local f="udp length >= 28 @ih,32,32 0x2112A442 @ih,0,2 0 @ih,30,2 0"
 	nft_fw_nfqws_post "$f" "$f" $QNUM_STUN4ALL
--- a/zapret2/def-cfg.sh
+++ b/zapret2/def-cfg.sh
@@ -0,0 +1,197 @@
+#!/bin/sh
+# Copyright (c) 2025 remittor
+
+function set_cfg_reset_values
+{
+	local cfgname=${1:-$ZAPRET_CFG_NAME}
+	local TAB="$( printf '\t' )"
+	uci batch <<-EOF
+		set $cfgname.config.run_on_boot='0'
+		# settings for zapret service
+		set $cfgname.config.FWTYPE='nftables'
+		set $cfgname.config.POSTNAT='1'
+		set $cfgname.config.FLOWOFFLOAD='none'
+		set $cfgname.config.INIT_APPLY_FW='1'
+		set $cfgname.config.DISABLE_IPV4='0'
+		set $cfgname.config.DISABLE_IPV6='1'
+		set $cfgname.config.FILTER_TTL_EXPIRED_ICMP='1'
+		set $cfgname.config.MODE_FILTER='hostlist'
+		set $cfgname.config.DISABLE_CUSTOM='1'
+		set $cfgname.config.WS_USER='daemon'
+		set $cfgname.config.DAEMON_LOG_ENABLE='0'
+		set $cfgname.config.DAEMON_LOG_FILE='/tmp/zapret2+<DAEMON_NAME>+<DAEMON_IDNUM>+<DAEMON_CFGNAME>.log'
+		# autohostlist options
+		set $cfgname.config.AUTOHOSTLIST_INCOMING_MAXSEQ='4096'
+		set $cfgname.config.AUTOHOSTLIST_RETRANS_MAXSEQ='32768'
+		set $cfgname.config.AUTOHOSTLIST_RETRANS_RESET='1'
+		set $cfgname.config.AUTOHOSTLIST_RETRANS_THRESHOLD='3'
+		set $cfgname.config.AUTOHOSTLIST_FAIL_THRESHOLD='3'
+		set $cfgname.config.AUTOHOSTLIST_FAIL_TIME='60'
+		set $cfgname.config.AUTOHOSTLIST_UDP_IN='1'
+		set $cfgname.config.AUTOHOSTLIST_UDP_OUT='4'
+		set $cfgname.config.AUTOHOSTLIST_DEBUGLOG='0'
+		# nfqws options
+		set $cfgname.config.NFQWS2_ENABLE='1'
+		set $cfgname.config.DESYNC_MARK='0x40000000'
+		set $cfgname.config.DESYNC_MARK_POSTNAT='0x20000000'
+		set $cfgname.config.FILTER_MARK='$TAB'
+		set $cfgname.config.NFQWS2_PORTS_TCP='80,443'
+		set $cfgname.config.NFQWS2_PORTS_UDP='443'
+		set $cfgname.config.NFQWS2_TCP_PKT_OUT='20'
+		set $cfgname.config.NFQWS2_TCP_PKT_IN='10'
+		set $cfgname.config.NFQWS2_UDP_PKT_OUT='5'
+		set $cfgname.config.NFQWS2_UDP_PKT_IN='3'
+		set $cfgname.config.NFQWS2_PORTS_TCP_KEEPALIVE='0'
+		set $cfgname.config.NFQWS2_PORTS_UDP_KEEPALIVE='0'
+		# save changes
+		commit $cfgname
+	EOF
+	return 0
+}
+
+function clear_nfqws_strat
+{
+	local cfgname=${1:-$ZAPRET_CFG_NAME}
+	local TAB="$( printf '\t' )"
+	uci batch <<-EOF
+		set $cfgname.config.MODE_FILTER='hostlist'
+		set $cfgname.config.NFQWS2_PORTS_TCP='80,443'
+		set $cfgname.config.NFQWS2_PORTS_UDP='443'
+		set $cfgname.config.NFQWS2_OPT='$TAB'
+		commit $cfgname
+	EOF
+}
+
+function set_cfg_nfqws_strat
+{
+	local strat=${1:--}
+	local cfgname=${2:-$ZAPRET_CFG_NAME}
+	local TAB="$( printf '\t' )"
+    
+	uci batch <<-EOF
+		set $cfgname.config.MODE_FILTER='hostlist'
+		commit $cfgname
+	EOF
+	if [ "$strat" = "empty" ]; then
+		clear_nfqws_strat $cfgname
+	fi
+	if [ "$strat" = "default" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS2_PORTS_TCP='80,443'
+			set $cfgname.config.NFQWS2_PORTS_UDP='443'
+			set $cfgname.config.NFQWS2_OPT="
+				# Strategy $strat
+				
+				--filter-tcp=80
+				--filter-l7=http <HOSTLIST>
+				--payload=http_req
+				--lua-desync=fake:blob=fake_default_http:tcp_md5
+				--lua-desync=multisplit:pos=method+2
+				
+				--new
+				--filter-tcp=443
+				--filter-l7=tls <HOSTLIST>
+				--payload=tls_client_hello
+				--lua-desync=fake:blob=fake_default_tls:tcp_md5:tcp_seq=-10000
+				--lua-desync=multidisorder:pos=1,midsld
+				
+				--new
+				--filter-udp=443
+				--filter-l7=quic <HOSTLIST_NOAUTO>
+				--payload=quic_initial
+				--lua-desync=fake:blob=fake_default_quic:repeats=6
+			"
+			commit $cfgname
+		EOF
+	fi
+	if [ "$strat" = "v1_by_Schiz23" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS2_PORTS_TCP='80,443'
+			set $cfgname.config.NFQWS2_PORTS_UDP='443'
+			set $cfgname.config.NFQWS2_OPT="
+				# Strategy $strat
+				
+				--filter-tcp=80
+				--filter-l7=http <HOSTLIST>
+				--payload=http_req
+				--lua-desync=fake:blob=fake_default_http:tcp_md5
+				--lua-desync=multisplit:pos=method+2
+				
+				--new
+				--filter-tcp=443
+				--filter-l7=tls <HOSTLIST>
+				--lua-desync=fake:blob=fake_default_tls:ip_ttl=1:ip6_ttl=1:tls_mod=rnd,rndsni,padencap
+				--lua-desync=multidisorder:payload=tls_client_hello:pos=3
+				
+				--new
+				--filter-udp=443
+				--filter-l7=quic <HOSTLIST_NOAUTO>
+				--lua-desync=fake:blob=fake_default_quic:repeats=11:payload=all:out_range=-d10
+			"
+			commit $cfgname
+		EOF
+	fi
+	if [ "$strat" = "v2_by_Schiz23" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS2_PORTS_TCP='80,443'
+			set $cfgname.config.NFQWS2_PORTS_UDP='443'
+			set $cfgname.config.NFQWS2_OPT="
+				# Strategy $strat
+				
+				--filter-tcp=80
+				--filter-l7=http <HOSTLIST>
+				--payload=http_req
+				--lua-desync=fake:blob=fake_default_http:tcp_md5
+				--lua-desync=multisplit:pos=method+2
+				
+				--new
+				--filter-tcp=443
+				--filter-l7=tls <HOSTLIST>
+				--payload=tls_client_hello
+				--lua-desync=multidisorder:payload=tls_client_hello:pos=100,midsld,sniext+1,endhost-2,-10
+				--lua-desync=send:sni=.microsoft
+				
+				--new
+				--filter-udp=443
+				--filter-l7=quic <HOSTLIST_NOAUTO>
+				--payload=quic_initial
+				--lua-desync=fake:blob=fake_default_quic:repeats=4
+			"
+			commit $cfgname
+		EOF
+	fi
+	return 0
+}
+
+function set_cfg_default_values
+{
+	local opt_flags=${1:--}
+	local opt_strat=${2:-default}
+	local cfgname=${3:-$ZAPRET_CFG_NAME}
+
+	if ! echo "$opt_flags" | grep -q "(skip_base)"; then
+		set_cfg_reset_values $cfgname
+	fi
+	if [ "$opt_strat" != "-" ]; then
+		set_cfg_nfqws_strat "$opt_strat" $cfgname
+	fi
+	if echo "$opt_flags" | grep -q "(set_mode_autohostlist)"; then
+		uci batch <<-EOF
+			set $cfgname.config.MODE_FILTER='autohostlist'
+			commit $cfgname
+		EOF
+	fi
+	if echo "$opt_flags" | grep -q "(enable_custom_d)"; then
+		uci batch <<-EOF
+			set $cfgname.config.DISABLE_CUSTOM='0'
+			commit $cfgname
+		EOF
+	fi
+	if echo "$opt_flags" | grep -q "(disable_custom_d)"; then
+		uci batch <<-EOF
+			set $cfgname.config.DISABLE_CUSTOM='1'
+			commit $cfgname
+		EOF
+	fi
+	return 0
+}
--- a/zapret2/dwc.sh
+++ b/zapret2/dwc.sh
@@ -1,17 +1,15 @@
 #!/bin/sh
 # Copyright (c) 2026 remittor

-ZAP_TMP_DIR=/tmp/zapret_dwc
+ZAP_TMP_DIR=/tmp/zapret2_dwc

-opt_sites=
 opt_dig=
 opt_recom=
 opt_tmp_dir=
 opt_test=

-while getopts "sd:RT:t" opt; do
+while getopts "d:RT:t" opt; do
 	case $opt in
-		s) opt_sites="true";;
 		d) opt_dig="$OPTARG";;
 		R) opt_recom="true";;     # Recommendations
 		T) opt_tmp_dir="$OPTARG";;
@@ -27,7 +25,7 @@ TARGET_LIST_FILE="$ZAP_TMP_DIR/targets"
 [ -f "$TARGET_LIST_FILE" ] && exit 3

 CURL_TIMEOUT=5
-CURL_MAXBODY=65536
+CURL_RANGETO=65535
 CURL_NOCACHE='cache-control: no-cache'
 CURL_NOCACHE2='pragma: no-cache'
 CURL_USERAGENT='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36'
@@ -69,7 +67,7 @@ fi
 #echo 'Original sources: https://github.com/hyperion-cs/dpi-checkers'
 #echo 'WEB-version: https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/'

-TEST_SUITE='
+TEST_SUITE='[
  { id: "US.CF-01", provider: "🇺🇸 Cloudflare", times: 1, url: "https://img.wzstats.gg/cleaver/gunFullDisplay" },
  { id: "US.CF-02", provider: "🇺🇸 Cloudflare", times: 1, url: "https://genshin.jmp.blue/characters/all#" },
  { id: "US.CF-03", provider: "🇺🇸 Cloudflare", times: 1, url: "https://api.frankfurter.dev/v1/2000-01-01..2002-12-31" },
@@ -78,7 +76,7 @@ TEST_SUITE='
  { id: "DE.HE-01", provider: "🇩🇪 Hetzner", times: 1, url: "https://j.dejure.org/jcg/doctrine/doctrine_banner.webp" },
  { id: "DE.HE-02", provider: "🇩🇪 Hetzner", times: 1, url: "https://maps.gnosis.earth/ogcapi/api/swagger-ui/swagger-ui-standalone-preset.js#" },
  { id: "FI.HE-01", provider: "🇫🇮 Hetzner", times: 1, url: "https://251b5cd9.nip.io/1MB.bin" },
-  { id: "FI.HE-02", provider: "🇫🇮 Hetzner", times: 1, url: "https://nioges.com/libs/fontawesome/webfonts/fa-solid-900.woff2" },
+  { id: "FI.HE-02", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8c176.nip.io/1MB.bin" },
  { id: "FI.HE-03", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8bdae.nip.io/1MB.bin" },
  { id: "FI.HE-04", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8bca5.nip.io/1MB.bin" },
  { id: "FR.OVH-01", provider: "🇫🇷 OVH", times: 1, url: "https://eu.api.ovh.com/console/rapidoc-min.js" },
@@ -95,38 +93,7 @@ TEST_SUITE='
  { id: "FR.CNTB-01", provider: "🇫🇷 Contabo", times: 1, url: "https://airsea.no/images/main_logo.png" },
  { id: "NL.SW-01", provider: "🇳🇱 Scaleway", times: 1, url: "https://www.velivole.fr/img/header.jpg" },
  { id: "US.CNST-01", provider: "🇺🇸 Constant", times: 1, url: "https://cdn.xuansiwei.com/common/lib/font-awesome/4.7.0/fontawesome-webfont.woff2?v=4.7.0" }
-'
-
-if [ "$opt_sites" = true ]; then
-	TEST_SUITE='
-	gosuslugi.ru          | @  |  40000 | https://gosuslugi.ru/__jsch/static/script.js
-	esia.gosuslugi.ru     | @  |  40000 | https://esia.gosuslugi.ru/__jsch/static/script.js
-	gu-st.ru              |    |        | https://gu-st.ru/portal-st/lib-assets/fonts/Lato-Regular-v3.woff2
-	nalog.ru              |    |        | https://data.nalog.ru/images/new/buttons/TSET-button.png
-	lkfl2.nalog.ru        |    |        | https://lkfl2.nalog.ru/lkfl/static/assets/main-desktop-1920-CvJsHANg.jpg
-	rutube.ru             | @  |  40000 | https://static.rutube.ru/static/wdp/fonts/Semibold/OpenSans-Semibold.woff2?20231026
-	youtube.com           | @# | 300000 | https://youtube.com
-	instagram.com         | @# | 300000 | https://instagram.com
-	rutracker.org         | @# |  80000 | https://rutracker.org
-	nnmclub.to            | @# | 120000 | https://nnmclub.to
-	rutor.info            | @# | 110000 | https://rutor.info
-	epidemz.net.co        | @# |  40000 | https://epidemz.net.co
-	filmix.my             | @  |  23000 | https://filmix.my/templates/Filmix/media/fonts/Roboto/roboto-v20-latin_cyrillic-italic.woff2
-	openwrt.org           | +  |  60000 | https://openwrt.org/lib/tpl/bootstrap3/assets/bootstrap/default/bootstrap.min.css
-	ntc.party             | @# | 200000 | https://ntc.party
-	sxyprn.net            | @# | 310000 | https://sxyprn.net
-	pornhub.com           | @# | 700000 | https://pornhub.com
-	spankbang.com         | @# |  80000 | https://spankbang.com
-	discord.com           | @# | 120000 | https://discord.com
-	x.com                 | @  |  39000 | https://abs.twimg.com/fonts/v1/chirp-extended-heavy-web.woff2
-	flightradar24.com     | @  | 100000 | https://www.flightradar24.com/mobile/airlines?format=2&version=0
-	cdn77.com             | @  |  24000 | https://cdn77.com/fonts/Eina01-Regular.woff2
-	play.google.com       | @# | 100000 | https://gstatic.com/feedback/js/help/prod/service/lazy.min.js
-	genderize.io          | @# | 210000 | https://genderize.io
-	ottai.com             | @  |  70000 | https://seas.static.ottai.com/ottai-website/public/images/new/home/banner/uk/banner.webp
-	'
-	CURL_TIMEOUT=7
-fi
+]'

 function trim
 {
@@ -138,17 +105,6 @@ mkdir -p "$ZAP_TMP_DIR"
 : > "$TARGET_LIST_FILE"
 IDX=0
 while IFS= read -r line; do
-	if [ "$opt_sites" = true ]; then
-		echo -n "$line" | grep -q ' | http' || continue
-		IDX=$((IDX + 1))
-		TAG=$( printf '%s\n' "$line" | cut -d'|' -f1 | awk '{$1=$1;print}' )
-		FLAGS=$( printf '%s\n' "$line" | cut -d'|' -f2 | awk '{$1=$1;print}' )
-		TSIZE=$( printf '%s\n' "$line" | cut -d'|' -f3 | awk '{$1=$1;print}' )
-		URL=$( printf '%s\n' "$line" | cut -d'|' -f4 | awk '{$1=$1;print}' )
-		COUNTRY="XX"
-		echo "${IDX}|${TAG}|${COUNTRY}|${FLAGS}|${TSIZE}|${URL}" >> "$TARGET_LIST_FILE"
-		continue
-	fi
 	case "$line" in
 		*id:*provider:*url:*)
 			IDX=$((IDX + 1))
@@ -171,31 +127,10 @@ CURL_SPEED_LIMIT=1

 while IFS='|' read -r ID TAG COUNTRY PROVIDER TIMES URL; do
 	[ -z "$TAG" ] && continue
+	ID=$((ID+1))
 	ID3=$( printf '%03d' "$ID" )
-	RANGETO=""
-	REDIRECT=""
-	USERAGENT="$CURL_USERAGENT"
-	if [ "$opt_sites" = true ]; then
-		FLAGS="$PROVIDER"
-		TSIZE="$TIMES"
-		[ "$TSIZE" = "" ] && TSIZE=$CURL_MAXBODY
-		if echo "$FLAGS" | grep -q '@'; then
-			RANGETO=""
-		else
-			RANGETO="--range 0-$((TSIZE - 1))"
-		fi
-		PROVIDER="$TSIZE"
-		if echo "$FLAGS" | grep -q '#'; then
-			REDIRECT="-L"
-		fi
-		if echo "$FLAGS" | grep -q '+'; then
-			USERAGENT="curl/8.12"
-		fi
-	else
-		RANGETO="--range 0-$((CURL_MAXBODY - 1))"
-		COUNTRY=$( echo "$TAG" | cut -d. -f1 )
-		CNTFLAG=$( echo "$PROVIDER" | awk '{print $1}' )
-	fi
+	COUNTRY=$( echo "$TAG" | cut -d. -f1 )
+	CNTFLAG=$( echo "$PROVIDER" | awk '{print $1}' )
 	URL_NO_PROTO="${URL#*://}"
 	DOMAIN="${URL_NO_PROTO%%/*}"
 	URLPATH="/${URL_NO_PROTO#*/}"
@@ -222,13 +157,12 @@ while IFS='|' read -r ID TAG COUNTRY PROVIDER TIMES URL; do
 		echo "$URL" > "$FNAME.url"
 		curl "$URL" \
 			$RESOLVE_OPT \
-			$REDIRECT \
 			--connect-timeout $CURL_CON_TIMEOUT \
 			--max-time $CURL_TIMEOUT \
 			--speed-time $CURL_SPEED_TIME \
 			--speed-limit $CURL_SPEED_LIMIT	\
-			$RANGETO \
-			-A "$USERAGENT" \
+			--range 0-$CURL_RANGETO \
+			-A "$CURL_USERAGENT" \
 			-D "$FNAME.hdr" \
 			-o "$FNAME.body"
 	) > "$FNAME.log" 2>&1 &
@@ -247,8 +181,6 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
 	TAG=$( echo "$FILENAME" | cut -d= -f2)
 	PROVIDER=$(echo "$FILENAME" | cut -d= -f3 )
 	FNAME="$ZAP_TMP_DIR/$FILENAME"
-	REQ_SIZE=$CURL_MAXBODY
-	[ "$opt_sites" = true ] && REQ_SIZE="$PROVIDER"
 	BODY_SIZE=0
 	[ -f "$FNAME.body" ] && BODY_SIZE=$( wc -c < "$FNAME.body" )
 	IPADDR="x.x.x.x"
@@ -264,7 +196,7 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
 	elif [ ! -s "$FNAME.body" ]; then
 		status="Possibly detected"
 	else
-		if [ $BODY_SIZE -lt $REQ_SIZE ]; then
+		if [ "$BODY_SIZE" -le $CURL_RANGETO ]; then
 			status="Failed (recv $BODY_SIZE bytes)"
 			res=5
 		else
@@ -272,11 +204,7 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
 			res=100
 		fi
 	fi
-	if [ "$opt_sites" = true ]; then
-		printf '%18s / %-15s : %s \n' "$TAG" "$IPADDR" "$status"
-	else
-		printf '%12s / %-15s / %-13s: %s \n' "$TAG" "$IPADDR" "$PROVIDER" "$status"
-	fi
+	printf '%12s / %-15s / %-13s: %s \n' "$TAG" "$IPADDR" "$PROVIDER" "$status"
 	echo "$BODY_SIZE" > "$FNAME.size"
 	if [ $res != 100 ]; then
 		URL=$( cat "$FNAME.url" )
@@ -284,9 +212,7 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
 	fi
 done

-if [ "$opt_test" != true ]; then
-	rm -f "$ZAP_TMP_DIR"/*.body >/dev/null 2>&1
-fi
+rm -f "$ZAP_TMP_DIR"/*.body >/dev/null 2>&1

 [ "$opt_recom" != "true" ] && return 0

--- a/zapret2/files/fake/4pda.bin
+++ b/zapret2/files/fake/4pda.bin
--- a/zapret2/files/fake/max.bin
+++ b/zapret2/files/fake/max.bin
--- a/zapret2/files/fake/t2.bin
+++ b/zapret2/files/fake/t2.bin
--- a/zapret2/files/fake/tls_clienthello_max_ru.bin
+++ b/zapret2/files/fake/tls_clienthello_max_ru.bin
--- a/zapret2/init.d.sh
+++ b/zapret2/init.d.sh
@@ -7,7 +7,7 @@ START=21

 SCRIPT_FILENAME=$1

-. /opt/zapret/comfunc.sh
+. /opt/zapret2/comfunc.sh

 if ! is_valid_config ; then
 	logger -p err -t $ZAP_LOG_TAG "Wrong main config: $ZAPRET_CONFIG"
--- a/zapret2/ipset/zapret-hosts-google.txt
+++ b/zapret2/ipset/zapret-hosts-google.txt
--- a/zapret2/ipset/zapret-hosts-user-exclude.txt
+++ b/zapret2/ipset/zapret-hosts-user-exclude.txt
@@ -11,7 +11,6 @@ fe80::/10
 nalog.ru
 gstatic.com
 gosuslugi.ru
-mos.ru
 mos-gorsud.ru
 gov.ru
 sudrf.ru
@@ -285,42 +284,4 @@ huaweicloud-dns.cn
 huaweicloud-dns.ru
 huaweicloud-dns.com
 huaweicloud-dns.org
-#################################### Okko
-okko.tv
-playfamily.ru
-#################################### Beeline
-beeline.ru
-beeline.tv
-#################################### Delta Force
-volces.com
-wetest.net
-intlgame.com
-fleetlogd.com
-dgameglobal.com
-tdatamaster.com
-playdeltaforce.com
-quovadisglobal.com
-jupiterlauncher.com
-anticheatexpert.com
-#################################### Microsoft
-live.com
-lync.com
-skype.com
-microsoft
-msauth.net
-office.net
-office.com
-msocdn.com
-mojang.com
-windows.net
-msftauth.net
-xboxlive.com
-microsoft.com
-office365.com
-azureedge.net
-skypeassets.com
-windowsupdate.com
-microsoftonline.com
-microsoftonline-p.com
-minecraftservices.com
 ####################################
--- a/zapret2/ipset/zapret-hosts-user.txt
+++ b/zapret2/ipset/zapret-hosts-user.txt
--- a/zapret2/ipset/zapret-ip-exclude.txt
+++ b/zapret2/ipset/zapret-ip-exclude.txt
--- a/zapret2/patches/0001-Add-support-log-file-for-each-daemons.patch
+++ b/zapret2/patches/0001-Add-support-log-file-for-each-daemons.patch
@@ -25,10 +25,10 @@ index 0af19c0..41c0967 100644
 			done
 		}
 	}
-diff --git a/init.d/openwrt/zapret b/init.d/openwrt/zapret
+diff --git a/init.d/openwrt/zapret b/init.d/openwrt/zapret2
 index 8d6d3a9..fcb1e91 100755
--- a/init.d/openwrt/zapret
-+++ b/init.d/openwrt/zapret
+--- a/init.d/openwrt/zapret2
+++ b/init.d/openwrt/zapret2
@@ -58,12 +58,29 @@ run_daemon()
 	# use $PIDDIR/$DAEMONBASE$1.pid as pidfile
 	local DAEMONBASE="$(basename "$2")"
@@ -51,15 +51,15 @@ index 8d6d3a9..fcb1e91 100755
 	procd_open_instance
 -	procd_set_param command $2 $3
 +	procd_set_param command $DAEMON_PATH $DAEMON_ARGS
- 	procd_set_param pidfile $PIDDIR/$DAEMONBASE$1.pid
+ 	procd_set_param pidfile $PIDDIR/${DAEMONBASE}_$1.pid
 	procd_close_instance
 }
 
 +DAEMON_CFGNAME="main"
 +
- run_tpws()
+ run_nfqws()
 {
- 	[ "$DISABLE_IPV4" = "1" ] && [ "$DISABLE_IPV6" = "1" ] && return 0
+ 	run_daemon $1 "$NFQWS2" "$NFQWS2_OPT_BASE $2"
 -- 
 2.41.0.windows.3

--- a/zapret2/renew-cfg.sh
+++ b/zapret2/renew-cfg.sh
--- a/zapret2/restore-def-cfg.sh
+++ b/zapret2/restore-def-cfg.sh
--- a/zapret2/script-exec.sh
+++ b/zapret2/script-exec.sh
--- a/zapret2/sync_config.sh
+++ b/zapret2/sync_config.sh
--- a/zapret2/uci-def-cfg.sh
+++ b/zapret2/uci-def-cfg.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor

-[ ! -f /opt/zapret/comfunc.sh ] && exit 0
+[ ! -f /opt/zapret2/comfunc.sh ] && exit 0

-. /opt/zapret/comfunc.sh
+. /opt/zapret2/comfunc.sh

 mkdir -p $ZAPRET_BASE/ipset

--- a/zapret2/update-pkg.sh
+++ b/zapret2/update-pkg.sh
Author	SHA1	Message	Date
remittor	2500109837	Bump version to v0.8.20260118	2026-01-18 13:35:06 +03:00
remittor	05b84183d9	luci: updater: Using 3 buttons and fix execAndRead	2026-01-18 13:34:55 +03:00
remittor	2d32f04071	luci: Fix error "XHR request timed out" into execAndRead	2026-01-18 10:01:27 +03:00
remittor	bf418db17e	luci: Fix file permissions for saved configs	2026-01-17 17:36:54 +03:00
remittor	c574e04a2b	luci: NFQWS2_OPT: Block enter text with quotes	2026-01-17 15:52:46 +03:00
remittor	1f0d674185	luci: Using dict for arguments of function	2026-01-17 15:52:10 +03:00
remittor	27dab23ed2	Bump version to v0.8.20260117	2026-01-17 11:02:28 +03:00
remittor	5a6c607fee	makefile: Cleanup conffiles and install sections	2026-01-16 20:24:27 +03:00
remittor	0309b4b94c	updater: Add uninstall oldest mdig and ip2net packages	2026-01-16 20:08:21 +03:00
remittor	13b6e4611a	ipset: Update zapret-hosts-user-exclude.txt	2026-01-16 20:01:28 +03:00
remittor	15a6f9e5ae	settings: Add new options on "Reset settings" dialog	2026-01-16 19:59:40 +03:00
remittor	4aca2043c1	diag: dwc: Add support resolve ip via specific dns and add recommendations	2026-01-16 19:53:07 +03:00
remittor	84f297492a	luci: Fix save very long textareas to file	2026-01-16 11:33:09 +03:00
remittor	685afc1a69	comfunc: Fix recreating crontab log cleaning task on restart PR: `ad6b23f4aa`	2026-01-13 21:42:04 +03:00
remittor	a84174e51d	luci: Fix show NFQWS2_OPT	2026-01-13 21:36:30 +03:00
remittor	ee8089e1bb	Bump version to v0.8.20260113	2026-01-13 14:37:26 +03:00
remittor	4dd7030c60	makefile: Fix conffiles section and other fixes	2026-01-13 14:31:21 +03:00
remittor	00490e3b5d	shell: Fix sh-scripts (copilot)	2026-01-13 14:17:07 +03:00
remittor	126e7dea89	Fix uci-def-cfg.sh	2026-01-13 14:15:25 +03:00
remittor	fc85552e4e	updater: Fix pkg_mgr_update for opkg	2026-01-13 14:14:57 +03:00
remittor	e15eaafa33	luci: Add description for "Diagnostics" button	2026-01-13 14:11:00 +03:00
remittor	5b331132a1	github: releases: Add step "Wait for GitHub API consistency"	2026-01-12 22:51:52 +03:00
remittor	5711c1f2d4	config: Fix sync for AUTOHOSTLIST_RETRANS_RESET	2026-01-12 21:56:01 +03:00
remittor	0ee7ae325e	diag: Fix bugs in dwc.sh	2026-01-11 19:09:07 +03:00
remittor	c4ce5c1aeb	diag: Fix load comfunc.sh	2026-01-11 17:30:42 +03:00
remittor	d50aa75e94	makefile: skip init.d.sh	2026-01-11 16:09:35 +03:00
remittor	77f8f94d38	Bump version to v0.8.20260111	2026-01-11 15:31:38 +03:00
remittor	f7e01283e7	diag: Fix DPI checker	2026-01-11 15:30:48 +03:00
remittor	5b997a5eb5	config: Add new option AUTOHOSTLIST_RETRANS_RESET	2026-01-11 14:49:19 +03:00
remittor	0e2940c338	ipset: Update zapret-hosts-user-exclude.txt	2026-01-11 14:21:48 +03:00
remittor	0e31e5d804	Add diagnostic button (DPI checker)	2026-01-11 11:54:19 +03:00
remittor	ab50c2099b	luci: updater: Add new func tools.execAndRead	2026-01-10 20:51:11 +03:00
remittor	17afabe150	luci: Fix update text after edit for NFQWS2_OPT	2026-01-10 10:56:58 +03:00
remittor	2ecf3cf5d0	luci: Fix js-files for unification	2026-01-09 22:31:11 +03:00
remittor	9e8046d734	luci: Splitting file tools.js into two parts (add file env.js)	2026-01-09 21:58:12 +03:00
remittor	c68236c8fd	Replace "founded" to "found"	2026-01-09 17:36:26 +03:00
remittor	706f92fea7	config: Update default values src: https://github.com/bol-van/zapret2/commits/master/config.default	2026-01-09 17:10:18 +03:00
remittor	d747201f9b	Bump version to v0.8.20260109	2026-01-09 16:55:37 +03:00
remittor	9ead0e1d30	build: Rewrite build script (using OpenWrt SDK from github)	2026-01-09 16:55:24 +03:00
remittor	b37b35db80	updater: Add support install packages on clean OpenWrt Example: ./update-pkg.sh -u 1 Example: ./update-pkg.sh -u 2	2026-01-08 18:33:51 +03:00
remittor	9737a10e1f	Bump version to v0.8.20260107	2026-01-07 23:08:59 +03:00
remittor	bc1af90349	Integrate mdig and ip2net to main package	2026-01-01 20:59:37 +03:00
remittor	11f632259e	Remove mdig and ip2net packages	2026-01-01 12:30:10 +03:00
remittor	a215600415	Bump version to v0.8.20251230	2025-12-30 13:38:10 +03:00
remittor	28e6c466cb	updater: Change get_actual_release error 1 to 150	2025-12-30 13:36:13 +03:00
remittor	c72921f2fa	zapret: Global use of dynamic variables	2025-12-29 21:10:58 +03:00
remittor	55041b3b16	luci: updater: Skip error -32000	2025-12-29 19:36:59 +03:00
remittor	bf012b36bf	updater: Fix get_pkg_version for OpenWrt 25	2025-12-29 18:33:58 +03:00
remittor	9717bc8ff7	Bump version to v0.8.20251229	2025-12-29 18:16:24 +03:00
remittor	61e234ab12	build: Rename base directories	2025-12-28 20:17:33 +03:00
remittor	c11ca1ca2e	Rename all directories	2025-12-28 20:15:29 +03:00
remittor	dd35b5d50a	Bump version to v0.7.20251227	2025-12-27 13:18:59 +03:00
remittor	072b742a13	luci: tools: Fix modal dialog for NFQWS2_OPT	2025-12-27 10:47:53 +03:00
remittor	487d92bda2	updater: Fix files renaming	2025-12-26 15:44:11 +03:00
remittor	71eccc6057	Bump version to v0.7.20251226	2025-12-26 09:00:21 +03:00
remittor	5f92425261	luci: Rename handleSave to handleSaveAdv	2025-12-26 08:58:30 +03:00
remittor	950672426c	updater: Update func download_releases_info	2025-12-26 08:56:45 +03:00
remittor	d0c49a8e6f	def-cfg: Add new strategy v2_by_Schiz23	2025-12-26 08:03:58 +03:00
remittor	2da0526472	Bump version to v0.7.20251225-r2	2025-12-25 18:06:29 +03:00
remittor	c9823adaae	luci: tools: Fix show and close modal dialog for NFQWS_OPT	2025-12-25 18:01:29 +03:00
remittor	d14f26a8cb	updater: Fix find base package after ZIP unpack	2025-12-25 14:54:49 +03:00
remittor	ecf49f1be8	Bump version to v0.7.20251225	2025-12-25 09:01:37 +03:00
remittor	3ef469b416	fake: Add TLS 1.3 hello from max.ru	2025-12-25 08:25:52 +03:00
remittor	88665d417a	luci: tools: Fix close modal dialog for NFQWS2_OPT	2025-12-24 18:49:41 +03:00
remittor	35fb6e9a43	luci: updater: Fix timer using	2025-12-24 14:38:07 +03:00
remittor	9c7f906b72	Bump version to v0.7.20251224	2025-12-24 10:30:59 +03:00
remittor	bd3d224178	def-cfg: Add new strategy v1_by_Schiz23	2025-12-24 10:27:40 +03:00
remittor	fcf7889a93	luci: tools: Fix close modal dialog for NFQWS_OPT	2025-12-23 14:15:22 +03:00
remittor	76dcf0638d	luci: dmnlog: Fix load tools.js	2025-12-20 14:16:47 +03:00
remittor	d20c81b1c1	Bump version to v0.7.20251220	2025-12-20 10:43:48 +03:00
remittor	ea2a39877d	Makefile: Fix build with LUA Source: https://github.com/spvkgn/zapret2-openwrt/blob/main/package/nfqws2/Makefile	2025-12-20 10:24:43 +03:00
remittor	85b7f91767	comfunc: Fix remove debug log	2025-12-20 10:12:25 +03:00
remittor	7cd7293424	luci: settings: Fix NFQWS2_PORTS_UDP_KEEPALIVE	2025-12-20 10:12:14 +03:00
remittor	116ce93c63	Bump version to v0.7.20251219	2025-12-19 17:23:10 +03:00
remittor	4f586e66b0	build: Delete riscv64 arch	2025-12-19 17:22:53 +03:00
remittor	3e19c9c9e2	luci: Fix for show menu Zapret2	2025-12-19 14:23:11 +03:00
remittor	980dd77ba1	def-cfg: Fix DAEMON_LOG_FILE value	2025-12-19 13:58:38 +03:00
remittor	aaef886826	updater: Add check for unzip installed	2025-12-19 11:12:27 +03:00
remittor	c8558cf6c1	updater: Adapt code for new version format	2025-12-19 10:44:49 +03:00
remittor	c6e2e79683	updater: Fix parsing package version (APK)	2025-12-19 10:23:52 +03:00
remittor	08e6776a81	zapret: Add depends from luajit	2025-12-18 18:11:45 +03:00
remittor	509b834729	zapret: Makefile: Fix Package-install section	2025-12-18 17:43:49 +03:00
remittor	003160cb05	build: Fix compile packages	2025-12-18 17:22:18 +03:00
remittor	682d153742	zapret: Add depends from liblua	2025-12-18 17:02:33 +03:00
remittor	e2810bbe98	build: Fix detection tag-version	2025-12-18 16:49:04 +03:00
remittor	7aecaa4ab7	config: Add new options for AutoHostList	2025-12-18 16:42:41 +03:00
remittor	03e8513703	luci: Rename files: zapret -> zapret2	2025-12-18 16:38:57 +03:00
remittor	7a4825a708	Add support Zapret2 Sources: https://github.com/bol-van/zapret2	2025-12-18 16:35:13 +03:00