Bump version to v72.20260111

build: Fix matrix for riscv64 arch
Add diagnostic button (DPI checker)
2026-01-27 12:50:35 +03:00 · 2026-01-11 13:39:18 +03:00 · 2026-01-11 13:39:01 +03:00 · 2026-01-11 11:56:22 +03:00 · 2026-01-11 10:20:27 +03:00 · 2026-01-10 20:54:11 +03:00
46 changed files with 1949 additions and 930 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report_en.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report_en.yml
@@ -0,0 +1,80 @@
+---
+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
@@ -0,0 +1,80 @@
+---
+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
@@ -0,0 +1,9 @@
+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
@@ -0,0 +1,66 @@
+---
+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
@@ -0,0 +1,68 @@
+---
+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
@@ -0,0 +1,78 @@
+---
+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
@@ -0,0 +1,78 @@
+---
+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,6 +155,8 @@ 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' }}
@@ -163,6 +165,10 @@ 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 }}
@@ -284,9 +290,9 @@ jobs:
        env:
          ARCH_TAG: ${{ matrix.arch }}
        run: |
-          PKGLIST="package/zapret-openwrt/zapret2/compile"
+          PKGLIST="package/zapret-openwrt/zapret/compile"
          if [ "$ARCH_TAG" = "$LUCI_ARCH" ]; then
-              PKGLIST="$PKGLIST package/zapret-openwrt/luci-app-zapret2/compile"
+              PKGLIST="$PKGLIST package/zapret-openwrt/luci-app-zapret/compile"
          fi
          MAKE_JOBS=$(nproc)
          echo "$MAKE_JOBS thread compile"
@@ -306,8 +312,8 @@ jobs:
        run: |
          OUT_DIR=./bin/packages/dev_x/base
          mkdir -p $OUT_DIR
-          touch $OUT_DIR/zapret2_$PKGVER-$ARCH_TAG.$PKGTYPE
-          touch $OUT_DIR/luci-app-zapret2_$PKGVER-all.$PKGTYPE
+          touch $OUT_DIR/zapret_$PKGVER-$ARCH_TAG.$PKGTYPE
+          touch $OUT_DIR/luci-app-zapret_$PKGVER-all.$PKGTYPE
          echo "status=success" >> $GITHUB_OUTPUT

      - name: Install packages
@@ -318,7 +324,7 @@ jobs:
          ARCH_TAG: ${{ matrix.arch }}
          SIGN_KEY: ${{ secrets.SIGN_PRIVATE_KEY }}
        run: |
-          find ./bin/packages/*/base -type f ! -regex ".*\(zapret2\).*\.[ai]pk$" -delete
+          find ./bin/packages/*/base -type f ! -regex ".*\(zapret\).*\.[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
@@ -384,7 +390,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/zapret2_v${PKGVER}_$(basename "{}" | cut -d, -f3).zip {}/*' \;
+          find ./sorted -mindepth 1 -maxdepth 1 -type d -exec sh -c '7z a ./public/zapret_v${PKGVER}_$(basename "{}" | cut -d, -f3).zip {}/*' \;
          ls -lh ./public/*.zip

      - name: Upload assets
@@ -396,7 +402,7 @@ jobs:
          draft: ${{ env.TEST_BUILD == 'true' || env.FAKE_BUILD == 'true' }}
          prerelease: true
          tag_name: v${{ needs.build.outputs.pkgver }}${{ env.TAG_SUFFIX }}
-          name: zapret2 v${{ needs.build.outputs.pkgver }}
+          name: zapret v${{ needs.build.outputs.pkgver }}
          body: |
-            zapret2 v${{ needs.build.outputs.pkgver }} for OpenWrt
+            zapret v${{ needs.build.outputs.pkgver }} for OpenWrt
          files: ./public/*.zip
--- a/README.md
+++ b/README.md
@@ -2,13 +2,12 @@
 [![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

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

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

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

--- a/luci-app-zapret2/Makefile
+++ b/luci-app-zapret2/Makefile
@@ -4,14 +4,14 @@

 include $(TOPDIR)/rules.mk

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

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

 define Package/$(PKG_NAME)/postinst
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/diagnost.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/diagnost.js
@@ -0,0 +1,97 @@
+'use strict';
+'require baseclass';
+'require fs';
+'require poll';
+'require uci';
+'require ui';
+'require view';
+'require view.zapret2.tools as tools';
+
+const btn_style_neutral  = 'btn';
+const btn_style_action   = 'btn cbi-button-action';
+const btn_style_positive = 'btn cbi-button-save important';
+const btn_style_negative = 'btn cbi-button-reset important';
+const btn_style_warning  = 'btn cbi-button-negative';
+const btn_style_success  = 'btn cbi-button-success important';
+
+const fn_dwc_sh   = '/opt/'+tools.appName+'/dwc.sh';
+
+return baseclass.extend({
+    appendLog: function(msg, end = '\n')
+    {
+        this.logArea.value += msg + end;
+        this.logArea.scrollTop = this.logArea.scrollHeight;
+    },
+
+    dpiCheck: async function()
+    {
+        this._action = 'dpiCheck';
+        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/');
+        let cmd = [ fn_dwc_sh ];
+        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 });
+    },
+
+    execAndReadCallback: function(wnd, rc, txt = '')
+    {
+        if (rc == 0 && txt) {
+            if (wnd._action == 'dpiCheck') {
+                wnd.appendLog('=========================================================');
+                return;
+            }
+        }
+        if (rc >= 500) {
+            if (txt) {
+                wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
+            } else {
+                wnd.appendLog('ERROR: ' + wnd._action + ': Terminated with error code = ' + rc);
+            }
+        } else {
+            wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
+        }
+        wnd.setStage(999);
+        wnd.appendLog('=========================================================');
+    },
+
+    openDiagnostDialog: function(pkg_arch)
+    {
+        this.pkg_arch = pkg_arch;
+
+        this.logArea = E('textarea', {
+            'id': 'widget.modal_content',
+            'readonly': true,
+            'style': 'width:100% !important; font-family: monospace;',
+            'rows': 26,
+            'wrap': 'off',
+        });
+
+        this.btn_cancel = E('button', {
+            'id': 'btn_cancel',
+            'name': 'btn_cancel',
+            'class': btn_style_warning,
+        }, _('Cancel'));
+        this.btn_cancel.onclick = ui.hideModal;
+
+        this.btn_dpicheck = E('button', {
+            'id': 'btn_dpicheck',
+            'name': 'btn_dpicheck',
+            'class': btn_style_action,
+        }, _('DPI check [tcp 16-20]'));
+        this.btn_dpicheck.onclick = ui.createHandlerFn(this, () => { this.dpiCheck() });
+        
+        ui.showModal(_('Diagnostics'), [
+            E('div', { 'class': 'cbi-section' }, [
+                this.logArea,
+            ]),
+            E('div', { 'class': 'right' }, [
+                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,13 +5,13 @@
 'require poll';
 'require uci';
 'require ui';
-'require view.zapret2.tools as tools';
+'require view.zapret.tools as tools';

 return view.extend({
    retrieveLog: async function() {
        return Promise.all([
            L.resolveDefault(fs.stat('/bin/cat'), null),
-            fs.exec('/usr/bin/find', [ '/tmp', '-maxdepth', '1', '-type', 'f', '-name', 'zapret2+*.log' ]),
+            fs.exec('/usr/bin/find', [ '/tmp', '-maxdepth', '1', '-type', 'f', '-name', tools.appName+'+*.log' ]),
            uci.load(tools.appName),
        ]).then(function(status_array) {
            var filereader = status_array[0] ? status_array[0].path : null;
@@ -64,7 +64,7 @@ return view.extend({
            }).catch(function(e) {
                ui.addNotification(null, E('p', _('Unable to execute or read contents')
                    + ': %s [ %s | %s | %s ]'.format(
-                        e.message, 'retrieveLogData', 'uci.zapret'
+                        e.message, 'retrieveLogData', 'uci.'+tools.appName
                )));
                return null;
            });
@@ -72,7 +72,7 @@ return view.extend({
            const [, lineno, colno] = e.stack.match(/(\d+):(\d+)/);
            ui.addNotification(null, E('p', _('Unable to execute or read contents')
                + ': %s [ lineno: %s | %s | %s | %s ]'.format(
-                    e.message, lineno, 'retrieveLog', 'uci.zapret'
+                    e.message, lineno, 'retrieveLog', 'uci.'+tools.appName
            )));
            return null;
        });
@@ -90,21 +90,21 @@ return view.extend({
                logdate_len = (Array.isArray(logdata)) ? logdata.length : -1;
            }
            let elem_name = elem.getAttribute("name");
-            let founded = false;
+            let found = false;
            if (logdate_len > 0) {
                for (let log_num = 0; log_num < logdate_len; log_num++) {
                    if (logdata[log_num].filename == elem_name) {
                        if (logdata[log_num].data) {
                            elem.value = logdata[log_num].data;
                            elem.rows  = logdata[log_num].rows;
-                            founded = true;
+                            found = true;
                            //console.log('POLL: updated ' + elem_name);
                        }
                        break;
                    }
                }
            }
-            if (!founded) {
+            if (!found) {
                elem.value = '';
                elem.rows  = 0;
            }
@@ -130,7 +130,7 @@ return view.extend({
            return;
        }
        var h2 = E('div', {'class' : 'cbi-title-section'}, [
-            E('h2', {'class': 'cbi-title-field'}, [ _('Zapret2') + ' - ' + _('Log Viewer') ]),
+            E('h2', {'class': 'cbi-title-field'}, [ tools.AppName + ' - ' + _('Log Viewer') ]),
        ]);

        var tabs = E('div', {}, E('div'));
@@ -140,7 +140,11 @@ return view.extend({
            var logfn = logdata[log_num].filename;
            let filename = logfn.replace(/.*\//, '');
            let fname = filename.split('.')[0];
-            fname = fname.replace(/^(zapret2\+)/, '');
+            if (tools.appName == 'zapret2') {
+                fname = fname.replace(/^(zapret2\+)/, '');
+            } else {
+                fname = fname.replace(/^(zapret\+)/, '');
+            }
            let fn = fname.split('+');
            
            let tabNameText = fname.replace(/\+/g, ' ');
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/env.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/env.js
@@ -0,0 +1,53 @@
+'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+'*' ];
+        }
+    }
+});
--- 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,8 +4,9 @@
 'require uci';
 'require ui';
 'require view';
-'require view.zapret2.tools as tools';
-'require view.zapret2.updater as updater';
+'require view.zapret.tools as tools';
+'require view.zapret.diagnost as diagnost';
+'require view.zapret.updater as updater';

 const btn_style_neutral  = 'btn';
 const btn_style_action   = 'btn cbi-button-action';
@@ -23,6 +24,7 @@ return view.extend({
            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'),
        };
    },
@@ -55,7 +57,7 @@ return view.extend({
        ]).catch(e => {
            ui.addNotification(null, E('p', _('Unable to execute or read contents')
                + ': %s [ %s | %s | %s ]'.format(
-                    e.message, tools.execPath, 'tools.getInitState', 'uci.zapret2'
+                    e.message, tools.execPath, 'tools.getInitState', 'uci.'+tools.appName
            )));
        });
    },
@@ -248,9 +250,10 @@ return view.extend({
            let strat = '' + this.nfqws_strat_list[id];
            strat_list.push( E('option', { value: 'strat_' + id }, [ strat ] ) );
        }
+        let label_nfqws = (tools.appName == 'zapret2') ? _('NFQWS2_OPT strategy: ') : _('NFQWS_OPT strategy: ');
        let nfqws_strat = E('label', [
-            _('NFQWS2_OPT strategy: '),
-            E('select', { id: 'cfg_nfqws2_strat' }, strat_list)
+            label_nfqws,
+            E('select', { id: 'cfg_nfqws_strat' }, strat_list)
        ]);

        let cancel_button = E('button', {
@@ -274,7 +277,7 @@ return view.extend({
                opt_flags += '(set_mode_autohostlist)';
            };
            //console.log('RESET: opt_flags = ' + opt_flags);
-            let sel_strat = document.getElementById('cfg_nfqws2_strat');
+            let sel_strat = document.getElementById('cfg_nfqws_strat');
            let opt_strat = sel_strat.options[sel_strat.selectedIndex].text;
            //console.log('RESET: strat = ' + opt_strat);
            opt_flags += '(sync)';
@@ -381,6 +384,10 @@ return view.extend({
        btn_reset.onclick   = L.bind(this.dialogResetCfg, this);
        layout_append(_('Reset settings to default'), null, [ btn_reset ] );

+        let btn_diag        = create_btn('btn_diag',  btn_style_action, _('Diagnostics'));
+        btn_diag.onclick    = ui.createHandlerFn(this, () => { diagnost.openDiagnostDialog(this.pkg_arch) });
+        layout_append('', null, [ btn_diag ] );
+
        let btn_update      = create_btn('btn_update',  btn_style_action, _('Update'));
        btn_update.onclick  = ui.createHandlerFn(this, () => { updater.openUpdateDialog(this.pkg_arch) });
        layout_append(_('Update package'), null, [ btn_update ] );
@@ -393,29 +400,30 @@ return view.extend({
            "btn_restart": btn_restart,
            "btn_stop": btn_stop,
            "btn_reset": btn_reset,
+            "btn_diag": btn_diag,
            "btn_update": btn_update,
        };
        this.setAppStatus(status_array, elems);

        poll.add(L.bind(this.statusPoll, this));

-        let page_title = _('Zapret2');
+        let page_title = tools.AppName;
        let pkgdict = tools.decode_pkg_list(pkg_list.stdout, false);
        page_title += ' &nbsp ';
-        if (pkgdict['zapret2'] === undefined || pkgdict['zapret2'] == '') {
+        if (pkgdict[tools.appName] === undefined || pkgdict[tools.appName] == '') {
            page_title += 'unknown version';
        } else {
-            page_title += 'v' + pkgdict['zapret2'];
+            page_title += 'v' + pkgdict[tools.appName];
        }
        let aux1 = E('em');
        let aux2 = E('em');
-        if (pkgdict['zapret2'] != pkgdict['luci-app-zapret2']) {
-            let errtxt = 'LuCI APP v' + pkgdict['luci-app-zapret2'] + ' [ incorrect version! ]';
+        if (pkgdict[tools.appName] != pkgdict['luci-app-'+tools.appName]) {
+            let errtxt = 'LuCI APP v' + pkgdict['luci-app-'+tools.appName] + ' [ incorrect version! ]';
            aux1 = E('div', { 'class': 'label-status error' }, errtxt);
            aux2 = E('div', { }, '&nbsp');
        }
        
-        let url1 = 'https://github.com/bol-van/zapret2';
+        let url1 = 'https://github.com/bol-van/'+tools.appName;
        let url2 = 'https://github.com/remittor/zapret-openwrt';

        return E([
--- 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,7 +5,7 @@
 'require uci';
 'require ui';
 'require view';
-'require view.zapret2.tools as tools';
+'require view.zapret.tools as tools';

 return view.extend({
    parsers: { },
@@ -48,7 +48,7 @@ return view.extend({

        let m, s, o, tabname;

-        m = new form.Map(tools.appName, _('Zapret2') + ' - ' + _('Settings'));
+        m = new form.Map(tools.appName, tools.AppName + ' - ' + _('Settings'));

        s = m.section(form.NamedSection, 'config');
        s.anonymous = true;
@@ -106,8 +106,12 @@ return view.extend({

        /* NFQWS_OPT_DESYNC tab */

-        tabname = 'nfqws2_params';
-        s.tab(tabname, _('NFQWS2 options'));
+        tabname = 'nfqws_params';
+        if (tools.appName == 'zapret2') {
+            s.tab(tabname, _('NFQWS2 options'));
+        } else {
+            s.tab(tabname, _('NFQWS options'));
+        }

        let add_delim = function(sec, url = null) {
            let o = sec.taboption(tabname, form.DummyValue, '_hr');
@@ -154,7 +158,11 @@ return view.extend({
            btn.onclick = () => new tools.longstrEditDialog('config', param, param, desc, rows, multiline).show();
        };

-        o = s.taboption(tabname, form.Flag, 'NFQWS2_ENABLE', _('NFQWS2_ENABLE'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Flag, 'NFQWS2_ENABLE', _('NFQWS2_ENABLE'));
+        } else {
+            o = s.taboption(tabname, form.Flag, 'NFQWS_ENABLE', _('NFQWS_ENABLE'));
+        }
        o.rmempty = false;
        o.default = 1;

@@ -173,41 +181,77 @@ return view.extend({
        o.validate = function(section_id, value) { return true; };
        o.write = function(section_id, value) { return form.Value.prototype.write.call(this, section_id, (value == null || value.trim() == '') ? "\t" : value.trim()); };
        
-        o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_TCP', _('NFQWS2_PORTS_TCP'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_TCP', _('NFQWS2_PORTS_TCP'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_TCP', _('NFQWS_PORTS_TCP'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_UDP', _('NFQWS2_PORTS_UDP'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_UDP', _('NFQWS2_PORTS_UDP'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_UDP', _('NFQWS_PORTS_UDP'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS2_TCP_PKT_OUT', _('NFQWS2_TCP_PKT_OUT'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_TCP_PKT_OUT', _('NFQWS2_TCP_PKT_OUT'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_TCP_PKT_OUT', _('NFQWS_TCP_PKT_OUT'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS2_TCP_PKT_IN', _('NFQWS2_TCP_PKT_IN'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_TCP_PKT_IN', _('NFQWS2_TCP_PKT_IN'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_TCP_PKT_IN', _('NFQWS_TCP_PKT_IN'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS2_UDP_PKT_OUT', _('NFQWS2_UDP_PKT_OUT'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_UDP_PKT_OUT', _('NFQWS2_UDP_PKT_OUT'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_UDP_PKT_OUT', _('NFQWS_UDP_PKT_OUT'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS2_UDP_PKT_IN', _('NFQWS2_UDP_PKT_IN'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_UDP_PKT_IN', _('NFQWS2_UDP_PKT_IN'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_UDP_PKT_IN', _('NFQWS_UDP_PKT_IN'));
+        }
        o.rmempty     = false;
        o.datatype    = 'string';

-        o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_TCP_KEEPALIVE', _('NFQWS2_PORTS_TCP_KEEPALIVE'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_TCP_KEEPALIVE', _('NFQWS2_PORTS_TCP_KEEPALIVE'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_TCP_KEEPALIVE', _('NFQWS_PORTS_TCP_KEEPALIVE'));
+        }
        o.rmempty     = false;
        o.datatype    = 'uinteger';

-        o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_UDP_KEEPALIVE', _('NFQWS2_PORTS_UDP_KEEPALIVE'));
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'NFQWS2_PORTS_UDP_KEEPALIVE', _('NFQWS2_PORTS_UDP_KEEPALIVE'));
+        } else {
+            o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_UDP_KEEPALIVE', _('NFQWS_PORTS_UDP_KEEPALIVE'));
+        }
        o.rmempty     = false;
        o.datatype    = 'uinteger';

        add_delim(s, tools.nfqws_opt_url);
-        add_param(s, 'NFQWS2_OPT', null, 21, 2);
-
+        if (tools.appName == 'zapret2') {
+            add_param(s, 'NFQWS2_OPT', null, 21, 2);
+        } else {
+            add_param(s, 'NFQWS_OPT', null, 21, 2);
+        }
+        
        /* AutoHostList settings */

        tabname = 'autohostlist_tab'; 
@@ -227,13 +271,15 @@ return view.extend({
            return uci.set(tools.appName, section_id, 'MODE_FILTER', value === '1' ? 'autohostlist' : 'hostlist');
        };

-        o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_INCOMING_MAXSEQ', _('INCOMING_MAXSEQ'));
-        o.rmempty     = false;
-        o.datatype    = 'uinteger';
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_INCOMING_MAXSEQ', _('INCOMING_MAXSEQ'));
+            o.rmempty     = false;
+            o.datatype    = 'uinteger';

-        o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_MAXSEQ', _('RETRANS_MAXSEQ'));
-        o.rmempty     = false;
-        o.datatype    = 'uinteger';
+            o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_MAXSEQ', _('RETRANS_MAXSEQ'));
+            o.rmempty     = false;
+            o.datatype    = 'uinteger';
+        }
        
        o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_THRESHOLD', _('RETRANS_THRESHOLD'));
        o.rmempty     = false;
@@ -247,13 +293,15 @@ return view.extend({
        o.rmempty     = false;
        o.datatype    = 'uinteger';

-        o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_UDP_IN', _('UDP_IN'));
-        o.rmempty     = false;
-        o.datatype    = 'uinteger';
+        if (tools.appName == 'zapret2') {
+            o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_UDP_IN', _('UDP_IN'));
+            o.rmempty     = false;
+            o.datatype    = 'uinteger';

-        o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_UDP_OUT', _('UDP_OUT'));
-        o.rmempty     = false;
-        o.datatype    = 'uinteger';
+            o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_UDP_OUT', _('UDP_OUT'));
+            o.rmempty     = false;
+            o.datatype    = 'uinteger';
+        }

        o = s.taboption(tabname, form.Button, '_auto_host_btn', _('Auto host list entries'));
        o.inputtitle = _('Edit');
--- 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,6 +4,7 @@
 'require rpc';
 'require ui';
 'require uci';
+'require view.zapret.env as env_tools';

 document.head.append(E('style', {'type': 'text/css'},
 `
@@ -35,32 +36,11 @@ document.head.append(E('style', {'type': 'text/css'},
 `));

 return baseclass.extend({
-    packager          : null,
-    appName           : 'zapret2',
-    execPath          : '/etc/init.d/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',
+    __init__() {
+        env_tools.load_env(this);
+        //console.log('appName: ' + this.appName);
+        //console.log('PACKAGER: ' + this.packager.name);
+    }, 

    infoLabelRunning  : '<span class="label-status running">'  + _('Running')  + '</span>',
    infoLabelStarting : '<span class="label-status starting">' + _('Starting') + '</span>',
@@ -99,24 +79,7 @@ return baseclass.extend({
        expect: { result: false }
    }),

-    init_consts: function() {
-        if (!this.packager) {
-            this.packager = { };
-            if (L.hasSystemFeature('apk')) {
-                this.packager.name = 'apk';
-                this.packager.path = '/usr/bin/apk';
-                this.packager.args = [ 'list', '-I', '*zapret2*' ];
-            } else {
-                this.packager.name = 'opkg';
-                this.packager.path = '/bin/opkg';
-                this.packager.args = [ 'list-installed', '*zapret2*' ];
-            }
-            //console.log('PACKAGER: ' + this.packager.name);
-        }
-    },
-
    getSvcInfo: function(svc_name = null) {
-        this.init_consts();
        let name = (svc_name) ? svc_name : this.appName;
        let verbose = 1;
        return this.callServiceList(name, verbose).then(res => {
@@ -127,7 +90,6 @@ return baseclass.extend({
    },

    getInitState: function(name) {
-        this.init_consts();
        return this.callInitState(name).then(res => {
            if (res) {
                return res[name].enabled ? true : false;
@@ -140,7 +102,6 @@ return baseclass.extend({
    },

    getStratList: function() {
-        this.init_consts();
        let exec_cmd = '/bin/busybox';
        let exec_arg = [ 'awk', '-F', '"', '/if \\[ "\\$strat" = "/ {print $4}', this.defCfgPath ];
        return fs.exec(exec_cmd, exec_arg).then(res => {
@@ -270,9 +231,9 @@ return baseclass.extend({
            return -4;
        }
        let jdata = svc_info;
-        if (typeof(jdata.zapret2) == 'object') {
+        if (typeof(jdata[this.appName]) == 'object') {
            result.dmn.inited = true;
-            let dmn_list = jdata.zapret2.instances;
+            let dmn_list = jdata[this.appName].instances;
            if (typeof(dmn_list) == 'object') {
                for (const [dmn_name, daemon] of Object.entries(dmn_list)) {
                    result.dmn.total += 1;
@@ -466,10 +427,11 @@ return baseclass.extend({
            this.desc        = desc;
            this.rows        = rows;
            this.multiline   = multiline;
+            env_tools.load_env(this);
        },

        load: function() {
-            let value = uci.get('zapret2', this.cfgsec, this.cfgparam);
+            let value = uci.get(this.appName, this.cfgsec, this.cfgparam);
            if (typeof(value) === 'string') {
                value = value.trim();
                if (this.multiline == 2) {
@@ -498,7 +460,7 @@ return baseclass.extend({
                                'class': 'cbi-input-textarea',
                                'style': 'width:100% !important',
                                'rows': this.rows,
-                                'wrap': 'on',
+                                'wrap': 'off',
                                'spellcheck': 'false',
                            },
                            content)
@@ -544,31 +506,29 @@ return baseclass.extend({
            value = value.replace(/˂/g, '<');
            value = value.replace(/˃/g, '>');
            try {
-                let elem2 = null;
-                let elem = document.getElementById("cbi-zapret-" + this.cfgsec + "-_" + this.cfgparam);
+                let elem = document.getElementById("cbi-" + this.appName + "-" + this.cfgsec + "-_" + this.cfgparam);
                if (elem) {
-                    if (!elem2) {
-                        elem2 = elem.querySelector('div');
-                    }
-                    if (!elem2) {
-                        elem2 = elem.querySelector('output');
+                    if (elem.querySelector('div')) {
+                        elem = elem.querySelector('div');
+                    } else {
+                        elem = elem.querySelector('output');
                    }
                }
-                if (elem2) {
+                if (elem) {
                    let val = value.trim();
                    if (this.multiline) {
                        val = val.replace(/</g, '˂');
                        val = val.replace(/>/g, '˃');
                        val = val.replace(/\n/g, '<br/>');
-                        elem2.innerHTML = val;
+                        elem.innerHTML = val;
                    } else {
-                        elem2.textContent = val;
+                        elem.textContent = val;
                    }
                }
            } catch(e) {
-                console.error('ERROR: cannot found elem for ' + this.cfgparam);
+                console.error('ERROR: cannot found elem for ' + this.cfgsec + '.' + this.cfgparam);
            }
-            uci.set('zapret2', this.cfgsec, this.cfgparam, value);
+            uci.set(this.appName, this.cfgsec, this.cfgparam, value);
            uci.save().then(ui.hideModal);
        },

@@ -602,4 +562,93 @@ return baseclass.extend({
        },
    }),

+    execAndRead: async function({ cmd = [ ], log = '', logArea = null, callback = null, cbarg = null, hiderow = [ ], rpc_timeout = 5, rpc_root = false } = {})
+    {
+        function appendLog(msg, end = '\n')
+        {
+            logArea.value += msg + end;
+            logArea.scrollTop = logArea.scrollHeight;
+        }
+        function fixLogEnd()
+        {
+            if (logArea.value && logArea.value.slice(-1) != '\n') {
+                appendLog('');
+            }
+        }
+        let hide_rows = Array.isArray(hiderow) ? hiderow : [ hiderow ];
+        let rpc_opt = { "timeout": rpc_timeout*1000 };
+        if (rpc_root) {
+            rpc_opt.uid = 0;  // run under root
+        }
+        const logFile = log;  // file for reading: '/tmp/zapret_pkg_install.log'
+        const rcFile = logFile + '.rc';
+        try {
+            await fs.exec('/bin/busybox', [ 'rm', '-f', logFile + '*' ], null, rpc_opt);
+            appendLog('Output file cleared!');
+        } catch (e) {
+            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(cbarg, 525, 'ERROR: cannot run "' + cmd[0] + '" script! (error = ' + res.code + ')');
+            }
+            appendLog('Process started...');
+        } catch (e) {
+            return callback(cbarg, 520, 'ERROR: Failed on execute process: ' + e.message);
+        }
+        let lastLen = 0;
+        let retCode = -1;
+        let timerBusy = false;
+        let timer = setInterval(async () => {
+            if (timerBusy)
+                return;  // skip iteration
+            timerBusy = true;
+            try {
+                let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
+                if (res.stdout && res.stdout.length > lastLen) {
+                    let log = res.stdout.slice(lastLen);
+                    hide_rows.forEach(re => {
+                        log = log.replace(re, '');
+                    });                    
+                    appendLog(log, '');
+                    lastLen = res.stdout.length;
+                }
+                if (retCode < 0) {
+                    let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
+                    if (rc.code != 0) {
+                        clearInterval(timer);
+                        fixLogEnd();
+                        return callback(cbarg, 545, 'ERROR: cannot read file "' + rcFile + '"');
+                    }
+                    if (rc.stdout) {
+                        retCode = parseInt(rc.stdout.trim(), 10);
+                    }
+                }
+                if (retCode >= 0) {
+                    clearInterval(timer);
+                    fixLogEnd();
+                    if (retCode == 0 && res.stdout) {
+                        return callback(cbarg, 0, res.stdout);
+                    }
+                    return callback(cbarg, retCode, 'ERROR: Process failed with error ' + retCode);
+                }
+            } catch (e) {
+                if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
+                    console.warn('WARN: execAndRead: ' + e.message);
+                    return;  // goto next timer iteration
+                }
+                clearInterval(timer);
+                fixLogEnd();
+                let errtxt = 'ERROR: execAndRead: ' + e.message;
+                errtxt    += 'ERROR: execAndRead: ' + e.stack?.trim().split('\n')[0];
+                return callback(cbarg, 540, errtxt);
+            } finally {
+                timerBusy = false;
+            }
+        }, 500);
+    },
+
 });
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/updater.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/updater.js
@@ -0,0 +1,203 @@
+'use strict';
+'require baseclass';
+'require fs';
+'require poll';
+'require uci';
+'require ui';
+'require view';
+'require view.zapret.tools as tools';
+
+const btn_style_neutral  = 'btn';
+const btn_style_action   = 'btn cbi-button-action';
+const btn_style_positive = 'btn cbi-button-save important';
+const btn_style_negative = 'btn cbi-button-reset important';
+const btn_style_warning  = 'btn cbi-button-negative';
+const btn_style_success  = 'btn cbi-button-success important';
+
+const fn_update_pkg_sh   = '/opt/'+tools.appName+'/update-pkg.sh';
+
+return baseclass.extend({
+    releasesUrlPrefix : 'https://raw.githubusercontent.com/remittor/zapret-openwrt/gh-pages/releases/',
+    
+    appendLog: function(msg, end = '\n')
+    {
+        this.logArea.value += msg + end;
+        this.logArea.scrollTop = this.logArea.scrollHeight;
+    },
+
+    setBtnMode: function(enable)
+    {
+        this.btn_cancel.disabled = enable ? false : true;
+        this.btn_action.disabled = (enable == 2) ? false : true;
+    },
+    
+    setStage: function(stage, btn_flag = true)
+    {
+        if (stage == 0) {
+            this.btn_action.textContent = _('Check for updates');
+            this.btn_action.classList.remove('hidden');
+        } else
+        if (stage == 1) {
+            this.btn_action.textContent = _('Update packages');
+            this.btn_action.classList.remove('hidden');
+        } else {
+            this.btn_action.classList.add('hidden');
+        }
+        if (stage > 1 && typeof(this.btn_action) == 'object') {
+            this.setBtnMode(1);
+        }
+        this.stage = stage;
+    },
+    
+    checkUpdates: async function()
+    {
+        this._action = 'checkUpdates';
+        this.setStage(0);
+        this.setBtnMode(0);
+        this.pkg_url = null;
+        this.appendLog(_('Checking for updates...'));
+        let cmd = [ fn_update_pkg_sh, '-c' ];  // check for updates
+        if (document.getElementById('cfg_exclude_prereleases').checked == false) {
+            cmd.push('-p');  // include prereleases ZIP-files
+        }
+        this.forced_reinstall = document.getElementById('cfg_forced_reinstall').checked;
+        let log = '/tmp/'+tools.appName+'_pkg_check.log';
+        let callback = this.execAndReadCallback;
+        let wnd = this;
+        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, callback: callback, cbarg: wnd });
+    },
+
+    installUpdates: async function()
+    {
+        this._action = 'installUpdates';
+        this.setStage(1);
+        this.setBtnMode(0);
+        if (!this.pkg_url || this.pkg_url.length < 10) {
+            this.appendLog('ERROR: pkg_url = null');
+            this.setStage(999);
+            return;
+        }
+        this.appendLog(_('Install updates...'));
+        let cmd = [ fn_update_pkg_sh, '-u', this.pkg_url ];  // update packages
+        if (document.getElementById('cfg_forced_reinstall').checked == true) {
+            cmd.push('-f');  // forced reinstall if same version
+        }
+        //this._test = 1; cmd.push('-t'); cmd.push('45');  // only for testing
+        let log = '/tmp/'+tools.appName+'_pkg_install.log';
+        let hiderow = /^ \* resolve_conffiles.*(?:\r?\n|$)/gm;
+        let callback = this.execAndReadCallback;
+        let wnd = this;
+        return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, hiderow: hiderow, callback: callback, cbarg: wnd });
+    },
+
+    execAndReadCallback: function(wnd, rc, txt = '')
+    {
+        //console.log('execAndReadCallback = ' + rc + '; _action = ' + wnd._action);
+        if (rc == 0 && txt) {
+            let code = txt.match(/^RESULT:\s*\(([^)]+)\)\s+.+$/m);
+            if (wnd._action == 'checkUpdates') {
+                let pkg_url = txt.match(/^ZAP_PKG_URL\s*=\s*(.+)$/m);
+                if (code && pkg_url) {
+                    wnd.appendLog('=========================================================');
+                    wnd.pkg_url = pkg_url[1];
+                    code = code[1];
+                    if (code == 'E' && !wnd.forced_reinstall) {
+                        wnd.setStage(999);  // install not needed
+                        return;
+                    }
+                    wnd.setStage(1);
+                    wnd.setBtnMode(2);  // enable all buttons
+                    return;  // install allowed
+                }
+            }
+            if (wnd._action == 'installUpdates') {
+                if (wnd._test || (code && code[1] == '+')) {
+                    wnd.stage = 999;
+                    wnd.btn_action.textContent = _('OK');
+                    wnd.btn_action.disabled = false;
+                    wnd.btn_cancel.disabled = true;
+                    return;
+                }
+            }
+        }
+        if (rc >= 500) {
+            if (txt) {
+                wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
+            } else {
+                wnd.appendLog('ERROR: ' + wnd._action + ': Terminated with error code = ' + rc);
+            }
+        } else {
+            wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
+        }
+        wnd.setStage(999);
+        if (wnd._action == 'checkUpdates') {
+            wnd.appendLog('=========================================================');
+        }
+    },
+
+    openUpdateDialog: function(pkg_arch)
+    {
+        this.stage = 0;
+        this.pkg_arch = pkg_arch;
+        this.pkg_url = null;
+
+        let exclude_prereleases = E('label', [
+            E('input', { type: 'checkbox', id: 'cfg_exclude_prereleases', checked: true }),
+            ' ', _('Exclude PreReleases')
+        ]);
+
+        let forced_reinstall = E('label', [
+            E('input', { type: 'checkbox', id: 'cfg_forced_reinstall'}),
+            ' ', _('Forced reinstall packages')
+        ]);
+
+        this.logArea = E('textarea', {
+            'id': 'widget.modal_content',
+            'readonly': true,
+            'style': 'width:100% !important; font-family: monospace;',
+            'rows': 20,
+            'wrap': 'off',
+        });
+
+        this.btn_cancel = E('button', {
+            'id': 'btn_cancel',
+            'name': 'btn_cancel',
+            'class': btn_style_warning,
+        }, _('Cancel'));
+        this.btn_cancel.onclick = ui.hideModal;
+
+        this.btn_action = E('button', {
+            'id': 'btn_action',
+            'name': 'btn_action',
+            'class': btn_style_action,
+        }, 'BUTTON_ACTION');
+        this.btn_action.onclick = ui.createHandlerFn(this, () => {
+            if (this.stage == 0) {
+                return this.checkUpdates();
+            }
+            if (this.stage == 1) {
+                return this.installUpdates();
+            }
+            return ui.hideModal();
+        });
+        
+        this.setStage(0);
+        this.setBtnMode(2);
+
+        ui.showModal(_('Package update'), [
+            E('div', { 'class': 'cbi-section' }, [
+                exclude_prereleases,
+                E('br'), E('br'),
+                forced_reinstall,
+                E('br'), E('br'),
+                E('hr'),
+                this.logArea,
+            ]),
+            E('div', { 'class': 'right' }, [
+                this.btn_cancel,
+                ' ',
+                this.btn_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
@@ -0,0 +1,46 @@
+{
+	"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
@@ -0,0 +1,40 @@
+{
+	"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/htdocs/luci-static/resources/view/zapret2/updater.js
+++ b/luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/updater.js
@@ -1,249 +0,0 @@
-'use strict';
-'require baseclass';
-'require fs';
-'require poll';
-'require uci';
-'require ui';
-'require view';
-'require view.zapret2.tools as tools';
-
-const btn_style_neutral  = 'btn';
-const btn_style_action   = 'btn cbi-button-action';
-const btn_style_positive = 'btn cbi-button-save important';
-const btn_style_negative = 'btn cbi-button-reset important';
-const btn_style_warning  = 'btn cbi-button-negative';
-const btn_style_success  = 'btn cbi-button-success important';
-
-const fn_update_pkg_sh   = '/opt/zapret2/update-pkg.sh';
-
-return baseclass.extend({
-    releasesUrlPrefix : 'https://raw.githubusercontent.com/remittor/zapret-openwrt/gh-pages/releases/',
-    
-    appendLog: function(msg, end = '\n') {
-        this.logArea.value += msg + end;
-        this.logArea.scrollTop = this.logArea.scrollHeight;
-    },
-
-    setBtnMode: function(enable) {
-        this.btn_cancel.disabled = enable ? false : true;
-        this.btn_action.disabled = (enable == 2) ? false : true;
-    },
-    
-    setStage: function(stage, btn_flag = true) {
-        if (stage == 0) {
-            this.btn_action.textContent = _('Check for updates');
-            this.btn_action.classList.remove('hidden');
-        } else
-        if (stage == 1) {
-            this.btn_action.textContent = _('Update packages');
-            this.btn_action.classList.remove('hidden');
-        } else {
-            this.btn_action.classList.add('hidden');
-        }
-        if (stage > 1 && typeof(this.btn_action) == 'object') {
-            this.setBtnMode(1);
-        }
-        this.stage = stage;
-    },
-    
-    checkUpdates: function() {
-        this.setStage(0);
-        this.setBtnMode(0);
-        this.pkg_url = null;
-        this.appendLog(_('Checking for updates...'));
-        let opt_list = [ '-c' ];  // check for updates
-        if (document.getElementById('cfg_exclude_prereleases').checked == false) {
-            opt_list.push('-p');  // include prereleases ZIP-files 
-        }
-        let forced_reinstall = document.getElementById('cfg_forced_reinstall').checked;
-        let rpc_opt = { timeout: 20*1000 }
-        //rpc_opt.uid = 0;  // run under root
-        let res = fs.exec(fn_update_pkg_sh, opt_list, null, rpc_opt).then(res => {
-            let log = res.stdout.trim();
-            this.appendLog(log);
-            let code = log.match(/^RESULT:\s*\(([^)]+)\)\s+.+$/m);
-            let pkg_url = log.match(/^ZAP_PKG_URL\s*=\s*(.+)$/m);
-            if (res.code == 0 && code && pkg_url) {
-                this.pkg_url = pkg_url[1];
-                code = code[1];
-                if (code == 'E' && !forced_reinstall) {
-                    this.setStage(999);
-                    return 0;
-                }
-                this.setStage(1);
-                this.setBtnMode(2);  // enable all buttons
-            } else {
-                if (res.code != 0) {
-                    this.appendLog('ERROR: Check for updates failed with error ' + res.code);
-                }
-                this.setStage(999);
-            }
-            return res.code;
-        }).catch(e => {
-            this.appendLog('ERROR: ' + _('Updates checking failed'));
-            this.appendLog('ERROR: ' + e);
-            this.setStage(999);
-            return 1;
-        }).finally(() => {
-            this.appendLog('=========================================================');
-        });
-    },
-
-    installUpdates: async function() {
-        this.setStage(1);
-        this.setBtnMode(0);
-        if (!this.pkg_url || this.pkg_url.length < 10) {
-            this.appendLog('ERROR: pkg_url = null');
-            this.setStage(999);
-            return 1;
-        }
-        this.appendLog(_('Install updates...'));
-        let opt_list = [ '-u', this.pkg_url ];  // update packages
-        if (document.getElementById('cfg_forced_reinstall').checked == true) {
-            opt_list.push('-f');  // forced reinstall if same version
-        }
-        let rpc_opt = { timeout: 5*1000 }
-        //rpc_opt.uid = 0;  // run under root
-        const logFile = '/tmp/zapret2_pkg_install.log';
-        const rcFile = logFile + '.rc';
-        try {
-            await fs.exec('/bin/busybox', [ 'rm', '-f', logFile + '*' ], null, rpc_opt);
-            this.appendLog('Install log cleared.');
-        } catch (e) {
-            this.appendLog('ERROR: Failed to clear log file');
-            this.setStage(999);
-            return 1;
-        }
-        try {
-            let opt = [ logFile, fn_update_pkg_sh ];
-            //opt.push('-t'); opt.push('0');  // only for testing
-            opt.push(...opt_list);
-            let res = await fs.exec('/opt/zapret2/script-exec.sh', opt, null, rpc_opt);
-            if (res.code == 0) {
-                this.appendLog('Process started...');
-            } else {
-                this.appendLog('ERROR: cannot run ' + fn_update_pkg_sh + ' script! (error = ' + res.code + ')');
-                throw new Error('cannot run script');
-            }
-        } catch (e) {
-            this.appendLog('ERROR: Failed to start process: ' + e.message);
-            this.setStage(999);
-            return 1;
-        }
-        let lastLen = 0;
-        let retCode = -1;
-        let timerBusy = false;
-        let timer = setInterval(async () => {
-            if (timerBusy)
-                return;  // skip iteration
-            timerBusy = true;
-            try {
-                let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
-                if (res.stdout && res.stdout.length > lastLen) {
-                    let log = res.stdout.slice(lastLen);
-                    log = log.replace(/^ \* resolve_conffiles.*(?:\r?\n|$)/gm, '');
-                    this.appendLog(log, '');
-                    lastLen = res.stdout.length;
-                }
-                if (retCode < 0) {
-                    let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
-                    if (rc.code != 0) {
-                        throw new Error('cannot read file "' + rcFile + '"');
-                    }
-                    if (rc.stdout) {
-                        retCode = parseInt(rc.stdout.trim(), 10);
-                    }
-                }
-                if (retCode >= 0) {
-                    clearInterval(timer);
-                    this.appendLog('\n' + 'Process finished.');
-                    if (res.stdout) {
-                        let code = res.stdout.match(/^RESULT:\s*\(([^)]+)\)\s+.+$/m);
-                        if (retCode == 0 && code && code[1] == '+') {
-                            this.stage = 999;
-                            this.btn_action.textContent = _('OK');
-                            this.btn_action.disabled = false;
-                            this.btn_cancel.disabled = true;
-                            return 0;
-                        }
-                    }
-                    this.appendLog('ERROR: Install updates failed with error ' + retCode);
-                    this.setStage(999);
-                }
-            } catch (e) {
-                if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
-                    console.warn('WARN: installUpdates: ' + e.message);
-                    return;  // goto next timer iteration
-                }
-                clearInterval(timer);
-                this.appendLog('ERROR: installUpdates: ' + e.message);
-                this.appendLog('ERROR: installUpdates: ' + e.stack?.trim().split('\n')[0]);
-                this.setStage(999);
-            } finally {
-                timerBusy = false;
-            }
-        }, 500);
-    },
-    
-    openUpdateDialog: function(pkg_arch) {
-        this.stage = 0;
-        this.pkg_arch = pkg_arch;
-        this.pkg_url = null;
-
-        let exclude_prereleases = E('label', [
-            E('input', { type: 'checkbox', id: 'cfg_exclude_prereleases', checked: true }),
-            ' ', _('Exclude PreReleases')
-        ]);
-
-        let forced_reinstall = E('label', [
-            E('input', { type: 'checkbox', id: 'cfg_forced_reinstall'}),
-            ' ', _('Forced reinstall packages')
-        ]);
-
-        this.logArea = E('textarea', {
-            'readonly': true,
-            'style': 'width:100%; height:400px; font-family: monospace;'
-        });
-
-        this.btn_cancel = E('button', {
-            'id': 'btn_cancel',
-            'name': 'btn_cancel',
-            'class': btn_style_warning,
-        }, _('Cancel'));
-        this.btn_cancel.onclick = ui.hideModal;
-
-        this.btn_action = E('button', {
-            'id': 'btn_action',
-            'name': 'btn_action',
-            'class': btn_style_action,
-        }, 'BUTTON_ACTION');
-        this.btn_action.onclick = ui.createHandlerFn(this, () => {
-            if (this.stage == 0) {
-                return this.checkUpdates();
-            }
-            if (this.stage == 1) {
-                return this.installUpdates();
-            }
-            return ui.hideModal();
-        });
-        
-        this.setStage(0);
-        this.setBtnMode(2);
-
-        ui.showModal(_('Package update'), [
-            E('div', { 'class': 'cbi-section' }, [
-                exclude_prereleases,
-                E('br'), E('br'),
-                forced_reinstall,
-                E('br'), E('br'),
-                E('hr'),
-                this.logArea,
-            ]),
-            E('div', { 'class': 'right' }, [
-                this.btn_cancel,
-                ' ',
-                this.btn_action,
-            ])
-        ]);
-    }    
-});
--- 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
@@ -1,41 +0,0 @@
-{
-	"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
@@ -1,40 +0,0 @@
-{
-	"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/Makefile
+++ b/zapret/Makefile
@@ -0,0 +1,242 @@
+#
+# Copyright (c) 2024 remittor
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=zapret
+PKG_VERSION:=72.20260111
+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_PROTO:=git
+PKG_SOURCE_VERSION:=a775aa7aaa4903a8c0870f9c16918e9d19d83772
+PKG_SOURCE_DATE:=2026-01-11
+
+#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_HASH:=skip
+
+include $(INCLUDE_DIR)/package.mk
+
+#TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
+#TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
+
+MAKE_PATH:=nfq
+
+define Package/$(PKG_NAME)
+	SECTION:=net
+	CATEGORY:=Network
+	TITLE:=$(PKG_NAME)
+	SUBMENU:=Zapret
+	URL:=https://github.com/bol-van/zapret
+	DEPENDS:= +nftables +curl +gzip
+	DEPENDS+= +coreutils +coreutils-sort +coreutils-sleep
+	DEPENDS+= +kmod-nft-nat +kmod-nft-offload +kmod-nft-queue
+	DEPENDS+= +libnetfilter-queue +libcap +zlib
+endef
+
+define Build/Prepare
+	$(Build/Prepare/Default)
+	rm -f $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws
+	rm -f $(PKG_BUILD_DIR)/ip2net/ip2net
+	rm -f $(PKG_BUILD_DIR)/mdig/mdig
+endef
+
+#define Build/Configure
+#endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(TARGET_CONFIGURE_OPTS)
+	$(MAKE) -C $(PKG_BUILD_DIR)/ip2net $(TARGET_CONFIGURE_OPTS)
+	$(MAKE) -C $(PKG_BUILD_DIR)/mdig $(TARGET_CONFIGURE_OPTS)
+endef
+
+define Package/$(PKG_NAME)/conffiles
+/etc/config/zapret
+/opt/zapret/config
+/opt/zapret/ipset/
+/opt/zapret/init.d/openwrt/custom.d/
+endef
+
+define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/opt/zapret
+	$(INSTALL_DIR) $(1)/opt/zapret/$(MAKE_PATH)
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws $(1)/opt/zapret/$(MAKE_PATH)/
+	$(INSTALL_DIR) $(1)/opt/zapret/ip2net
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip2net/ip2net $(1)/opt/zapret/ip2net/
+	$(INSTALL_DIR) $(1)/opt/zapret/mdig
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdig/mdig $(1)/opt/zapret/mdig/
+	$(INSTALL_DIR) $(1)/opt/zapret/common
+	$(CP) $(PKG_BUILD_DIR)/common/* $(1)/opt/zapret/common/
+	#$(INSTALL_DIR) $(1)/opt/zapret/docs
+	#$(CP) $(PKG_BUILD_DIR)/docs/* $(1)/opt/zapret/docs/
+	$(INSTALL_DIR) $(1)/opt/zapret/files
+	$(CP) $(PKG_BUILD_DIR)/files/* $(1)/opt/zapret/files/
+	$(CP)                ./files/* $(1)/opt/zapret/files/
+	$(INSTALL_DIR) $(1)/opt/zapret/ipset
+	$(CP) $(PKG_BUILD_DIR)/ipset/* $(1)/opt/zapret/ipset/
+	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/blockcheck.sh  $(1)/opt/zapret/blockcheck.sh
+	#$(INSTALL_DATA) $(PKG_BUILD_DIR)/config.default $(1)/opt/zapret/config.default
+	$(INSTALL_DIR) $(1)/opt/zapret/tmp
+	$(INSTALL_DIR) $(1)/opt/zapret/init.d/openwrt
+	$(CP) $(PKG_BUILD_DIR)/init.d/openwrt/* $(1)/opt/zapret/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_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./init.d.sh $(1)/etc/init.d/zapret
+	$(INSTALL_DATA) ./config.default $(1)/opt/zapret/config.default
+	$(INSTALL_DATA) ./ipset/zapret-hosts-google.txt       $(1)/opt/zapret/ipset/zapret-hosts-google.txt
+	$(INSTALL_DATA) ./ipset/zapret-hosts-user.txt         $(1)/opt/zapret/ipset/zapret-hosts-user.txt
+	$(INSTALL_DATA) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret/ipset/zapret-hosts-user-exclude.txt
+	$(INSTALL_DATA) ./ipset/zapret-ip-exclude.txt         $(1)/opt/zapret/ipset/zapret-ip-exclude.txt
+	$(INSTALL_DIR) $(1)/opt/zapret/ipset_def
+	$(INSTALL_DATA) ./ipset/zapret-hosts-google.txt       $(1)/opt/zapret/ipset_def/zapret-hosts-google.txt
+	$(INSTALL_DATA) ./ipset/zapret-hosts-user.txt         $(1)/opt/zapret/ipset_def/zapret-hosts-user.txt
+	$(INSTALL_DATA) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret/ipset_def/zapret-hosts-user-exclude.txt
+	$(INSTALL_DATA) ./ipset/zapret-ip-exclude.txt         $(1)/opt/zapret/ipset_def/zapret-ip-exclude.txt
+	$(INSTALL_DIR) $(1)/opt/zapret/init.d
+	$(INSTALL_DIR) $(1)/opt/zapret/init.d/openwrt
+	$(INSTALL_DIR) $(1)/opt/zapret/init.d/openwrt/custom.d
+	$(CP) ./custom.d/* $(1)/opt/zapret/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)/opt/zapret/uci-def-cfg.sh
+	$(INSTALL_BIN) ./comfunc.sh         $(1)/opt/zapret/comfunc.sh
+	$(INSTALL_BIN) ./def-cfg.sh         $(1)/opt/zapret/def-cfg.sh
+	$(INSTALL_BIN) ./renew-cfg.sh       $(1)/opt/zapret/renew-cfg.sh
+	$(INSTALL_BIN) ./restore-def-cfg.sh $(1)/opt/zapret/restore-def-cfg.sh
+	$(INSTALL_BIN) ./sync_config.sh     $(1)/opt/zapret/sync_config.sh
+	$(INSTALL_BIN) ./script-exec.sh     $(1)/opt/zapret/script-exec.sh
+	$(INSTALL_BIN) ./update-pkg.sh      $(1)/opt/zapret/update-pkg.sh
+	# Fix permisions
+	chmod 644 $(1)/opt/zapret/ipset/*.txt
+	chmod 644 $(1)/opt/zapret/ipset_def/*.txt
+	chmod 644 $(1)/opt/zapret/init.d/openwrt/custom.d/*.sh
+	chmod 644 $(1)/opt/zapret/config.default
+	chmod 755 $(1)/opt/zapret/*.sh
+	chmod 755 $(1)/opt/zapret/$(MAKE_PATH)/*
+	chmod 755 $(1)/opt/zapret/ip2net/*
+	chmod 755 $(1)/opt/zapret/mdig/*
+endef
+
+define Package/$(PKG_NAME)/preinst
+#!/bin/sh
+# check if we are on real system
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	if [ -f "/etc/init.d/zapret" ]; then
+		SCRIPT=$$( readlink /etc/init.d/zapret )
+		if [ -n "$${SCRIPT}" ]; then
+			echo "Please uninstall original zapret utility!"
+			exit 44
+		fi
+	fi
+	if [ "$${PKG_UPGRADE}" = "1" ]; then
+		# stop service if PKG_UPGRADE
+		if [ -x "/etc/init.d/zapret" ]; then
+			/etc/init.d/zapret running && /etc/init.d/zapret stop >/dev/null 2>&1
+		fi
+	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
+
+define Package/$(PKG_NAME)/postinst
+#!/bin/sh
+# check if we are on real system
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	ZAPRET_CONFIG=/opt/zapret/config
+	ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
+	# 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
+	# check existing uci-config
+	[ -f "/etc/config/zapret" ] && 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"
+	# remove uci-default script from system dir (used into /etc/init.d/boot)
+	rm -f /etc/uci-defaults/zapret-uci-def-cfg.sh
+	# copy (sync) all params from uci-config to main config
+	/opt/zapret/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
+	# enable main service
+	/etc/init.d/zapret enable
+	# stop all
+	/etc/init.d/zapret stop_fw
+	/etc/init.d/zapret stop_daemons
+	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
+	# start main service
+	/etc/init.d/zapret start
+	# restart firewall
+	[ -x /sbin/fw4 ] && fw4 -q restart || fw3 -q restart
+fi
+exit 0
+endef
+
+define Package/$(PKG_NAME)/prerm
+#!/bin/sh
+# check if we are on real system
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	EXEDIR=/opt/zapret
+	ZAPRET_BASE=/opt/zapret
+	ZAPRET_CONFIG=/opt/zapret/config
+	ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
+	OPENWRT_FW_INCLUDE=/etc/firewall.zapret
+	# 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
+		exit 0
+	fi
+	. "$${ZAPRET_CONFIG}"
+	. "$${ZAPRET_BASE}/common/base.sh"
+	. "$${ZAPRET_BASE}/common/fwtype.sh"
+	. "$${ZAPRET_BASE}/common/nft.sh"
+	. "$${ZAPRET_BASE}/common/installer.sh"
+	/etc/init.d/zapret running && /etc/init.d/zapret stop
+	/etc/init.d/zapret disable
+	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
+	remove_openwrt_firewall
+	nft_del_table
+	restart_openwrt_firewall
+fi
+exit 0
+endef
+
+define Package/$(PKG_NAME)/postrm
+#!/bin/sh
+# check if we are on real system
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	[ -f "/etc/config/zapret-opkg" ] && rm -f "/etc/config/zapret-opkg"
+	[ -f "/opt/zapret/config" ] && cp -f /opt/zapret/config "/opt/zapret/config.backup"
+	#rm -rf /opt/zapret
+	#echo "Directory /opt/zapret removed!"
+fi
+exit 0
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- a/zapret2/comfunc.sh
+++ b/zapret2/comfunc.sh
@@ -1,20 +1,20 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor

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

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

-ZAP_LOG_TAG=ZAPRET2
+ZAP_LOG_TAG=ZAPRET

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

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

--- a/zapret2/config.default
+++ b/zapret2/config.default
@@ -30,15 +30,9 @@ 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_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

@@ -69,31 +63,47 @@ DESYNC_MARK_POSTNAT=0x20000000
 FILTER_MARK=""


-NFQWS2_ENABLE=1
+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

 # redirect outgoing traffic with connbytes limiter applied in both directions.
-NFQWS2_PORTS_TCP="80,443"
-NFQWS2_PORTS_UDP="443"
+NFQWS_PORTS_TCP="80,443"
+NFQWS_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.
-NFQWS2_TCP_PKT_OUT="9"
-NFQWS2_TCP_PKT_IN="3"
-NFQWS2_UDP_PKT_OUT="9"
-NFQWS2_UDP_PKT_IN="0"
+NFQWS_TCP_PKT_OUT="9"
+NFQWS_TCP_PKT_IN="3"
+NFQWS_UDP_PKT_OUT="9"
+NFQWS_UDP_PKT_IN="0"

 # 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 !
-NFQWS2_PORTS_TCP_KEEPALIVE=""
-NFQWS2_PORTS_UDP_KEEPALIVE=""
+NFQWS_PORTS_TCP_KEEPALIVE=""
+NFQWS_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
-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"
+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"


 DISABLE_CUSTOM=1
@@ -111,8 +121,9 @@ 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_WAN="eth0 eth1 eth2"
+# it's possible to specify multiple interfaces like this : IFACE_LAN="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"

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

 # firewall apply hooks
-#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"
+#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"

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

 DAEMON_LOG_ENABLE=0

-DAEMON_LOG_FILE="/tmp/zapret2+<DAEMON_NAME>+<DAEMON_IDNUM>+<DAEMON_CFGNAME>.log"
+DAEMON_LOG_FILE="/tmp/zapret+<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:---payload stun --lua-desync=fake:blob=0x00000000000000000000000000000000:repeats=2}"
+NFQWS_OPT_DESYNC_STUN="${NFQWS_OPT_DESYNC_STUN:---dpi-desync=fake --dpi-desync-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/zapret/def-cfg.sh
+++ b/zapret/def-cfg.sh
@@ -0,0 +1,395 @@
+#!/bin/sh
+# Copyright (c) 2024 remittor
+
+function set_cfg_reset_values
+{
+	local cfgname=${1:-$ZAPRET_CFG_NAME}
+	local TAB="$( echo -n -e '\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="$( echo -n -e '\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="$( echo -n -e '\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="
+				# 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="
+				# 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="
+				# 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="
+				# 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="
+				# 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="
+				# 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" = "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="
+				# 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="
+				# 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
+	return 0
+}
--- a/zapret/dwc.sh
+++ b/zapret/dwc.sh
@@ -0,0 +1,118 @@
+#!/bin/sh
+# Copyright (c) 2026 remittor
+
+. /opt/zapret/comfunc.sh
+
+ZAP_TMP_DIR=/tmp/zapret_dwc
+
+rm -rf $ZAP_TMP_DIR
+
+CURL_TIMEOUT=5
+CURL_RANGETO=65535
+
+if ! command -v curl >/dev/null 2>&1; then
+	echo "ERROR: package \"curl\" not installed!"
+	return 10
+fi
+CURL_INFO=$( curl -V )
+if ! echo "$CURL_INFO" | grep -q 'https'; then
+	echo "------- package curl"
+	echo "$CURL_INFO"
+	echo "-------"
+	echo "ERROR: package \"curl\" not supported HTTPS protocol!"
+	echo "NOTE: Please install package \"curl-ssl\""
+	return 11
+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='[
+  { 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" },
+  { id: "US.CF-04", provider: "🇨🇦 Cloudflare", times: 1, url: "https://www.bigcartel.com/" },
+  { id: "US.DO-01", provider: "🇺🇸 DigitalOcean", times: 2, url: "https://genderize.io/" },
+  { 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://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" },
+  { id: "FR.OVH-02", provider: "🇫🇷 OVH", times: 1, url: "https://ovh.sfx.ovh/10M.bin" },
+  { id: "SE.OR-01", provider: "🇸🇪 Oracle", times: 1, url: "https://oracle.sfx.ovh/10M.bin" },
+  { id: "DE.AWS-01", provider: "🇩🇪 AWS", times: 1, url: "https://www.getscope.com/assets/fonts/fa-solid-900.woff2" },
+  { id: "US.AWS-01", provider: "🇺🇸 AWS", times: 1, url: "https://corp.kaltura.com/wp-content/cache/min/1/wp-content/themes/airfleet/dist/styles/theme.css" },
+  { id: "US.GC-01", provider: "🇺🇸 Google Cloud", times: 1, url: "https://api.usercentrics.eu/gvl/v3/en.json" },
+  { id: "US.FST-01", provider: "🇺🇸 Fastly", times: 1, url: "https://www.jetblue.com/main.c7b61d59416f714f.js" },
+  { id: "CA.FST-01", provider: "🇨🇦 Fastly", times: 1, url: "https://www.cnn10.com/" },
+  { id: "US.AKM-01", provider: "🇺🇸 Akamai", times: 1, url: "https://www.roxio.com/static/roxio/images/products/creator/nxt9/call-action-footer-bg.jpg" },
+  { id: "PL.AKM-01", provider: "🇵🇱 Akamai", times: 1, url: "https://media-assets.stryker.com/is/image/stryker/gateway_1?$max_width_1410$" },
+  { id: "US.CDN77-01", provider: "🇺🇸 CDN77", times: 1, url: "https://cdn.eso.org/images/banner1920/eso2520a.jpg" },
+  { 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" }
+]'
+
+function trim
+{
+	echo "$1" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'
+}
+
+mkdir -p $ZAP_TMP_DIR
+
+ID=0
+while IFS='|' read -r TAG PROVIDER TIMES URL; do
+	[ -z "$TAG" ] && continue
+	ID=$((ID+1))
+	ID3=$(printf '%03d' "$ID")
+	COUNTRY="$(echo "$TAG" | cut -d. -f1)"
+	CNTFLAG="$(echo "$PROVIDER" | awk '{print $1}')"
+	PROVIDER="$(echo "$PROVIDER" | cut -d' ' -f2-)"
+	URL_NO_PROTO="${URL#*://}"
+	DOMAIN="${URL_NO_PROTO%%/*}"
+	URLPATH="/${URL_NO_PROTO#*/}"
+	[ "$URLPATH" = "/$URL_NO_PROTO" ] && URLPATH="/"
+	#echo "TAG=$TAG , COUNTRY=$COUNTRY , PROVIDER=$PROVIDER , TIMES=$TIMES , URL=$URL"
+	(
+		DST_IP=$( curl -4 -s -o /dev/null -w '%{remote_ip}\n' $DOMAIN )
+		if [ -z "$DST_IP" ]; then
+			DST_IP="$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p')"
+		fi
+		curl -k $URL --resolve $DOMAIN:443:$DST_IP -o /dev/null -s -w '%{size_download}\n' --max-time $CURL_TIMEOUT --range 0-$CURL_RANGETO
+	) >"$ZAP_TMP_DIR/$ID3.$TAG.txt" 2>&1 &
+done <<EOF
+$(printf '%s\n' "$TEST_SUITE" | sed -n '
+s/.*id:[[:space:]]*"\([^"]*\)".*provider:[[:space:]]*"\([^"]*\)".*times:[[:space:]]*\([0-9]\+\).*url:[[:space:]]*"\([^"]*\)".*/\1|\2|\3|\4/p
+')
+EOF
+
+wait
+
+for file in $(ls "$ZAP_TMP_DIR"/*.txt | sort); do
+	[ -f "$file" ] || continue
+	tag="${file##*/}"
+	tag="${tag%.txt}"
+	tag="${tag#*.}"
+	res=$( cat "$file" )
+	res=$( trim "$res" )
+	status=
+	case "$res" in
+		''|*[!0-9]*)
+			status="Error (incorrect value)"
+			;;
+	esac
+	if [ -z "$status" ]; then
+		if [ "$res" = 0 ]; then
+			status="Possibly detected"
+		elif [ "$res" -lt $CURL_RANGETO ]; then
+			status="Failed to complete detection"
+		else
+			status="[ OK ]"
+		fi
+	fi
+	printf '%12s: %s \n' "$tag" "$status"
+done
+
+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/zapret2/comfunc.sh
+. /opt/zapret/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
--- 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/zapret2
+diff --git a/init.d/openwrt/zapret b/init.d/openwrt/zapret
 index 8d6d3a9..fcb1e91 100755
--- a/init.d/openwrt/zapret2
-+++ b/init.d/openwrt/zapret2
+--- a/init.d/openwrt/zapret
+++ b/init.d/openwrt/zapret
@@ -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_nfqws()
+ run_tpws()
 {
- 	run_daemon $1 "$NFQWS2" "$NFQWS2_OPT_BASE $2"
+ 	[ "$DISABLE_IPV4" = "1" ] && [ "$DISABLE_IPV6" = "1" ] && return 0
 -- 
 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,7 +1,7 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor

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

 # create empty txt files into ipset directory
 [ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-google.txt"     ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-google.txt"
--- a/zapret2/update-pkg.sh
+++ b/zapret2/update-pkg.sh
@@ -32,7 +32,7 @@ if [ "$EXE_DIR" = "/tmp" ]; then
 		opt_forced="true"
 	fi
 else
-	[ -f "$EXE_DIR/comfunc.sh" ] || { echo "ERROR: file $EXE_DIR/comfunc.sh not founded!"; exit 1; }
+	[ -f "$EXE_DIR/comfunc.sh" ] || { echo "ERROR: file $EXE_DIR/comfunc.sh not found!"; exit 1; }
 	. $EXE_DIR/comfunc.sh
 fi

@@ -110,7 +110,7 @@ function pkg_mgr_update
 	if [ "$PKG_MGR" = "opkg" ]; then
 		PKG_TOTAL=$( opkg list | wc -l )
 		PKG_INSTALLED=$( opkg list-installed | wc -l )
-		if [ "$PKG_TOTAL" = "$PKG_INSTALLED" ]; then
+		if [ "$PKG_TOTAL" -le "$PKG_INSTALLED" ] || [[ "$PKG_TOTAL" -le $((PKG_INSTALLED + 100)) ]]; then
 			echo ">>> OPKG update..."
 			opkg update
 			return $?
@@ -336,8 +336,8 @@ function get_actual_release
 		return 0
 	done
 	json_cleanup
-	echo "ERROR: latest release for arch \"$ZAP_CPU_ARCH\" not founded!"
-	return 150  # release not founded
+	echo "ERROR: latest release for arch \"$ZAP_CPU_ARCH\" not found!"
+	return 150  # release not found
 }

 # -------------------------------------------------------------------------------------------------------
@@ -410,7 +410,7 @@ echo "Current installed version: $ZAP_CUR_PKG_VER"
 if [ "$opt_update" = "" ]; then
 	ZAP_PKG_URL="$REL_ACTUAL_URL"
 	if [ "$ZAP_PKG_URL" = "" ]; then
-		echo "ERROR: actual release not founded!"
+		echo "ERROR: actual release not found!"
 		return 199
 	fi
 else
@@ -419,7 +419,7 @@ else
 		ZAP_PKG_URL="$REL_ACTUAL_URL"
 	fi
 	if [ "$opt_update" = "@" -a "$ZAP_PKG_URL" = "" ]; then
-		echo "ERROR: actual release not founded!"
+		echo "ERROR: actual release not found!"
 		return 199
 	fi
 fi
@@ -494,7 +494,7 @@ if [ "$opt_update" != "" ]; then
 	rm -f "$ZAP_PKG_FN" 2>/dev/null
 	if [ "$PKG_MGR" = "apk" ]; then
 		if [ ! -d "$ZAP_PKG_DIR/apk" ]; then
-			echo "ERROR: APK-files not founded"
+			echo "ERROR: APK-files not found"
 			return 221
 		fi
 		rm -f $ZAP_PKG_DIR/*.ipk 2>/dev/null
--- a/zapret2/Makefile
+++ b/zapret2/Makefile
@@ -1,245 +0,0 @@
-#
-# Copyright (c) 2025 remittor
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=zapret2
-PKG_VERSION:=0.8.20260109
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=bol-van
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=docs/LICENSE.txt
-
-PKG_SOURCE_URL:=https://github.com/bol-van/zapret2.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8e6387a6dfdaa227b50a34f4beb1d5ec2a770d54
-PKG_SOURCE_DATE:=2026-01-09
-
-#PKG_SOURCE:=$(PKG_NAME)-$(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:=nfq2
-
-define Package/$(PKG_NAME)
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=$(PKG_NAME)
-	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
-endef
-
-define Build/Prepare
-	$(Build/Prepare/Default)
-	rm -f $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws2
-	rm -f $(PKG_BUILD_DIR)/ip2net/ip2net
-	rm -f $(PKG_BUILD_DIR)/mdig/mdig
-endef
-
-#define Build/Configure
-#endef
-
-define Build/Compile
-	$(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
-
-define Package/$(PKG_NAME)/conffiles
-/etc/config/zapret2
-/opt/zapret2/config
-/opt/zapret2/ipset/
-/opt/zapret2/init.d/openwrt/custom.d/
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/opt/zapret2
-	$(INSTALL_DIR) $(1)/opt/zapret2/$(MAKE_PATH)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws2 $(1)/opt/zapret2/$(MAKE_PATH)/	
-	$(INSTALL_DIR) $(1)/opt/zapret2/ip2net
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip2net/ip2net $(1)/opt/zapret2/ip2net/
-	$(INSTALL_DIR) $(1)/opt/zapret2/mdig
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdig/mdig $(1)/opt/zapret2/mdig/
-	$(INSTALL_DIR) $(1)/opt/zapret2/common
-	$(CP) $(PKG_BUILD_DIR)/common/* $(1)/opt/zapret2/common/
-	$(INSTALL_DIR) $(1)/opt/zapret2/lua
-	$(CP) $(PKG_BUILD_DIR)/lua/* $(1)/opt/zapret2/lua/
-	#$(INSTALL_DIR) $(1)/opt/zapret2/docs
-	#$(CP) $(PKG_BUILD_DIR)/docs/* $(1)/opt/zapret2/docs/
-	$(INSTALL_DIR) $(1)/opt/zapret2/files
-	$(CP) $(PKG_BUILD_DIR)/files/* $(1)/opt/zapret2/files/
-	$(CP)                ./files/* $(1)/opt/zapret2/files/
-	$(INSTALL_DIR) $(1)/opt/zapret2/ipset
-	$(CP) $(PKG_BUILD_DIR)/ipset/* $(1)/opt/zapret2/ipset/
-	$(INSTALL_DIR) $(1)/opt/zapret2/blockcheck2.d
-	$(CP) $(PKG_BUILD_DIR)/blockcheck2.d/* $(1)/opt/zapret2/blockcheck2.d/
-	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/blockcheck2.sh  $(1)/opt/zapret2/blockcheck2.sh
-	#$(INSTALL_DATA) $(PKG_BUILD_DIR)/config.default $(1)/opt/zapret2/config.default
-	$(INSTALL_DIR) $(1)/opt/zapret2/tmp
-	$(INSTALL_DIR) $(1)/opt/zapret2/init.d/openwrt
-	$(CP) $(PKG_BUILD_DIR)/init.d/openwrt/* $(1)/opt/zapret2/init.d/openwrt/
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(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/zapret2
-	$(INSTALL_DATA) ./config.default $(1)/opt/zapret2/config.default
-	$(INSTALL_DATA) ./ipset/zapret-hosts-google.txt       $(1)/opt/zapret2/ipset/zapret-hosts-google.txt
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user.txt         $(1)/opt/zapret2/ipset/zapret-hosts-user.txt
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret2/ipset/zapret-hosts-user-exclude.txt
-	$(INSTALL_DATA) ./ipset/zapret-ip-exclude.txt         $(1)/opt/zapret2/ipset/zapret-ip-exclude.txt
-	$(INSTALL_DIR) $(1)/opt/zapret2/ipset_def
-	$(INSTALL_DATA) ./ipset/zapret-hosts-google.txt       $(1)/opt/zapret2/ipset_def/zapret-hosts-google.txt
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user.txt         $(1)/opt/zapret2/ipset_def/zapret-hosts-user.txt
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret2/ipset_def/zapret-hosts-user-exclude.txt
-	$(INSTALL_DATA) ./ipset/zapret-ip-exclude.txt         $(1)/opt/zapret2/ipset_def/zapret-ip-exclude.txt
-	$(INSTALL_DIR) $(1)/opt/zapret2/init.d
-	$(INSTALL_DIR) $(1)/opt/zapret2/init.d/openwrt
-	$(INSTALL_DIR) $(1)/opt/zapret2/init.d/openwrt/custom.d
-	$(CP) ./custom.d/* $(1)/opt/zapret2/init.d/openwrt/custom.d/
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./uci-def-cfg.sh     $(1)/etc/uci-defaults/zapret2-uci-def-cfg.sh
-	$(INSTALL_BIN) ./uci-def-cfg.sh     $(1)/opt/zapret2/uci-def-cfg.sh
-	$(INSTALL_BIN) ./comfunc.sh         $(1)/opt/zapret2/comfunc.sh
-	$(INSTALL_BIN) ./def-cfg.sh         $(1)/opt/zapret2/def-cfg.sh
-	$(INSTALL_BIN) ./renew-cfg.sh       $(1)/opt/zapret2/renew-cfg.sh
-	$(INSTALL_BIN) ./restore-def-cfg.sh $(1)/opt/zapret2/restore-def-cfg.sh
-	$(INSTALL_BIN) ./sync_config.sh     $(1)/opt/zapret2/sync_config.sh
-	$(INSTALL_BIN) ./script-exec.sh     $(1)/opt/zapret2/script-exec.sh
-	$(INSTALL_BIN) ./update-pkg.sh      $(1)/opt/zapret2/update-pkg.sh
-	# Fix permisions
-	chmod 644 $(1)/opt/zapret2/ipset/*.txt
-	chmod 644 $(1)/opt/zapret2/ipset_def/*.txt
-	chmod 644 $(1)/opt/zapret2/init.d/openwrt/custom.d/*.sh
-	chmod 644 $(1)/opt/zapret2/config.default
-	chmod 755 $(1)/opt/zapret2/*.sh
-	chmod 755 $(1)/opt/zapret2/$(MAKE_PATH)/*
-	chmod 755 $(1)/opt/zapret2/ip2net/*
-	chmod 755 $(1)/opt/zapret2/mdig/*
-endef
-
-define Package/$(PKG_NAME)/preinst
-#!/bin/sh
-# check if we are on real system
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	if [ -f "/etc/init.d/zapret2" ]; then
-		SCRIPT=$$( readlink /etc/init.d/zapret2 )
-		if [ -n "$${SCRIPT}" ]; then
-			echo "Please uninstall original zapret2 utility!"
-			exit 44
-		fi
-	fi
-	if [ "$${PKG_UPGRADE}" = "1" ]; then
-		# stop service if PKG_UPGRADE
-		if [ -x "/etc/init.d/zapret2" ]; then
-			/etc/init.d/zapret2 running && /etc/init.d/zapret2 stop >/dev/null 2>&1
-		fi
-	fi
-fi
-exit 0
-endef
-
-define Package/$(PKG_NAME)/postinst
-#!/bin/sh
-# check if we are on real system
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	ZAPRET_CONFIG=/opt/zapret2/config
-	ZAPRET_CONFIG_DEF="/opt/zapret2/config.default"
-	# creating main config if its not exists
-	if [ ! -f "$${ZAPRET_CONFIG}" ]; then
-		cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
-	fi
-	# check existing uci-config
-	[ -f "/etc/config/zapret2" ] && ZAPRET_CFG_EXISTS=1 || ZAPRET_CFG_EXISTS=0
-	# create or merge 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/zapret2-uci-def-cfg.sh
-	# copy (sync) all params from uci-config to main config
-	/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
-	# enable main service
-	/etc/init.d/zapret2 enable
-	# stop all
-	/etc/init.d/zapret2 stop_fw
-	/etc/init.d/zapret2 stop_daemons
-	ps w | grep '/opt/zapret2/nfq2/nfqws2' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
-	# start main service
-	/etc/init.d/zapret2 start
-	# restart firewall
-	[ -x /sbin/fw4 ] && fw4 -q restart || fw3 -q restart
-fi
-exit 0
-endef
-
-define Package/$(PKG_NAME)/prerm
-#!/bin/sh
-# check if we are on real system
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	EXEDIR=/opt/zapret2
-	ZAPRET_BASE=/opt/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/zapret2/nfq2/nfqws2' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
-		exit 0
-	fi
-	. "$${ZAPRET_CONFIG}"
-	. "$${ZAPRET_BASE}/common/base.sh"
-	. "$${ZAPRET_BASE}/common/fwtype.sh"
-	. "$${ZAPRET_BASE}/common/nft.sh"
-	. "$${ZAPRET_BASE}/common/installer.sh"
-	/etc/init.d/zapret2 running && /etc/init.d/zapret2 stop
-	/etc/init.d/zapret2 disable
-	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
-fi
-exit 0
-endef
-
-define Package/$(PKG_NAME)/postrm
-#!/bin/sh
-# check if we are on real system
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	[ -f "/etc/config/zapret2-opkg" ] && rm -f "/etc/config/zapret2-opkg"
-	[ -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
-
-$(eval $(call BuildPackage,$(PKG_NAME)))
--- a/zapret2/def-cfg.sh
+++ b/zapret2/def-cfg.sh
@@ -1,184 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2025 remittor
-
-function set_cfg_reset_values
-{
-	local cfgname=${1:-$ZAPRET_CFG_NAME}
-	local TAB="$( echo -n -e '\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_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='9'
-		set $cfgname.config.NFQWS2_TCP_PKT_IN='3'
-		set $cfgname.config.NFQWS2_UDP_PKT_OUT='9'
-		set $cfgname.config.NFQWS2_UDP_PKT_IN='0'
-		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="$( echo -n -e '\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="$( echo -n -e '\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
-	return 0
-}
Author	SHA1	Message	Date
remittor	7a7784878f	Bump version to v72.20260111	2026-01-11 13:39:18 +03:00
remittor	fc3e0ec213	build: Fix matrix for riscv64 arch	2026-01-11 13:39:01 +03:00
remittor	9e3dbf8ef3	Add diagnostic button (DPI checker)	2026-01-11 11:56:22 +03:00
remittor	f0cc13fb38	config: Fix "<" and ">" symbols for v6 strategy	2026-01-11 10:20:27 +03:00
remittor	486475f817	luci: updater: Add new func tools.execAndRead	2026-01-10 20:54:11 +03:00
remittor	969029c0db	luci: Fix update text after edit for NFQWS_OPT	2026-01-10 10:56:47 +03:00
remittor	879ffa217d	luci: Fix js-files for unification	2026-01-09 22:29:47 +03:00
remittor	4f5dd5a019	luci: Splitting file tools.js into two parts (add file env.js)	2026-01-09 22:00:05 +03:00
remittor	349ead377a	build: Rewrite build script (using OpenWrt SDK from github)	2026-01-09 17:42:21 +03:00
remittor	c7616b468b	Replace "founded" to "found"	2026-01-09 17:36:38 +03:00
remittor	bb5647568e	updater: Fix pkg_mgr_update for opkg	2026-01-09 10:31:33 +03:00
remittor	40a3605034	Bump version to v72.20260108	2026-01-08 19:57:07 +03:00
remittor	3227458422	readme: Update link to instructions	2026-01-08 19:38:51 +03:00
remittor	54fdbe4d5e	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:18 +03:00
remittor	b714b629b7	Integrate mdig and ip2net to main package	2026-01-01 12:27:28 +03:00
remittor	354a71f6c5	Remove tpws, mdig, ip2net packages	2026-01-01 12:22:58 +03:00
remittor	f48488b21b	updater: Change get_actual_release error 1 to 150	2025-12-30 13:39:18 +03:00
remittor	a3c256c31a	zapret: Global use of dynamic variables	2025-12-29 21:09:35 +03:00
remittor	1d2d3c4b84	luci: updater: Skip error -32000	2025-12-29 19:36:12 +03:00
remittor	5b6fd0a1e6	updater: Fix get_pkg_version for OpenWrt 25	2025-12-29 18:34:31 +03:00
remittor	791ea2d2b6	github: issue: Add help_wanted templates	2025-12-27 11:28:18 +03:00
remittor	9d73b59640	Bump version to v72.20251227	2025-12-27 11:27:41 +03:00
remittor	b58cbafec6	updater: Fix luci package name	2025-12-27 11:27:05 +03:00
remittor	a56b1e3f1c	luci: tools: Fix save changes into modal dialog for NFQWS_OPT	2025-12-27 10:29:21 +03:00
remittor	80f15e3da1	def-cfg: Add new strategy v6_by_StressOzz	2025-12-27 10:25:54 +03:00
remittor	89bcec8a60	updater: Fix files renaming	2025-12-26 15:45:20 +03:00
remittor	735575c7bc	updater: Update func download_releases_info	2025-12-26 08:57:31 +03:00
remittor	5550820fdc	Bump version to v72.20251225-r2	2025-12-25 18:04:53 +03:00
remittor	0e8366f7d1	luci: tools: Fix show and close modal dialog for NFQWS_OPT	2025-12-25 18:02:11 +03:00
remittor	ea3c774537	updater: Fix find base package after ZIP unpack	2025-12-25 14:57:36 +03:00
remittor	57b7e65532	github: Fix bug_report.yml	2025-12-25 12:01:27 +03:00
remittor	eeacc486f9	Add ISSUE_TEMPLATE	2025-12-25 11:52:35 +03:00
remittor	101382faf7	Bump version to v72.20251225	2025-12-25 08:58:38 +03:00
remittor	21229ef152	def-cfg: Add strategies by Flowseal (ALT7 + TLS_AUTO_ALT3)	2025-12-25 08:54:40 +03:00
remittor	9aaf2b29e3	fake: Add TLS 1.3 hello from max.ru	2025-12-25 08:25:26 +03:00
remittor	246f4a08a0	luci: tools: Fix close modal dialog for NFQWS_OPT	2025-12-24 18:50:48 +03:00
remittor	3d3eb82b7b	luci: updater: Fix timer using	2025-12-24 14:39:52 +03:00
remittor	8aff441b88	luci: tools: Fix close modal dialog for NFQWS_OPT	2025-12-23 14:14:07 +03:00
remittor	1c866d5de1	comfunc: Fix remove debug log	2025-12-20 10:11:18 +03:00
remittor	57d5ab5060	Bump version to v72.20251219	2025-12-19 11:17:04 +03:00
remittor	5a685cfa27	updater: Add check for unzip installed	2025-12-19 11:11:47 +03:00
remittor	21017047a8	updater: Fix parsing package version (APK)	2025-12-19 10:22:54 +03:00