Bump version to v72.20260126

PR: ad6b23f4aa

.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

.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

.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

.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 [...]

.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: |
+        Это можно реализовать с помощью [...]

.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

.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

.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 }}
@@ -270,6 +276,8 @@ jobs:
         run: |
           make defconfig
           sed -i 's/CONFIG_LUCI_JSMIN=y/CONFIG_LUCI_JSMIN=n/g' .config
+          sed -i 's/CONFIG_LUCI_CSSMIN=y/CONFIG_LUCI_CSSMIN=n/g' .config
+          grep -q '^CONFIG_LUCI_CSSMIN=' .config || echo 'CONFIG_LUCI_CSSMIN=n' >> .config
           echo "status=success" >> $GITHUB_OUTPUT
 
       - name: Show config
@@ -284,9 +292,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 +314,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/zapret_$PKGVER-$ARCH_TAG.$PKGTYPE
-          touch $OUT_DIR/luci-app-zapret2_$PKGVER-all.$PKGTYPE
+          touch $OUT_DIR/luci-app-zapret_$PKGVER-all.$PKGTYPE
           echo "status=success" >> $GITHUB_OUTPUT
 
       - name: Install packages
@@ -318,7 +326,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 +392,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 +404,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

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)
 

luci-app-zapret/Makefile

@@ -4,14 +4,14 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=luci-app-zapret2
+PKG_NAME:=luci-app-zapret
-PKG_VERSION:=0.8.20260125
+PKG_VERSION:=72.20260126
 PKG_RELEASE:=1
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=remittor <https://github.com/remittor>
 
-LUCI_TITLE:=LuCI support for zapret2
+LUCI_TITLE:=LuCI support for zapret
-LUCI_DEPENDS:=+zapret2
+LUCI_DEPENDS:=+zapret
 LUCI_PKGARCH:=all
 
 define Package/$(PKG_NAME)/postinst

luci-app-zapret/htdocs/luci-static/resources/view/zapret/diagnost.js

@@ -5,7 +5,7 @@
 'require uci';
 'require ui';
 'require view';
-'require view.zapret2.tools as tools';
+'require view.zapret.tools as tools';
 
 const btn_style_neutral  = 'btn';
 const btn_style_action   = 'btn cbi-button-action';
@@ -49,7 +49,7 @@ return baseclass.extend({
             log: '/tmp/'+tools.appName+'_dwc.log',
             logArea: this.logArea,
             callback: this.execAndReadCallback,
-            ctx: this,
+            cbarg: this,  // wnd
         });
     },
 
@@ -70,27 +70,27 @@ return baseclass.extend({
             log: '/tmp/'+tools.appName+'_dwc.log',
             logArea: this.logArea,
             callback: this.execAndReadCallback,
-            ctx: this,
+            cbarg: this,  // wnd
         });
     },
 
-    execAndReadCallback: function(rc, txt = '')
+    execAndReadCallback: function(wnd, rc, txt = '')
     {
-        this.setBtnMode(1, 1, 1);
+        wnd.setBtnMode(1, 1, 1);
         if (rc == 0 && txt) {
-            this.appendLog('=========================================================');
+            wnd.appendLog('=========================================================');
             return;
         }
         if (rc >= 500) {
             if (txt) {
-                this.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
+                wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
             } else {
-                this.appendLog('ERROR: ' + this._action + ': Terminated with error code = ' + rc);
+                wnd.appendLog('ERROR: ' + wnd._action + ': Terminated with error code = ' + rc);
             }
         } else {
-            this.appendLog('ERROR: Process finished with retcode = ' + rc);
+            wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
         }
-        this.appendLog('=========================================================');
+        wnd.appendLog('=========================================================');
     },
 
     openDiagnostDialog: function(pkg_arch)

luci-app-zapret/htdocs/luci-static/resources/view/zapret/dmnlog.js

@@ -5,7 +5,7 @@
 'require poll';
 'require uci';
 'require ui';
-'require view.zapret2.tools as tools';
+'require view.zapret.tools as tools';
 
 return view.extend({
     retrieveLog: async function() {

luci-app-zapret/htdocs/luci-static/resources/view/zapret/env.js

@@ -0,0 +1,55 @@
+'use strict';
+'require baseclass';
+
+return baseclass.extend({
+    packager          : { },
+    appName           : 'zapret',
+    AppName           : 'Zapret',
+    execPath          : '/etc/init.d/zapret',
+    appDir            : '/opt/zapret',
+    syncCfgPath       : '/opt/zapret/sync_config.sh',
+    defCfgPath        : '/opt/zapret/def-cfg.sh',
+    defaultCfgPath    : '/opt/zapret/restore-def-cfg.sh',
+
+    hostsGoogleFN     : '/opt/zapret/ipset/zapret-hosts-google.txt',
+    hostsUserFN       : '/opt/zapret/ipset/zapret-hosts-user.txt',
+    hostsUserExcludeFN: '/opt/zapret/ipset/zapret-hosts-user-exclude.txt',
+    iplstExcludeFN    : '/opt/zapret/ipset/zapret-ip-exclude.txt',
+    iplstUserFN       : '/opt/zapret/ipset/zapret-ip-user.txt',
+    iplstUserExcludeFN: '/opt/zapret/ipset/zapret-ip-user-exclude.txt',
+    custFileMax       : 4,
+    custFileTemplate  : '/opt/zapret/ipset/cust%s.txt',
+    customdPrefixList : [ 10, 20, 50, 60, 90 ] ,
+    customdFileFormat : '/opt/zapret/init.d/openwrt/custom.d/%s-script.sh',
+    discord_num       : 50,
+    discord_url       : [ 'https://github.com/bol-van/zapret/blob/4e8e3a9ed9dbeb1156db68dfaa7b353051c13797/init.d/custom.d.examples.linux/50-discord',
+                          'https://github.com/bol-van/zapret/blob/b251ea839cc8f04c45090314ef69fce69f2c00f2/init.d/custom.d.examples.linux/50-discord-media',
+                          'https://github.com/bol-van/zapret/blob/b251ea839cc8f04c45090314ef69fce69f2c00f2/init.d/custom.d.examples.linux/50-stun4all',
+                          'https://github.com/bol-van/zapret/tree/master/init.d/custom.d.examples.linux'
+                        ],
+    nfqws_opt_url     : 'https://github.com/remittor/zapret-openwrt/discussions/168',
+
+    autoHostListFN    : '/opt/zapret/ipset/zapret-hosts-auto.txt',
+    autoHostListDbgFN : '/opt/zapret/ipset/zapret-hosts-auto-debug.log',
+
+    load_env: function(dst_obj) {
+        let env_proto = Object.getPrototypeOf(this);
+        Object.getOwnPropertyNames(env_proto).forEach(function(key) {
+            if (key === 'constructor' || key === 'load_env' || key.startsWith('__'))
+                return;
+            dst_obj[key] = env_proto[key];
+        });
+        dst_obj.packager = { };
+        if (L.hasSystemFeature('apk')) {
+            dst_obj.packager.name = 'apk';
+            dst_obj.packager.path = '/usr/bin/apk';
+            dst_obj.packager.args = [ 'list', '-I', '*'+this.appName+'*' ];
+        } else {
+            dst_obj.packager.name = 'opkg';
+            dst_obj.packager.path = '/bin/opkg';
+            dst_obj.packager.args = [ 'list-installed', '*'+this.appName+'*' ];
+        }
+        dst_obj.skey_pkg_dict = this.appName + '-pkg-dict';
+        dst_obj.skey_need_restart = this.appName + '-need-restart';
+    }
+});

luci-app-zapret/htdocs/luci-static/resources/view/zapret/service.js

@@ -4,9 +4,9 @@
 'require uci';
 'require ui';
 'require view';
-'require view.zapret2.tools as tools';
+'require view.zapret.tools as tools';
-'require view.zapret2.diagnost as diagnost';
+'require view.zapret.diagnost as diagnost';
-'require view.zapret2.updater as updater';
+'require view.zapret.updater as updater';
 
 const btn_style_neutral  = 'btn';
 const btn_style_action   = 'btn cbi-button-action';
@@ -16,8 +16,6 @@ const btn_style_warning  = 'btn cbi-button-negative';
 const btn_style_success  = 'btn cbi-button-success important';
 
 return view.extend({
-    POLL: new tools.POLLER( { } ),
-    
     get_svc_buttons: function(elems = { }) {
         return {
             "enable"  : elems.btn_enable  || document.getElementById('btn_enable'),
@@ -46,18 +44,17 @@ return view.extend({
         btn.update.disabled  = (error_code == 0) ? flag : false;
     },
 
-    getAppStatus: function()
+    getAppStatus: function() {
-    {
+        return Promise.all([
-        return tools.promiseAllDict({
+            tools.getInitState(tools.appName),      // svc_boot
-            svc_boot   : tools.getInitState(tools.appName),
+            fs.exec(tools.execPath, [ 'enabled' ]), // svc_en
-            svc_en     : fs.exec(tools.execPath, [ 'enabled' ]),
+            tools.getSvcInfo(),                     // svc_info
-            svc_info   : tools.getSvcInfo(),
+            fs.exec('/bin/busybox', [ 'ps' ]),      // process list
-            proc_list  : fs.exec('/bin/busybox', [ 'ps' ]),
+            tools.getPackageDict(),                 // installed packages
-            pkg_dict   : tools.getPackageDict(),
+            tools.getStratList(),                   // nfqws strategy list
-            strat_list : tools.getStratList(),
+            fs.exec('/bin/cat', [ '/etc/openwrt_release' ]),  // CPU arch
-            sys_info   : fs.exec('/bin/cat', [ '/etc/openwrt_release' ]),
+            uci.load(tools.appName),              // config
-            uci_data   : uci.load(tools.appName),
+        ]).catch(e => {
-        }).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.'+tools.appName
@@ -65,34 +62,40 @@ return view.extend({
         });
     },
 
-    setAppStatus: function(data, elems = { }, force_app_status = 0)
+    setAppStatus: function(status_array, elems = { }, force_app_status = 0) {
-    {
-        tools.execDefferedAction();
         let cfg = uci.get(tools.appName, 'config');
-        if (!data || cfg == null || typeof(cfg) !== 'object') {
+        if (!status_array || cfg == null || typeof(cfg) !== 'object') {
             let elem_status = elems.status || document.getElementById("status");
             elem_status.innerHTML = tools.makeStatusString(null, '', '');
             ui.addNotification(null, E('p', _('Unable to read the contents') + ': setAppStatus()'));
             this.disableButtons(true, -1, elems);
             return;
         }
-        let svc_boot  = data.svc_boot ? true : false;
+        let svc_boot  = status_array[0] ? true : false;
-        this.nfqws_strat_list = data.strat_list;
+        let svc_en    = status_array[1];   // stdout: empty or error text
-        this.pkg_arch = tools.getConfigPar(data.sys_info.stdout, 'DISTRIB_ARCH', 'unknown');
+        let svc_info  = status_array[2];   // dict for services
-        //console.log('svc_en: ' + data.svc_en.code + '  poll.running = ' + this.POLL.running);
+        let proc_list = status_array[3];   // stdout: multiline text
-        let svc_en = (data.svc_en.code == 0) ? true : false;
+        let pkg_dict  = status_array[4];   // stdout: installed packages
+        let stratlist = status_array[5];   // array of strat names
+        let sys_info  = status_array[6];   // stdout: openwrt distrib info
         
-        if (typeof(data.svc_info) !== 'object') {
+        this.nfqws_strat_list = stratlist;
+        this.pkg_arch = tools.getConfigPar(sys_info.stdout, 'DISTRIB_ARCH', 'unknown');
+        
+        //console.log('svc_en: ' + svc_en.code);
+        svc_en = (svc_en.code == 0) ? true : false;
+        
+        if (typeof(svc_info) !== 'object') {
             ui.addNotification(null, E('p', _('Unable to read the service info') + ': setAppStatus()'));
             this.disableButtons(true, -1, elems);
             return;
         }
-        if (data.proc_list.code != 0) {
+        if (proc_list.code != 0) {
             ui.addNotification(null, E('p', _('Unable to read process list') + ': setAppStatus()'));
             this.disableButtons(true, -1, elems);
             return;
         }
-        if (!data.pkg_dict) {
+        if (!pkg_dict) {
             ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': getPackageDict()'));
             this.disableButtons(true, -1, elems);
             return;
@@ -101,7 +104,7 @@ return view.extend({
         if (force_app_status) {
             svcinfo = force_app_status;
         } else {
-            svcinfo = tools.decode_svc_info(svc_en, data.svc_info, data.proc_list, cfg);
+            svcinfo = tools.decode_svc_info(svc_en, svc_info, proc_list, cfg);
         }
         let btn = this.get_svc_buttons(elems);
         btn.reset.disabled = false;
@@ -126,55 +129,36 @@ return view.extend({
         }
         let elem_status = elems.status || document.getElementById("status");
         elem_status.innerHTML = tools.makeStatusString(svcinfo, this.pkg_arch, '');
-        this.POLL.running = false;
+        
+        if (!poll.active()) {
+            poll.start();
+        }
     },
 
-    serviceActionEx: async function(action, button, args = [ ], hide_modal = false)
+    serviceActionEx: async function(action, button, args = [ ], hide_modal = false, btn_dis = true)
     {
         let btn = document.getElementById(button);
-        if (btn?.create_args) {
-            args = btn.create_args();
-            console.log('serviceActionEx: btn.args = '+JSON.stringify(args));
-        }
-        if (action == 'reset') {
-            hide_modal = true;
-        }
-        await this.POLL.stopAndWait();
         this.disableButtons(true, btn);
-        //console.log('serviceActionEx: poll.running = '+this.POLL.running);
+        poll.stop();
         try {
-            if (action == 'start' || action == 'restart') {
-                let apply_exec = tools.checkUnsavedChanges();
-                if (apply_exec) {
-                    ui.changes.apply(true);  // apply_rollback
-                    await new Promise(resolve => setTimeout(resolve, 1000));
-                    tools.setDefferedAction(action, null, true);
-                    return;
-                }
-            }
             await tools.serviceActionEx(action, args, false);
             if (hide_modal) {
                 ui.hideModal();
             }
         } catch(e) { 
             //ui.addNotification(null, E('p', 'Error: ' + e.message));
+        } finally {
+            if (btn && btn_dis) {
+                setTimeout(() => { btn.disabled = true; }, 0);
+            }
+            if (!poll.active()) {
+                await new Promise(resolve => setTimeout(resolve, 10));
+                poll.start();
+            }
         }
     },
-    
-    serviceActionExCallback: function(btn, result, error)
-    {
-        //console.log('serviceActionExCallback: poll.active = '+this.POLL.active);
-        this.POLL.start(150);
-    },
 
-    createServiceHandlerFn: function(action, btn_name)
+    statusPoll: function() {
-    {
-        let opt = { keepDisabled: true, callback: this.serviceActionExCallback };
-        return tools.createHandlerFnEx(this, 'serviceActionEx', opt, action, btn_name);
-    },
-
-    statusPoll: function()
-    {
         this.getAppStatus().then(
             L.bind(this.setAppStatus, this)
         );
@@ -231,11 +215,10 @@ return view.extend({
         }, _('Cancel'));
 
         let resetcfg_btn = E('button', {
-            'id': 'resetcfg_btn',
-            'name': 'resetcfg_btn',
             'class': btn_style_action,
         }, _('Reset settings'));
-        resetcfg_btn.create_args = () => {
+        resetcfg_btn.onclick = ui.createHandlerFn(this, async () => {
+            //cancel_button.disabled = true;
             let opt_flags = '';
             if (document.getElementById('cfg_reset_base').checked == false) {
                 opt_flags += '(skip_base)';
@@ -252,15 +235,17 @@ return view.extend({
             if (document.getElementById('cfg_enable_custom_d').checked) {
                 opt_flags += '(enable_custom_d)';
             };
+            //console.log('RESET: opt_flags = ' + opt_flags);
             let sel_strat = document.getElementById('cfg_nfqws_strat');
             let opt_strat = sel_strat.options[sel_strat.selectedIndex].text;
+            //console.log('RESET: strat = ' + opt_strat);
             if (opt_strat == 'not change') {
                 opt_strat = '-';
             }
             opt_flags += '(sync)';
-            return [ opt_flags, opt_strat ];
+            let args = [ opt_flags, opt_strat ];
-        };
+            return this.serviceActionEx('reset', resetcfg_btn, args, true);
-        resetcfg_btn.onclick = this.createServiceHandlerFn('reset', 'resetcfg_btn');
+        });
 
         ui.showModal(_('Reset settings to default'), [
             E('div', { 'class': 'cbi-section' }, [
@@ -285,23 +270,24 @@ return view.extend({
         ]);
     },
 
-    load: function()
+    load: function() {
-    {
+        var _this = this;
-        return tools.baseLoad(this, (data) => {
+        return Promise.all([
-            //console.log('SYS FEATURES: '+JSON.stringify(data.sys_feat));
+            L.resolveDefault(fs.stat('/bin/cat'), null),
-            tools.load_feat_env();
+        ]).then(function(data) {
-            return this.getAppStatus();
+            return _this.getAppStatus();
         });
     },
 
-    render: function(data)
+    render: function(status_array) {
-    {
+        if (!status_array) {
-        if (!data) {
             return;
         }
         let cfg = uci.get(tools.appName, 'config');
 
-        let pkgdict = data.pkg_dict;
+        tools.checkAndRestartSvc(status_array[2]);  // svc_info
+
+        let pkgdict = status_array[4];
         if (pkgdict == null) {
             ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': render()'));
             return;
@@ -349,17 +335,17 @@ return view.extend({
         };
         
         let btn_enable      = create_btn('btn_enable',  btn_style_success, _('Enable'));
-        btn_enable.onclick  = this.createServiceHandlerFn('enable', 'btn_enable');
+        btn_enable.onclick  = ui.createHandlerFn(this, this.serviceActionEx, 'enable', 'btn_enable');
         let btn_disable     = create_btn('btn_disable', btn_style_warning, _('Disable'));
-        btn_disable.onclick = this.createServiceHandlerFn('disable', 'btn_disable');
+        btn_disable.onclick = ui.createHandlerFn(this, this.serviceActionEx, 'disable', 'btn_disable');
         layout_append(_('Service autorun control'), null, [ btn_enable, btn_disable ] );
 
         let btn_start       = create_btn('btn_start',   btn_style_action, _('Start'));
-        btn_start.onclick   = this.createServiceHandlerFn('start', 'btn_start');
+        btn_start.onclick   = ui.createHandlerFn(this, this.serviceActionEx, 'start', 'btn_start');
         let btn_restart     = create_btn('btn_restart', btn_style_action, _('Restart'));
-        btn_restart.onclick = this.createServiceHandlerFn('restart', 'btn_restart');
+        btn_restart.onclick = ui.createHandlerFn(this, this.serviceActionEx, 'restart', 'btn_restart');
         let btn_stop        = create_btn('btn_stop',    btn_style_warning, _('Stop'));
-        btn_stop.onclick    = this.createServiceHandlerFn('stop', 'btn_stop');
+        btn_stop.onclick    = ui.createHandlerFn(this, this.serviceActionEx, 'stop', 'btn_stop');
         layout_append(_('Service daemons control'), null, [ btn_start, btn_restart, btn_stop ] );
 
         let btn_reset       = create_btn('btn_reset', btn_style_action, _('Reset settings'));
@@ -385,11 +371,9 @@ return view.extend({
             "btn_diag": btn_diag,
             "btn_update": btn_update,
         };
-        this.setAppStatus(data, elems);
+        this.setAppStatus(status_array, elems);
 
-        this.POLL.mode = 1;
+        poll.add(L.bind(this.statusPoll, this), 2);  // interval 2 sec
-        this.POLL.init( L.bind(this.statusPoll, this), 2000 );  // interval 2 sec
-        this.POLL.start(500);  // first step after 500 ms
 
         let page_title = tools.AppName;
         page_title += ' &nbsp ';

luci-app-zapret/htdocs/luci-static/resources/view/zapret/settings.js

@@ -5,32 +5,26 @@
 'require uci';
 'require ui';
 'require view';
-'require view.zapret2.tools as tools';
+'require view.zapret.tools as tools';
 
 document.head.appendChild(E('link', {
     rel: 'stylesheet',
-    href: L.resource('view/zapret2/styles.css')
+    href: L.resource('view/zapret/styles.css')
 }));
 
 return view.extend({
     svc_info: null,
 
-    load: function()
+    load: function() {
-    {
+        return tools.baseLoad();
-        return tools.baseLoad(this, (data) => {
-            //console.log('SYS FEATURES: '+JSON.stringify(data.sys_feat));
-            tools.load_feat_env();
-            return data;
-        });
     },
 
-    render: function(data)
+    render: function(data) {
-    {
         if (!data) {
             return;
         }
         this.svc_info = data.svc_info;
-        tools.execDefferedAction(this.svc_info);
+        tools.checkAndRestartSvc(this.svc_info);
 
         let m, s, o, tabname;
 
@@ -464,14 +458,10 @@ return view.extend({
     handleSaveApply: function(ev, mode)
     {
         return this.handleSave(ev).then(() => {
-            let apply_exec = tools.checkUnsavedChanges();
+            ui.changes.apply(mode == '0');
-            if (apply_exec) {
+            if (this.svc_info?.dmn.inited) {
-                ui.changes.apply(mode == '0');
+                localStorage.setItem(tools.skey_need_restart, '1');
-                tools.setDefferedAction('restart', this.svc_info);
+                console.log('STOR KEY: '+tools.skey_need_restart+' = 1');
-            } else {
-                if (this.svc_info?.dmn.inited) {
-                    tools.serviceActionEx('restart');
-                }
             }
         });
     },

luci-app-zapret/htdocs/luci-static/resources/view/zapret/tools.js

@@ -4,7 +4,7 @@
 'require rpc';
 'require ui';
 'require uci';
-'require view.zapret2.env as env_tools';
+'require view.zapret.env as env_tools';
 
 document.head.append(E('style', {'type': 'text/css'},
 `
@@ -40,12 +40,7 @@ return baseclass.extend({
         env_tools.load_env(this);
         //console.log('appName: ' + this.appName);
         //console.log('PACKAGER: ' + this.packager.name);
-    },
+    }, 
-
-    load_feat_env: function()
-    {
-        env_tools.load_feat_env(this);
-    },
 
     infoLabelRunning  : '<span class="label-status running">'  + _('Running')  + '</span>',
     infoLabelStarting : '<span class="label-status starting">' + _('Starting') + '</span>',
@@ -165,6 +160,10 @@ return baseclass.extend({
             let exec_cmd = null;
             let exec_arg = [ ];
             if (action == 'start' || action == 'restart') {
+                if (this.checkUnsavedChanges()) {
+                    await ui.changes.apply(true);
+                    await new Promise(resolve => setTimeout(resolve, 100));
+                }
                 exec_cmd = this.syncCfgPath;
                 errmsg = _('Unable to run sync_config.sh script.');
             }
@@ -181,9 +180,7 @@ return baseclass.extend({
                 }
             }
             errmsg = null;
-            if (action) {
+            await this.handleServiceAction(this.appName, action, throwed);
-                await this.handleServiceAction(this.appName, action, throwed);
-            }
         } catch(e) { 
             if (throwed) {
                 throw e;
@@ -193,35 +190,20 @@ return baseclass.extend({
             }
         }
     },
-
-    promiseAllDict: function(promisesDict)
-    {
-        const keys = Object.keys(promisesDict);
-        const promises = keys.map(key => promisesDict[key]);
-        return Promise.all(promises)
-            .then(results => {
-                const resultDict = { };
-                keys.forEach((key, index) => {
-                    resultDict[key] = results[index];
-                });
-                return resultDict;
-            });
-    },    
     
-    baseLoad: function(ctx, callback)
+    baseLoad: function(callback, cbarg)
     {
         return Promise.all([
-            L.probeSystemFeatures(),
             this.getSvcInfo(),           // svc_info
             uci.load(this.appName),
         ])
-        .then( ([ sys_feat, svcInfo, uci_data ]) => {
+        .then( ([svcInfo, uci_data]) => {
-            let svc_info = this.decodeSvcInfo(svcInfo);
+            let svc_info = this.decode_svc_info(true, svcInfo, [ ], null);
-            let ret = { sys_feat, svc_info, uci_data };
+            let ret = { svc_info, uci_data };
-            if (typeof(callback) === 'function') {
+            if (typeof callback === 'function') {
-                const res = callback.call(ctx, ret);
+                const res = callback(cbarg, ret);
-                if (res && typeof(res.then) === 'function') {
+                if (res && typeof res.then === 'function') {
-                    return res.then(() => res);
+                    return res.then(() => ret);
                 }
                 return ret;
             }
@@ -233,49 +215,23 @@ return baseclass.extend({
         });
     },
 
-    decodeSvcInfo: function(svc_info, svc_autorun = true, proc_list = [ ])
+    checkAndRestartSvc: function(svcInfo)
     {
-        if (svc_info?.autorun !== undefined && svc_info?.dmn !== undefined) {
+        let svc_info = null;
-            return svc_info;
+        if (svcInfo?.autorun !== undefined && svcInfo?.dmn !== undefined) {
+            svc_info = svcInfo;
+        } else
+        if (typeof(svcInfo) == 'object') {
+            svc_info = this.decode_svc_info(true, svcInfo, [ ], null);
         }
-        if (svc_info != null && typeof(svc_info) == 'object') {
+        //console.log('checkAndRestartSvc: svc_info = '+JSON.stringify(svc_info));
-            return this.decode_svc_info(svc_autorun, svc_info, proc_list);
+        let need_restart = localStorage.getItem(this.skey_need_restart);
-        }
+        if (need_restart) {
-        return null;
+            localStorage.removeItem(this.skey_need_restart);
-    },
+            if (svcInfo?.dmn !== undefined && svc_info.dmn.inited) {
-
+                this.serviceActionEx('restart');
-    setDefferedAction: function(action, svcInfo = null, forced = false)
-    {
-        let svc_info = this.decodeSvcInfo(svcInfo);
-        if (action == 'start' && svc_info?.dmn.inited) {
-            action = 'restart';
-        }
-        if (action == 'start') {
-            if (!forced && svc_info?.dmn.inited) {
-                action = null;
             }
         }
-        if (action == 'restart') {
-            if (!forced && !svc_info?.dmn.inited) {
-                action = null;
-            }
-        }
-        if (action && localStorage.getItem(this.skey_deffered_action) == null) {
-            localStorage.setItem(this.skey_deffered_action, action);
-            console.log('setDefferedAction: '+this.skey_deffered_action+' = '+action);
-        }
-    },
-    
-    execDefferedAction: function(svcInfo = null)
-    {
-        let svc_info = this.decodeSvcInfo(svcInfo);
-        //console.log('execDefferedAction: svc_info = '+JSON.stringify(svc_info));
-        let action = localStorage.getItem(this.skey_deffered_action);
-        if (action) {
-            localStorage.removeItem(this.skey_deffered_action);
-            console.log('execDefferedAction: '+action);
-            this.serviceActionEx(action);
-        }
     },
     
     checkUnsavedChanges: function()
@@ -364,8 +320,7 @@ return baseclass.extend({
         return plist;
     },
 
-    decode_svc_info: function(svc_autorun, svc_info, proc_list, cfg = null)
+    decode_svc_info: function(svc_autorun, svc_info, proc_list, cfg) {
-    {
         let result = {
             "autorun": svc_autorun,
             "dmn": {
@@ -386,9 +341,6 @@ return baseclass.extend({
                 return -3;
             }
         }
-        if (svc_info == null) {
-            return null;
-        }
         if (typeof(svc_info) !== 'object') {
             return -4;
         }
@@ -423,7 +375,7 @@ return baseclass.extend({
         let svc_autorun = _('Unknown');
         let svc_daemons = _('Unknown');
         
-        if (typeof(svcinfo) == 'object' && svcinfo?.autorun !== undefined) {
+        if (typeof(svcinfo) == 'object') {
             svc_autorun = (svcinfo.autorun) ? _('Enabled') : _('Disabled');
             if (!svcinfo.dmn.inited) {
                 svc_daemons = _('Stopped');
@@ -700,11 +652,12 @@ return baseclass.extend({
                 if (value != "" && value != "\t") {
                     value = '\n' + value + '\n';
                     if (this.multiline == 2) {
-                        if (value.includes('"')) {
+                        if (value.includes("'") || value.includes('"')) {
                             alert(_('Unable to save the contents') + ':\n' + _('text cannot contain quotes!'));
                             return false;
                         }
                         value = value.replace(/"/g, '');
+                        value = value.replace(/'/g, '');
                     }
                 }
             } else {
@@ -761,7 +714,7 @@ return baseclass.extend({
         },
     }),
 
-    execAndRead: async function({ cmd = [ ], log = '', logArea = null, callback = null, ctx = null, hiderow = [ ], rpc_timeout = 5, rpc_root = false } = {})
+    execAndRead: async function({ cmd = [ ], log = '', logArea = null, callback = null, cbarg = null, hiderow = [ ], rpc_timeout = 5, rpc_root = false } = {})
     {
         function appendLog(msg, end = '\n')
         {
@@ -785,23 +738,23 @@ return baseclass.extend({
             await fs.exec('/bin/busybox', [ 'rm', '-f', logFile + '*' ], null, rpc_opt);
             appendLog('Output file cleared!');
         } catch (e) {
-            return callback.call(ctx, 500, 'ERROR: Failed to clear output file');
+            return callback(cbarg, 500, 'ERROR: Failed to clear output file');
         }
         try {
             let opt_list = [ logFile ];
             opt_list.push(...cmd);
             let res = await fs.exec(this.appDir+'/script-exec.sh', opt_list, null, rpc_opt);
             if (res.code != 0) {
-                return callback.call(ctx, 525, 'ERROR: cannot run "' + cmd[0] + '" script! (error = ' + res.code + ')');
+                return callback(cbarg, 525, 'ERROR: cannot run "' + cmd[0] + '" script! (error = ' + res.code + ')');
             }
             appendLog('Process started...');
         } catch (e) {
-            return callback.call(ctx, 520, 'ERROR: Failed on execute process: ' + e.message);
+            return callback(cbarg, 520, 'ERROR: Failed on execute process: ' + e.message);
         }
         let lastLen = 0;
         let retCode = -1;
         return await new Promise(async (resolve, reject) => {
-            async function epoll()
+            async function poll()
             {
                 try {
                     let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
@@ -817,7 +770,7 @@ return baseclass.extend({
                         let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
                         if (rc.code != 0) {
                             fixLogEnd();
-                            resolve(callback.call(ctx, 545, 'ERROR: cannot read file "' + rcFile + '"'));
+                            resolve(callback(cbarg, 545, 'ERROR: cannot read file "' + rcFile + '"'));
                             return;
                         }
                         if (rc.stdout) {
@@ -827,13 +780,13 @@ return baseclass.extend({
                     if (retCode >= 0) {
                         fixLogEnd();
                         if (retCode == 0 && res.stdout) {
-                            resolve(callback.call(ctx, 0, res.stdout));
+                            resolve(callback(cbarg, 0, res.stdout));
                             return;
                         }
-                        resolve(callback.call(ctx, retCode, 'ERROR: Process failed with error ' + retCode));
+                        resolve(callback(cbarg, retCode, 'ERROR: Process failed with error ' + retCode));
                         return;
                     }
-                    setTimeout(epoll, 500);
+                    setTimeout(poll, 500);
                 } catch (e) {
                     let skip_err = false;
                     if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
@@ -844,152 +797,18 @@ return baseclass.extend({
                     }
                     if (skip_err) {
                         console.warn('WARN: execAndRead: ' + e.message);
-                        setTimeout(epoll, 500);
+                        setTimeout(poll, 500);
-                        return;  // goto next epoll iteration
+                        return;  // goto next poll iteration
                     }
                     fixLogEnd();
                     let errtxt = 'ERROR: execAndRead: ' + e.message;
                     errtxt    += 'ERROR: execAndRead: ' + e.stack?.trim().split('\n')[0];
-                    callback.call(ctx, 540, errtxt);
+                    callback(cbarg, 540, errtxt);
                     reject(e);
                 }
             }
-            epoll();
+            poll();
         });
     },
 
-    POLLER: baseclass.extend({
-        __init__: function(opts = { })
-        {
-            Object.assign(this, {
-                interval: 1000, // milliseconds
-                func: null,
-                active: false,
-                running: false,
-            }, opts);
-            env_tools.load_env(this);
-            this.ticks = 0;
-            this.timer = null;
-            this.mode = 0;
-        },
-
-        init: function(func, interval = null)
-        {
-            this.func = func;
-            if (interval) {
-                this.interval = interval;
-            }
-        },
-
-        start: function(delay = 0)
-        {
-            if (this.active) {
-                return;
-            }
-            this.ticks = 0;
-            this.active = true;
-            if (delay === null) {
-                this.step();
-                delay = this.interval;
-            }
-            this.timer = window.setTimeout(this.step.bind(this), delay);
-            return true;
-        },
-
-        stop: function()
-        {
-            this.active = false;
-            if (this.timer) {
-                window.clearTimeout(this.timer);
-                this.timer = null;
-            }
-        },
-        
-        step: function()
-        {
-            if (!this.active) {
-                return;
-            }
-            if (this.timer) {
-                window.clearTimeout(this.timer);
-            }
-            if (this.mode == 1 && this.running) {
-                this.timer = window.setTimeout(this.step.bind(this), 100);
-                return;
-            }
-            this.ticks += 1;
-            this.running = true;
-            Promise.resolve(this.func()).finally((function() { 
-                if (this.mode == 0) {
-                    this.running = false;
-                }
-                this.timer = null;
-                if (this.active) {
-                    this.timer = window.setTimeout(this.step.bind(this), this.interval);
-                }
-            }).bind(this));
-        },
-
-        stopAndWait: async function(interval = 50)
-        {
-            this.stop();
-            if (!this.running) {
-                return;
-            }
-            return new Promise((resolve) => {
-                if (!this.running) {
-                    return resolve();
-                }
-                const timer = setInterval(() => {
-                    if (!this.running) {
-                        resolve();
-                    }
-                }, interval);
-            });
-        },
-    }),
-
-    // original code: https://github.com/openwrt/luci/blob/95319793a27a3554be06070db8c6db71c6e28df1/modules/luci-base/htdocs/luci-static/resources/ui.js#L5342
-    createHandlerFnEx: function(ctx, fn, opts = { }, ...args)
-    {
-        if (typeof(fn) === 'string') {
-            fn = ctx[fn];
-        }
-        if (typeof(fn) !== 'function') {
-            return null;
-        }
-        const {
-            callback = null,   // callback(btn, result, error)
-            keepDisabled = false,
-            noSpin = false
-        } = opts;
-        return L.bind(function() {
-            const btn = arguments[args.length].currentTarget;
-            if (!noSpin) {
-                btn.classList.add('spinning');
-            }
-            btn.disabled = true;
-            if (btn.blur) btn.blur();
-            let result, error;
-            return Promise
-                .resolve()
-                .then(() => fn.apply(ctx, arguments))
-                .then(r => { result = r; })
-                .catch(e => { error = e; })
-                .finally(() => {
-                    if (!noSpin) {
-                        btn.classList.remove('spinning');
-                    }
-                    if (!keepDisabled) {
-                        btn.disabled = false;
-                    }
-                    if (typeof(callback) === 'function') {
-                        callback.call(ctx, btn, result, error);
-                    }
-                    if (error) {
-                        throw error;
-                    }
-                });
-        }, ctx, ...args);
-    },
 });

luci-app-zapret/htdocs/luci-static/resources/view/zapret/updater.js

@@ -5,7 +5,7 @@
 'require uci';
 'require ui';
 'require view';
-'require view.zapret2.tools as tools';
+'require view.zapret.tools as tools';
 
 const btn_style_neutral  = 'btn';
 const btn_style_action   = 'btn cbi-button-action';
@@ -59,7 +59,7 @@ return baseclass.extend({
             log: '/tmp/'+tools.appName+'_pkg_check.log',
             logArea: this.logArea,
             callback: this.execAndReadCallback,
-            ctx: this,
+            cbarg: this,  // wnd
         });
     },
 
@@ -84,54 +84,54 @@ return baseclass.extend({
             logArea: this.logArea,
             hiderow: /^ \* resolve_conffiles.*(?:\r?\n|$)/gm,
             callback: this.execAndReadCallback,
-            ctx: this,
+            cbarg: this,  // wnd
         });
     },
 
-    execAndReadCallback: function(rc, txt = '')
+    execAndReadCallback: function(wnd, rc, txt = '')
     {
-        //console.log('execAndReadCallback = ' + rc + '; _action = ' + this._action);
+        //console.log('execAndReadCallback = ' + rc + '; _action = ' + wnd._action);
         if (rc == 0 && txt) {
             let code = txt.match(/^RESULT:\s*\(([^)]+)\)\s+.+$/m);
-            if (this._action == 'checkUpdates') {
+            if (wnd._action == 'checkUpdates') {
-                this.appendLog('=========================================================');
+                wnd.appendLog('=========================================================');
                 if (code && code[1] == 'E') {
-                    this.btn_install.textContent = _('Reinstall');
+                    wnd.btn_install.textContent = _('Reinstall');
                 } else {
-                    this.btn_install.textContent = _('Install');
+                    wnd.btn_install.textContent = _('Install');
                 }
                 let pkg_url = txt.match(/^ZAP_PKG_URL\s*=\s*(.+)$/m);
                 if (code && pkg_url) {
-                    if (!this.forced_reinstall) {
+                    if (!wnd.forced_reinstall) {
                         if (code[1] == 'E' || code[1] == 'G') {
-                            this.setStage(0);  // install not needed
+                            wnd.setStage(0);  // install not needed
                             return;
                         }
                     }
-                    this.pkg_url = pkg_url[1];
+                    wnd.pkg_url = pkg_url[1];
-                    this.setStage(2);  // enable all buttons
+                    wnd.setStage(2);  // enable all buttons
                     return;  // install allowed
                 }
             }
-            if (this._action == 'installUpdates') {
+            if (wnd._action == 'installUpdates') {
-                if (this._test || (code && code[1] == '+')) {
+                if (wnd._test || (code && code[1] == '+')) {
-                    this.setStage(9);
+                    wnd.setStage(9);
-                    this.appendLog('Please update WEB-page (press F5)');
+                    wnd.appendLog('Please update WEB-page (press F5)');
                     return;
                 }
             }
         }
-        this.setStage(0);
+        wnd.setStage(0);
         if (rc >= 500) {
             if (txt) {
-                this.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
+                wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
             } else {
-                this.appendLog('ERROR: ' + this._action + ': Terminated with error code = ' + rc);
+                wnd.appendLog('ERROR: ' + wnd._action + ': Terminated with error code = ' + rc);
             }
         } else {
-            this.appendLog('ERROR: Process finished with retcode = ' + rc);
+            wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
         }
-        this.appendLog('=========================================================');
+        wnd.appendLog('=========================================================');
     },
 
     openUpdateDialog: function(pkg_arch)

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"
+		}
+	}
+}

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" ]
+		}
+	}
+}

luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/env.js

@@ -1,69 +0,0 @@
-'use strict';
-'require baseclass';
-
-return baseclass.extend({
-    packager          : { },
-    appName           : 'zapret2',
-    AppName           : 'Zapret2',
-    execPath          : '/etc/init.d/zapret2',
-    appDir            : '/opt/zapret2',
-    syncCfgPath       : '/opt/zapret2/sync_config.sh',
-    defCfgPath        : '/opt/zapret2/def-cfg.sh',
-    defaultCfgPath    : '/opt/zapret2/restore-def-cfg.sh',
-
-    hostsGoogleFN     : '/opt/zapret2/ipset/zapret-hosts-google.txt',
-    hostsUserFN       : '/opt/zapret2/ipset/zapret-hosts-user.txt',
-    hostsUserExcludeFN: '/opt/zapret2/ipset/zapret-hosts-user-exclude.txt',
-    iplstExcludeFN    : '/opt/zapret2/ipset/zapret-ip-exclude.txt',
-    iplstUserFN       : '/opt/zapret2/ipset/zapret-ip-user.txt',
-    iplstUserExcludeFN: '/opt/zapret2/ipset/zapret-ip-user-exclude.txt',
-    custFileMax       : 4,
-    custFileTemplate  : '/opt/zapret2/ipset/cust%s.txt',
-    customdPrefixList : [ 10, 20, 50, 60, 90 ] ,
-    customdFileFormat : '/opt/zapret2/init.d/openwrt/custom.d/%s-script.sh',
-    discord_num       : 50,
-    discord_url       : [ 'https://github.com/bol-van/zapret2/blob/master/init.d/custom.d.examples.linux/50-discord-media',
-                          'https://github.com/bol-van/zapret2/blob/master/init.d/custom.d.examples.linux/50-stun4all',
-                          'https://github.com/bol-van/zapret2/tree/master/init.d/custom.d.examples.linux'
-                        ],
-    nfqws_opt_url     : 'https://github.com/remittor/zapret-openwrt/discussions/',
-
-    autoHostListFN    : '/opt/zapret2/ipset/zapret-hosts-auto.txt',
-    autoHostListDbgFN : '/opt/zapret2/ipset/zapret-hosts-auto-debug.log',
-
-    load_env: function(ctx)
-    {
-        let env_proto = Object.getPrototypeOf(this);
-        Object.getOwnPropertyNames(env_proto).forEach(function(key) {
-            if (key === 'constructor' || key.startsWith('__')) {
-                return;
-            }
-            if (key === 'load_env' || key === 'load_feat_env') {
-                return;
-            }
-            ctx[key] = env_proto[key];
-        });
-        ctx.skey_pkg_dict = this.appName + '-pkg-dict';
-        ctx.skey_deffered_action = this.appName + '-deffered-action';
-        try {
-            L.hasSystemFeature('opkg');
-            this.load_feat_env(ctx);
-        } catch(e) {
-            // nothing
-        }
-    },
-    
-    load_feat_env: function(ctx)
-    {
-        ctx.packager = { };
-        if (L.hasSystemFeature('apk')) {
-            ctx.packager.name = 'apk';
-            ctx.packager.path = '/usr/bin/apk';
-            ctx.packager.args = [ 'list', '-I', '*'+this.appName+'*' ];
-        } else {
-            ctx.packager.name = 'opkg';
-            ctx.packager.path = '/bin/opkg';
-            ctx.packager.args = [ 'list-installed', '*'+this.appName+'*' ];
-        }
-    },
-});

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"
-		}
-	}
-}

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" ]
-		}
-	}
-}

zapret/Makefile

@@ -1,55 +1,40 @@
 #
-# Copyright (c) 2025 remittor
+# Copyright (c) 2024 remittor
 #
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=zapret2
+PKG_NAME:=zapret
-PKG_VERSION:=0.8.20260125
+PKG_VERSION:=72.20260126
 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_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8b11d6c279c737bf78496d04c0261bd3e2c4327f
+PKG_SOURCE_VERSION:=119e243b3664d6a512ed8b6ab61dcba00987105c
-PKG_SOURCE_DATE:=2026-01-25
+PKG_SOURCE_DATE:=2026-01-26
 
 #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_SOURCE_URL:=https://github.com/bol-van/zapret/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.5
-	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
+MAKE_PATH:=nfq
 
 define Package/$(PKG_NAME)
 	SECTION:=net
 	CATEGORY:=Network
 	TITLE:=$(PKG_NAME)
-	SUBMENU:=Zapret2
+	SUBMENU:=Zapret
-	URL:=https://github.com/bol-van/zapret2
+	URL:=https://github.com/bol-van/zapret
-	DEPENDS:= +nftables +curl +gzip +$(LUA_DEPEND)
+	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
@@ -57,7 +42,7 @@ endef
 
 define Build/Prepare
 	$(Build/Prepare/Default)
-	rm -f $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws2
+	rm -f $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws
 	rm -f $(PKG_BUILD_DIR)/ip2net/ip2net
 	rm -f $(PKG_BUILD_DIR)/mdig/mdig
 endef
@@ -66,12 +51,12 @@ endef
 #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)/$(MAKE_PATH) $(TARGET_CONFIGURE_OPTS)
 	$(MAKE) -C $(PKG_BUILD_DIR)/ip2net $(TARGET_CONFIGURE_OPTS)
 	$(MAKE) -C $(PKG_BUILD_DIR)/mdig $(TARGET_CONFIGURE_OPTS)
 endef
 
-ZAPRET_DIR := /opt/zapret2
+ZAPRET_DIR := /opt/zapret
 
 define ZAPRET_CONFFILES_LIST
 $(ZAPRET_DIR)/config
@@ -100,37 +85,33 @@ endef
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/$(MAKE_PATH)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws2 $(1)$(ZAPRET_DIR)/$(MAKE_PATH)/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws $(1)$(ZAPRET_DIR)/$(MAKE_PATH)/
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/ip2net
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip2net/ip2net $(1)$(ZAPRET_DIR)/ip2net/
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/mdig
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdig/mdig $(1)$(ZAPRET_DIR)/mdig/
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/common
 	$(CP) $(PKG_BUILD_DIR)/common/* $(1)$(ZAPRET_DIR)/common/
-	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/lua
+	#$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/docs
-	$(CP) $(PKG_BUILD_DIR)/lua/* $(1)$(ZAPRET_DIR)/lua/
-	#$(INSTALL_DIR) $(1)$(ZAPRET_DIR)docs
 	#$(CP) $(PKG_BUILD_DIR)/docs/* $(1)$(ZAPRET_DIR)/docs/
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/files
 	$(CP) $(PKG_BUILD_DIR)/files/* $(1)$(ZAPRET_DIR)/files/
 	$(CP)                ./files/* $(1)$(ZAPRET_DIR)/files/
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/ipset
 	$(CP) $(PKG_BUILD_DIR)/ipset/* $(1)$(ZAPRET_DIR)/ipset/
-	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/blockcheck2.d
+	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/blockcheck.sh  $(1)$(ZAPRET_DIR)/blockcheck.sh
-	$(CP) $(PKG_BUILD_DIR)/blockcheck2.d/* $(1)$(ZAPRET_DIR)/blockcheck2.d/
-	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/blockcheck2.sh  $(1)$(ZAPRET_DIR)/blockcheck2.sh
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/tmp
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d/openwrt
 	$(CP) $(PKG_BUILD_DIR)/init.d/openwrt/* $(1)$(ZAPRET_DIR)/init.d/openwrt/
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/openwrt/90-zapret2 $(1)/etc/hotplug.d/iface/90-zapret2
+	$(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/zapret2
+	$(INSTALL_BIN) ./init.d.sh $(1)/etc/init.d/zapret
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d/openwrt
 	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d/openwrt/custom.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./uci-def-cfg.sh     $(1)/etc/uci-defaults/zapret2-uci-def-cfg.sh
+	$(INSTALL_BIN) ./uci-def-cfg.sh     $(1)/etc/uci-defaults/zapret-uci-def-cfg.sh
 	# install all sh-scripts
 	$(CP) ./*.sh $(1)$(ZAPRET_DIR)/
 	rm -f $(1)$(ZAPRET_DIR)/init.d.sh
@@ -166,19 +147,21 @@ define Package/$(PKG_NAME)/install
 	chmod 755 $(1)$(ZAPRET_DIR)/$(MAKE_PATH)/*
 	chmod 755 $(1)$(ZAPRET_DIR)/ip2net/*
 	chmod 755 $(1)$(ZAPRET_DIR)/mdig/*
+	# Disable TPWS in blockcheck
+	grep -q '^SKIP_TPWS=' $(1)$(ZAPRET_DIR)/blockcheck.sh || sed -i '/^NFT_TABLE=blockcheck$$$$/a SKIP_TPWS=$$$${SKIP_TPWS:-1}' $(1)$(ZAPRET_DIR)/blockcheck.sh
 endef
 
 define Package/$(PKG_NAME)/preinst
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	ZAPRET_DIR=/opt/zapret2
+	ZAPRET_DIR=/opt/zapret
-	ZAPRET_INITD=/etc/init.d/zapret2
+	ZAPRET_INITD=/etc/init.d/zapret
-	ZAPRET_CFG=/etc/config/zapret2
+	ZAPRET_CFG=/etc/config/zapret
 	if [ -f "$${ZAPRET_INITD}" ]; then
 		SCRIPT=$$( readlink "$${ZAPRET_INITD}" )
 		if [ -n "$${SCRIPT}" ]; then
-			echo "Please uninstall incompatible \"zapret2\" service!"
+			echo "Please uninstall incompatible \"zapret\" service!"
 			exit 44
 		fi
 	fi
@@ -197,20 +180,20 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 			$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
 		fi
 	fi
-	if $${PKG_CHECK} zapret2 >/dev/null 2>&1; then
+	if $${PKG_CHECK} zapret >/dev/null 2>&1; then
-		if [ ! -f "/opt/zapret2/sync_config.sh" ]; then
+		if [ ! -f "/opt/zapret/sync_config.sh" ]; then
-			echo "Please uninstall incompatible \"zapret2\" package!"
+			echo "Please uninstall incompatible \"zapret\" package!"
 			exit 47
 		fi
 		if [ -f "$${ZAPRET_CFG}" ] && ! grep -q "run_on_boot" "$${ZAPRET_CFG}"; then
-			echo "Please uninstall incompatible \"zapret2\" package!"
+			echo "Please uninstall incompatible \"zapret\" package!"
 			exit 48
 		fi
 	fi
-	if $${PKG_CHECK} luci-app-zapret2 >/dev/null 2>&1; then
+	if $${PKG_CHECK} luci-app-zapret >/dev/null 2>&1; then
-		SVC_FILE=/www/luci-static/resources/view/zapret2/service.js
+		SVC_FILE=/www/luci-static/resources/view/zapret/service.js
 		if [ ! -f "$${SVC_FILE}" ] || ! grep -Fq "/remittor/zapret-openwrt" "$${SVC_FILE}"; then
-			echo "Please uninstall incompatible \"luci-app-zapret2\" package!"
+			echo "Please uninstall incompatible \"luci-app-zapret\" package!"
 			exit 55
 		fi
 	fi
@@ -223,15 +206,23 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 		[ -d "$${ZAPRET_DIR}" ] && rm -rf $${ZAPRET_DIR}
 		echo "All files of the previously installed package have been removed!"
 	fi
-	if $${PKG_CHECK} zapret2-mdig >/dev/null 2>&1; then
+	if $${PKG_CHECK} zapret-mdig >/dev/null 2>&1; then
-		$${PKG_REMOVE} zapret2-mdig
+		$${PKG_REMOVE} zapret-mdig
 	fi
-	if $${PKG_CHECK} zapret2-ip2net >/dev/null 2>&1; then
+	if $${PKG_CHECK} zapret-ip2net >/dev/null 2>&1; then
-		$${PKG_REMOVE} zapret2-ip2net
+		$${PKG_REMOVE} zapret-ip2net
 	fi
 	if [ ! -d "$${ZAPRET_DIR}" ]; then
 		mkdir -p $${ZAPRET_DIR}
 	fi
+	if [ ! -f "/opt/zapret/ipset/zapret-hosts-google.txt" ]; then
+		if [ -f "/opt/zapret/ipset/zapret-hosts-user.txt" ]; then
+			CFGLISTHASH=$$( md5sum "/opt/zapret/ipset/zapret-hosts-user.txt" | awk '{print $$1;}' )
+			if [ "$${CFGLISTHASH}" = "79e35df62b0d1ae455d0a7e04c4cecac" ]; then
+				rm -f "/opt/zapret/ipset/zapret-hosts-user.txt"
+			fi
+		fi
+	fi
 fi
 exit 0
 endef
@@ -240,11 +231,11 @@ define Package/$(PKG_NAME)/postinst
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	ZAPRET_DIR=/opt/zapret2
+	ZAPRET_DIR=/opt/zapret
-	ZAPRET_INITD=/etc/init.d/zapret2
+	ZAPRET_INITD=/etc/init.d/zapret
-	ZAPRET_CFG=/etc/config/zapret2
+	ZAPRET_CFG=/etc/config/zapret
-	ZAPRET_CONFIG=/opt/zapret2/config
+	ZAPRET_CONFIG=/opt/zapret/config
-	ZAPRET_CONFIG_DEF="/opt/zapret2/config.default"
+	ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
 	# Fix permissions
 	chmod 644 $${ZAPRET_CFG} >/dev/null 2>&1
 	chmod 644 $${ZAPRET_DIR}/ipset/*.txt >/dev/null 2>&1
@@ -259,17 +250,25 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	if [ ! -f "$${ZAPRET_CONFIG}" ]; then
 		cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
 	fi
+	# check obsolete format for main config
+	if grep -qE "^NFQWS_OPT_DESYNC=|^MODE_HTTP=|^MODE_HTTPS=|^MODE_QUIC=|^MODE=" "$${ZAPRET_CONFIG}" ; then
+		echo "Detect obsolute format for main config!"
+		ZAPRET_CONFIG_BACKUP="$${ZAPRET_CONFIG}.backup"
+		cp -f "$${ZAPRET_CONFIG}" "$${ZAPRET_CONFIG_BACKUP}"
+		echo "Current file $${ZAPRET_CONFIG} backuped to $${ZAPRET_CONFIG_BACKUP}"
+		cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
+	fi
 	# remove fake uci-config
 	[ -f "$${ZAPRET_CFG}" ] && [ ! -s "$${ZAPRET_CFG}" ] && rm -f "$${ZAPRET_CFG}"
 	# check existing uci-config
 	[ -f "$${ZAPRET_CFG}" ] && ZAPRET_CFG_EXISTS=1 || ZAPRET_CFG_EXISTS=0
 	# create or merge uci-config
-	/opt/zapret2/uci-def-cfg.sh
+	/opt/zapret/uci-def-cfg.sh
-	[ "$${ZAPRET_CFG_EXISTS}" = "1" ] && echo "Config /etc/config/zapret2 merged with default uci-config"
+	[ "$${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/zapret2-uci-def-cfg.sh
+	rm -f /etc/uci-defaults/zapret-uci-def-cfg.sh
 	# copy (sync) all params from uci-config to main config
-	/opt/zapret2/sync_config.sh
+	/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
@@ -278,7 +277,7 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	# stop all
 	$${ZAPRET_INITD} stop_fw >/dev/null 2>&1
 	$${ZAPRET_INITD} stop_daemons >/dev/null 2>&1
-	ps w | grep '/opt/zapret2/nfq2/nfqws2' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
+	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
 	# start main service
 	$${ZAPRET_INITD} start
 	# restart firewall
@@ -291,17 +290,17 @@ define Package/$(PKG_NAME)/prerm
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	ZAPRET_DIR=/opt/zapret2
+	ZAPRET_DIR=/opt/zapret
-	ZAPRET_BASE=/opt/zapret2
+	ZAPRET_BASE=/opt/zapret
-	ZAPRET_INITD=/etc/init.d/zapret2
+	ZAPRET_INITD=/etc/init.d/zapret
-	ZAPRET_CFG=/etc/config/zapret2
+	ZAPRET_CFG=/etc/config/zapret
-	ZAPRET_CONFIG=/opt/zapret2/config
+	ZAPRET_CONFIG=/opt/zapret/config
-	ZAPRET_CONFIG_DEF="/opt/zapret2/config.default"
+	ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
-	OPENWRT_FW_INCLUDE=/etc/firewall.zapret2
+	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/zapret2/nfq2/nfqws2' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
+		ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
 		exit 0
 	fi
 	. "$${ZAPRET_CONFIG}"
@@ -311,7 +310,7 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	. "$${ZAPRET_BASE}/common/installer.sh"
 	$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
 	$${ZAPRET_INITD} disable >/dev/null 2>&1
-	ps w | grep '/opt/zapret2/nfq2/nfqws2' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
+	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
@@ -323,12 +322,12 @@ define Package/$(PKG_NAME)/postrm
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	rm -f /etc/config/zapret2-opkg*
+	rm -f /etc/config/zapret-opkg*
-	rm -f /etc/config/zapret2.opkg*
+	rm -f /etc/config/zapret.opkg*
-	rm -f /etc/config/zapret2.apk*
+	rm -f /etc/config/zapret.apk*
-	[ -f "/opt/zapret2/config" ] && cp -f /opt/zapret2/config "/opt/zapret2/config.backup"
+	[ -f "/opt/zapret/config" ] && cp -f /opt/zapret/config "/opt/zapret/config.backup"
-	#rm -rf /opt/zapret2
+	#rm -rf /opt/zapret
-	#echo "Directory /opt/zapret2 removed!"
+	#echo "Directory /opt/zapret removed!"
 fi
 exit 0
 endef

zapret/comfunc.sh

@@ -1,20 +1,20 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor
 
-EXEDIR=/opt/zapret2
+EXEDIR=/opt/zapret
-ZAPRET_BASE=/opt/zapret2
+ZAPRET_BASE=/opt/zapret
 
-ZAPRET_INITD=/etc/init.d/zapret2
+ZAPRET_INITD=/etc/init.d/zapret
-ZAPRET_ORIG_INITD="$ZAPRET_BASE/init.d/openwrt/zapret2"
+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=/etc/config/zapret
-ZAPRET_CFG_NAME=zapret2
+ZAPRET_CFG_NAME=zapret
 ZAPRET_CFG_SEC=$ZAPRET_CFG_NAME.config
 ZAPRET_CFG_SEC_NAME="$( uci -q get $ZAPRET_CFG_SEC )"
 

zapret/config.default

@@ -30,25 +30,14 @@ IP2NET_OPT4="--prefix-length=22-30 --v4-threshold=3/4"
 IP2NET_OPT6="--prefix-length=56-64 --v6-threshold=5"
 
 # options for auto hostlist
-# NOTE : in order for these adjustment to work it's required to redirect enough starting packets
-# NOTE : set PKT_IN, PKT_OUT variables appropriately
-AUTOHOSTLIST_INCOMING_MAXSEQ=4096
-AUTOHOSTLIST_RETRANS_MAXSEQ=32768
-AUTOHOSTLIST_RETRANS_RESET=1
 AUTOHOSTLIST_RETRANS_THRESHOLD=3
 AUTOHOSTLIST_FAIL_THRESHOLD=3
 AUTOHOSTLIST_FAIL_TIME=60
-AUTOHOSTLIST_UDP_IN=1
-AUTOHOSTLIST_UDP_OUT=4
 # 1 = debug autohostlist positives to ipset/zapret-hosts-auto-debug.log
 AUTOHOSTLIST_DEBUGLOG=0
 
 # number of parallel threads for domain list resolves
 MDIG_THREADS=30
-# EAI_AGAIN retries
-MDIG_EAGAIN=10
-# delay between EAI_AGAIN retries (ms)
-MDIG_EAGAIN_DELAY=500
 
 # ipset/*.sh can compress large lists
 GZIP_LISTS=0
@@ -74,30 +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"
+NFQWS_PORTS_TCP="80,443"
-NFQWS2_PORTS_UDP="443"
+NFQWS_PORTS_UDP="443"
 
 # PKT_OUT means connbytes dir original
 # PKT_IN means connbytes dir reply
-NFQWS2_TCP_PKT_OUT="20"
+# this is --dpi-desync-cutoff=nX kernel mode implementation for linux. it saves a lot of CPU.
-NFQWS2_TCP_PKT_IN="10"
+NFQWS_TCP_PKT_OUT="9"
-NFQWS2_UDP_PKT_OUT="5"
+NFQWS_TCP_PKT_IN="3"
-NFQWS2_UDP_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=""
+NFQWS_PORTS_TCP_KEEPALIVE=""
-NFQWS2_PORTS_UDP_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
@@ -115,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"
 
@@ -125,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_PRE_UP_HOOK="/etc/firewall.zapret.hook.pre_up"
-#INIT_FW_POST_UP_HOOK="/etc/firewall.zapret2.hook.post_up"
+#INIT_FW_POST_UP_HOOK="/etc/firewall.zapret.hook.post_up"
-#INIT_FW_PRE_DOWN_HOOK="/etc/firewall.zapret2.hook.pre_down"
+#INIT_FW_PRE_DOWN_HOOK="/etc/firewall.zapret.hook.pre_down"
-#INIT_FW_POST_DOWN_HOOK="/etc/firewall.zapret2.hook.post_down"
+#INIT_FW_POST_DOWN_HOOK="/etc/firewall.zapret.hook.post_down"
 
 # do not work with ipv4
 DISABLE_IPV4=0
@@ -149,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"

zapret/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

zapret/def-cfg.sh

@@ -0,0 +1,458 @@
+#!/bin/sh
+# Copyright (c) 2024 remittor
+
+function set_cfg_reset_values
+{
+	local cfgname=${1:-$ZAPRET_CFG_NAME}
+	local TAB="$( printf '\t' )"
+	uci batch <<-EOF
+		set $cfgname.config.run_on_boot='0'
+		# settings for zapret service
+		set $cfgname.config.FWTYPE='nftables'
+		set $cfgname.config.POSTNAT='1'
+		set $cfgname.config.FLOWOFFLOAD='none'
+		set $cfgname.config.INIT_APPLY_FW='1'
+		set $cfgname.config.DISABLE_IPV4='0'
+		set $cfgname.config.DISABLE_IPV6='1'
+		set $cfgname.config.FILTER_TTL_EXPIRED_ICMP='1'
+		set $cfgname.config.MODE_FILTER='hostlist'
+		set $cfgname.config.DISABLE_CUSTOM='1'
+		set $cfgname.config.WS_USER='daemon'
+		set $cfgname.config.DAEMON_LOG_ENABLE='0'
+		set $cfgname.config.DAEMON_LOG_FILE='/tmp/zapret+<DAEMON_NAME>+<DAEMON_IDNUM>+<DAEMON_CFGNAME>.log'
+		# autohostlist options
+		set $cfgname.config.AUTOHOSTLIST_RETRANS_THRESHOLD='3'
+		set $cfgname.config.AUTOHOSTLIST_FAIL_THRESHOLD='3'
+		set $cfgname.config.AUTOHOSTLIST_FAIL_TIME='60'
+		set $cfgname.config.AUTOHOSTLIST_DEBUGLOG='0'
+		# nfqws options
+		set $cfgname.config.NFQWS_ENABLE='1'
+		set $cfgname.config.DESYNC_MARK='0x40000000'
+		set $cfgname.config.DESYNC_MARK_POSTNAT='0x20000000'
+		set $cfgname.config.FILTER_MARK='$TAB'
+		set $cfgname.config.NFQWS_PORTS_TCP='80,443'
+		set $cfgname.config.NFQWS_PORTS_UDP='443'
+		set $cfgname.config.NFQWS_TCP_PKT_OUT='9'
+		set $cfgname.config.NFQWS_TCP_PKT_IN='3'
+		set $cfgname.config.NFQWS_UDP_PKT_OUT='9'
+		set $cfgname.config.NFQWS_UDP_PKT_IN='0'
+		set $cfgname.config.NFQWS_PORTS_TCP_KEEPALIVE='0'
+		set $cfgname.config.NFQWS_PORTS_UDP_KEEPALIVE='0'
+		# save changes
+		commit $cfgname
+	EOF
+	return 0
+}
+
+function clear_nfqws_strat
+{
+	local cfgname=${1:-$ZAPRET_CFG_NAME}
+	local TAB="$( printf '\t' )"
+	uci batch <<-EOF
+		set $cfgname.config.MODE_FILTER='hostlist'
+		set $cfgname.config.NFQWS_PORTS_TCP='80,443'
+		set $cfgname.config.NFQWS_PORTS_UDP='443'
+		set $cfgname.config.NFQWS_OPT='$TAB'
+		commit $cfgname
+	EOF
+}
+
+function set_cfg_nfqws_strat
+{
+	local strat=${1:--}
+	local cfgname=${2:-$ZAPRET_CFG_NAME}
+	local TAB="$( printf '\t' )"
+    
+	uci batch <<-EOF
+		set $cfgname.config.MODE_FILTER='hostlist'
+		commit $cfgname
+	EOF
+	if [ "$strat" = "empty" ]; then
+		clear_nfqws_strat $cfgname
+	fi
+	if [ "$strat" = "v1_by_StressOzz" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
+			set $cfgname.config.NFQWS_PORTS_UDP='443'
+			set $cfgname.config.NFQWS_OPT="
+				--comment=Strategy__$strat
+				
+				--filter-tcp=443 <HOSTLIST>
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--dpi-desync=fake,multidisorder
+				--dpi-desync-split-seqovl=681
+				--dpi-desync-split-pos=1
+				--dpi-desync-fooling=badseq
+				--dpi-desync-badseq-increment=10000000
+				--dpi-desync-repeats=2
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=fonts.google.com
+				
+				--new
+				--filter-udp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
+			"
+			commit $cfgname
+		EOF
+	fi
+	if [ "$strat" = "v2_by_StressOzz" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
+			set $cfgname.config.NFQWS_PORTS_UDP='443'
+			set $cfgname.config.NFQWS_OPT="
+				--comment=Strategy__$strat
+				
+				--filter-tcp=443 <HOSTLIST>
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--hostlist-exclude-domains=openwrt.org
+				--dpi-desync=fake,fakeddisorder
+				--dpi-desync-split-pos=10,midsld
+				--dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=fonts.google.com
+				--dpi-desync-fake-tls=0x0F0F0F0F
+				--dpi-desync-fake-tls-mod=none
+				--dpi-desync-fakedsplit-pattern=/opt/zapret/files/fake/tls_clienthello_vk_com.bin
+				--dpi-desync-split-seqovl=336
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_gosuslugi_ru.bin
+				--dpi-desync-fooling=badseq,badsum
+				--dpi-desync-badseq-increment=0
+				
+				--new
+				--filter-udp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
+			"
+			commit $cfgname
+		EOF
+	fi
+	if [ "$strat" = "v3_by_StressOzz" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
+			set $cfgname.config.NFQWS_PORTS_UDP='443'
+			set $cfgname.config.NFQWS_OPT="
+				--comment=Strategy__$strat
+				
+				--filter-tcp=443 <HOSTLIST>
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--hostlist-exclude-domains=openwrt.org
+				--dpi-desync=fake,fakeddisorder
+				--dpi-desync-split-pos=10,midsld
+				--dpi-desync-fake-tls=/opt/zapret/files/fake/t2.bin
+				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=m.ok.ru
+				--dpi-desync-fake-tls=0x0F0F0F0F
+				--dpi-desync-fake-tls-mod=none
+				--dpi-desync-fakedsplit-pattern=/opt/zapret/files/fake/tls_clienthello_vk_com.bin
+				--dpi-desync-split-seqovl=336
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_gosuslugi_ru.bin
+				--dpi-desync-fooling=badseq,badsum
+				--dpi-desync-badseq-increment=0
+				
+				--new
+				--filter-udp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
+			"
+			commit $cfgname
+		EOF
+	fi
+	if [ "$strat" = "v4_by_StressOzz" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
+			set $cfgname.config.NFQWS_PORTS_UDP='443'
+			set $cfgname.config.NFQWS_OPT="
+				--comment=Strategy__$strat
+				
+				--filter-tcp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
+				--hostlist-exclude-domains=openwrt.org
+				--dpi-desync=fake,multisplit
+				--dpi-desync-split-pos=2,sld
+				--dpi-desync-fake-tls=0x0F0F0F0F
+				--dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=google.com
+				--dpi-desync-split-seqovl=2108
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				--dpi-desync-fooling=badseq
+				
+				--new
+				--filter-tcp=443 <HOSTLIST>
+				--hostlist-exclude-domains=openwrt.org
+				--dpi-desync-any-protocol=1
+				--dpi-desync-cutoff=n5
+				--dpi-desync=multisplit
+				--dpi-desync-split-seqovl=582
+				--dpi-desync-split-pos=1
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/4pda.bin
+				
+				--new
+				--filter-udp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
+			"
+			commit $cfgname
+		EOF
+	fi
+	if [ "$strat" = "v5_by_StressOzz" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
+			set $cfgname.config.NFQWS_PORTS_UDP='443'
+			set $cfgname.config.NFQWS_OPT="
+				--comment=Strategy__$strat
+				
+				--filter-tcp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
+				--hostlist-exclude-domains=openwrt.org
+				--ip-id=zero
+				--dpi-desync=multisplit
+				--dpi-desync-split-seqovl=681
+				--dpi-desync-split-pos=1
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				
+				--new
+				--filter-tcp=443 <HOSTLIST>
+				--hostlist-exclude-domains=openwrt.org
+				--dpi-desync=fake,fakeddisorder
+				--dpi-desync-split-pos=10,midsld
+				--dpi-desync-fake-tls=/opt/zapret/files/fake/max.bin
+				--dpi-desync-fake-tls-mod=rnd,dupsid
+				--dpi-desync-fake-tls=0x0F0F0F0F
+				--dpi-desync-fake-tls-mod=none
+				--dpi-desync-fakedsplit-pattern=/opt/zapret/files/fake/tls_clienthello_vk_com.bin
+				--dpi-desync-fooling=badseq,badsum
+				--dpi-desync-badseq-increment=0
+				
+				--new
+				--filter-udp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
+			"
+			commit $cfgname
+		EOF
+	fi
+	if [ "$strat" = "v6_by_StressOzz" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS_PORTS_TCP='80,443,2053,2083,2087,2096,8443'
+			set $cfgname.config.NFQWS_PORTS_UDP='443,19294-19344,50000-50100'
+			set $cfgname.config.NFQWS_OPT="
+				--comment=Strategy__$strat
+				
+				--filter-tcp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--dpi-desync=multisplit
+				--dpi-desync-split-pos=1,sniext+1
+				--dpi-desync-split-seqovl=1
+
+				--new
+				--filter-tcp=443 <HOSTLIST>
+				--dpi-desync=hostfakesplit
+				--dpi-desync-hostfakesplit-mod=host=rzd.ru
+				--dpi-desync-hostfakesplit-midhost=host-2
+				--dpi-desync-split-seqovl=726
+				--dpi-desync-fooling=badsum,badseq
+				--dpi-desync-badseq-increment=0
+
+				--new
+				--filter-udp=443 <HOSTLIST_NOAUTO>
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
+
+				--new
+				--filter-udp=19294-19344,50000-50100
+				--filter-l7=discord,stun
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+
+				--new
+				--filter-tcp=2053,2083,2087,2096,8443
+				--hostlist-domains=discord.media
+				--dpi-desync=multisplit
+				--dpi-desync-split-seqovl=652
+				--dpi-desync-split-pos=2
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+			"
+			commit $cfgname
+		EOF
+	fi
+	if [ "$strat" = "v7_by_StressOzz" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS_PORTS_TCP='80,443,2053,2083,2087,2096,8443'
+			set $cfgname.config.NFQWS_PORTS_UDP='443,19294-19344,50000-50100'
+			set $cfgname.config.NFQWS_OPT="
+				--comment=Strategy__$strat
+				
+				--filter-tcp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--dpi-desync=fake,multisplit
+				--dpi-desync-split-pos=2,sld
+				--dpi-desync-fake-tls=0x0F0F0F0F
+				--dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=ggpht.com
+				--dpi-desync-split-seqovl=620
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				--dpi-desync-fooling=badsum,badseq
+
+				--new
+				--filter-tcp=443 <HOSTLIST>
+				--dpi-desync=fake,multisplit
+				--dpi-desync-split-seqovl=654
+				--dpi-desync-split-pos=1
+				--dpi-desync-fooling=ts
+				--dpi-desync-repeats=8
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/max.bin
+				--dpi-desync-fake-tls=/opt/zapret/files/fake/max.bin
+
+				--new
+				--filter-udp=443 <HOSTLIST_NOAUTO>
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
+
+				--new
+				--filter-udp=19294-19344,50000-50100
+				--filter-l7=discord,stun
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+
+				--new
+				--filter-tcp=2053,2083,2087,2096,8443
+				--hostlist-domains=discord.media
+				--dpi-desync=multisplit
+				--dpi-desync-split-seqovl=652
+				--dpi-desync-split-pos=2
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+			"
+			commit $cfgname
+		EOF
+	fi
+	if [ "$strat" = "ALT7_by_Flowseal" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
+			set $cfgname.config.NFQWS_PORTS_UDP='443'
+			set $cfgname.config.NFQWS_OPT="
+				--comment=Strategy__$strat
+				
+				--filter-tcp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
+				--hostlist-exclude-domains=openwrt.org
+				--ip-id=zero
+				--dpi-desync=multisplit
+				--dpi-desync-split-pos=2,sniext+1
+				--dpi-desync-split-seqovl=679
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				
+				--new
+				--filter-tcp=80,443 <HOSTLIST>
+				--hostlist-exclude-domains=openwrt.org
+				--dpi-desync=multisplit
+				--dpi-desync-split-pos=2,sniext+1
+				--dpi-desync-split-seqovl=679
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				
+				--new
+				--filter-udp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
+			"
+			commit $cfgname
+		EOF
+	fi
+	if [ "$strat" = "TLS_AUTO_ALT3_by_Flowseal" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
+			set $cfgname.config.NFQWS_PORTS_UDP='443'
+			set $cfgname.config.NFQWS_OPT="
+				--comment=Strategy__$strat
+				
+				--filter-tcp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
+				--hostlist-exclude-domains=openwrt.org
+				--ip-id=zero
+				--dpi-desync=fake,multisplit
+				--dpi-desync-split-seqovl=681
+				--dpi-desync-split-pos=1
+				--dpi-desync-fooling=ts
+				--dpi-desync-repeats=8
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=www.google.com
+				
+				--new
+				--filter-tcp=80,443 <HOSTLIST>
+				--hostlist-exclude-domains=openwrt.org
+				--dpi-desync=fake,multisplit
+				--dpi-desync-split-seqovl=681
+				--dpi-desync-split-pos=1
+				--dpi-desync-fooling=ts
+				--dpi-desync-repeats=8
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=www.google.com
+				
+				--new
+				--filter-udp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
+				--dpi-desync=fake
+				--dpi-desync-repeats=11
+				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
+			"
+			commit $cfgname
+		EOF
+	fi
+	return 0
+}
+
+function set_cfg_default_values
+{
+	local opt_flags=${1:--}
+	local opt_strat=${2:-v6_by_StressOzz}
+	local cfgname=${3:-$ZAPRET_CFG_NAME}
+
+	if ! echo "$opt_flags" | grep -q "(skip_base)"; then
+		set_cfg_reset_values $cfgname
+	fi
+	if [ "$opt_strat" != "-" ]; then
+		set_cfg_nfqws_strat "$opt_strat" $cfgname
+	fi
+	if echo "$opt_flags" | grep -q "(set_mode_autohostlist)"; then
+		uci batch <<-EOF
+			set $cfgname.config.MODE_FILTER='autohostlist'
+			commit $cfgname
+		EOF
+	fi
+	if echo "$opt_flags" | grep -q "(enable_custom_d)"; then
+		uci batch <<-EOF
+			set $cfgname.config.DISABLE_CUSTOM='0'
+			commit $cfgname
+		EOF
+	fi
+	if echo "$opt_flags" | grep -q "(disable_custom_d)"; then
+		uci batch <<-EOF
+			set $cfgname.config.DISABLE_CUSTOM='1'
+			commit $cfgname
+		EOF
+	fi
+	return 0
+}

zapret/dwc.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright (c) 2026 remittor
 
-ZAP_TMP_DIR=/tmp/zapret2_dwc
+ZAP_TMP_DIR=/tmp/zapret_dwc
 
 opt_sites=
 opt_dig=

zapret/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"

zapret/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
+--- a/init.d/openwrt/zapret
-+++ b/init.d/openwrt/zapret2
++++ 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
 

zapret/uci-def-cfg.sh

@@ -1,9 +1,9 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor
 
-[ ! -f /opt/zapret2/comfunc.sh ] && exit 0
+[ ! -f /opt/zapret/comfunc.sh ] && exit 0
 
-. /opt/zapret2/comfunc.sh
+. /opt/zapret/comfunc.sh
 
 mkdir -p $ZAPRET_BASE/ipset
 

zapret2/def-cfg.sh

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