Bump version to v69-20241206

Source: https://github.com/bol-van/zapret-win-bundle/blob/master/zapret-winws/preset_russia.cmd

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     tags:
-      - '*'
+      - v[0-9]+*
 
 jobs:
   check:
@@ -63,9 +63,9 @@ jobs:
     #if: needs.check.outputs.is_active == 'true'
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        #branch: [ openwrt-22.03, openwrt-23.05 ]
-        branch: [ openwrt-23.05 ]
+        branch: [ openwrt-23.05, SNAPSHOT ]
         arch:
           - aarch64_cortex-a53
           - aarch64_cortex-a72
@@ -93,14 +93,15 @@ jobs:
           - mipsel_74kc
           - mipsel_mips32
           - x86_64
-        #include:
-        #  - branch: SNAPSHOT
-        #    arch: x86_64
-        #exclude:
-        #  - branch: openwrt-22.03
-        #    arch: arm_fa526
-        #  - branch: openwrt-22.03
-        #    arch: arm_mpcore
+        include:
+          - branch: SNAPSHOT
+            arch: aarch64_cortex-a76
+            #arch: riscv64_riscv64
+        exclude:
+          - branch: SNAPSHOT
+            arch: arm_mpcore
+          - branch: SNAPSHOT
+            arch: arm_cortex-a9_vfpv3-d16
     container:
       image: openwrt/sdk:${{ matrix.arch }}-${{ matrix.branch }}
       options: --user root
@@ -111,6 +112,20 @@ jobs:
           repository: 'remittor/zapret-openwrt'
           path: zapret-openwrt
 
+      - name: Setup OpenWrt SDK
+        if: ${{ matrix.branch == 'openwrt-23.05' || matrix.branch == 'SNAPSHOT' }}
+        working-directory: /builder
+        shell: bash
+        run: |
+          # gpg --verbose --recv-keys 0x1D53D1877742E911
+          gpg --verbose --import <(wget -qO- 'https://git.openwrt.org/?p=keyring.git;a=blob_plain;f=gpg/0x1D53D1877742E911.asc')
+          # disable check signatures
+          sed -i 's/gpg --/#gpg --/g' setup.sh
+          # disable cleanup keys
+          sed -r -i 's/^rm.+//' setup.sh
+          ./setup.sh
+          ls -lh
+
       - name: Setup ccache
         uses: actions/cache@v4
         with:
@@ -132,8 +147,8 @@ jobs:
         shell: bash
         run: |
           #export PKG_VERSION=$(date --utc -d $DATE +%Y%m%d)
-          #find $GITHUB_WORKSPACE/zapret-openwrt -type d -path '*/package/zapret' -exec cp -r {} ./package \;
-          cp -r $GITHUB_WORKSPACE/zapret-openwrt ./package/zapret-openwrt/
+          #find $GITHUB_WORKSPACE/zapret-openwrt -type d -path '*/package/zapret' -exec cp -vr {} ./package \;
+          cp -vr $GITHUB_WORKSPACE/zapret-openwrt ./package/zapret-openwrt/
           
           mv feeds.conf.default feeds.conf
           sed -i -e 's|base.*\.git|base https://github.com/openwrt/openwrt.git|' feeds.conf
@@ -151,14 +166,14 @@ jobs:
           PKGLIST=`echo package/zapret-openwrt/{zapret,zapret-tpws,zapret-mdig,zapret-ip2net,luci-app-zapret}/compile`
           make $PKGLIST V=s CONFIG_CCACHE=1 BUILD_LOG=1
           
-          find ./bin/packages/*/base -type f ! -regex ".*\(zapret\).*\.ipk$" -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
           #make package/index
           
-          tar -C ./bin/packages/*/base -cvf $GITHUB_WORKSPACE/ipk-$BRANCH-$ARCH.tar --transform "s|^\./|${BRANCH/openwrt-}/$ARCH/|" --show-transformed-names .
+          tar -C ./bin/packages/*/base -cvf $GITHUB_WORKSPACE/pkg-$BRANCH-$ARCH.tar --transform "s|^\./|${BRANCH/openwrt-}/$ARCH/|" --show-transformed-names .
           ./staging_dir/host/bin/ccache --max-size=10M --show-stats
 
       - name: Compress build logs
@@ -174,8 +189,8 @@ jobs:
         if: steps.build.outcome == 'success'
         uses: actions/upload-artifact@v4
         with:
-          name: ipk-${{ matrix.branch }}-${{ matrix.arch }}
-          path: ./**/ipk-${{ matrix.branch }}-${{ matrix.arch }}.tar
+          name: pkg-${{ matrix.branch }}-${{ matrix.arch }}
+          path: pkg-*.tar
           if-no-files-found: error
 
       - name: Upload build logs
@@ -183,7 +198,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: logs-${{ matrix.branch }}-${{ matrix.arch }}
-          path: ./**/logs-*.tar.xz
+          path: logs-*.tar.xz
 
   release:
     needs: [ check, build ]
@@ -193,23 +208,22 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        #branch: [ '22.03', '23.05' ]
-        branch: [ '23.05' ]
+        branch: [ 'SNAPSHOT', '23.05' ]
     steps:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          pattern: ipk-*
+          pattern: pkg-*
 
-      - name: Put ipk into zip
+      - name: Put packages into zip
         env:
           BRANCH: ${{ matrix.branch }}
           TAG: ${{ needs.check.outputs.tag }}
           DATE: ${{ needs.check.outputs.date }}
         run: |
           mkdir -p public
-          find . -name "ipk-openwrt-$BRANCH-*.tar" -exec tar -xvf {} --wildcards '*.ipk' \;
-          find $BRANCH -mindepth 1 -type d -exec sh -c 'zip -0 ./public/zapret_${TAG}_$(basename {}).ipk.zip -j {} {}/*' \;
+          find . -name "*-$BRANCH-*.tar" -exec tar -xvf {} --wildcards '*.*pk' \;
+          find $BRANCH -mindepth 1 -type d -exec sh -c 'zip -0 ./public/zapret_${TAG}_$(basename {}).zip -j {} {}/*' \;
           ls -lh ./public/*.zip
 
       - name: Upload assets

README.md

@@ -0,0 +1,19 @@
+[![build](https://github.com/remittor/zapret-openwrt/actions/workflows/build.yml/badge.svg)](https://github.com/remittor/zapret-openwrt/actions/workflows/build.yml)
+# zapret-openwrt
+
+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)
+
+[Download page](https://github.com/remittor/zapret-openwrt/releases)
+
+## Screenshots
+
+![image](https://github.com/user-attachments/assets/b79940b3-6a0d-4310-bd58-e461be004397)
+
+## Donations
+
+<img src=https://cdn-icons-png.flaticon.com/16/14446/14446252.png alt="USDT" style="vertical-align: middle;"/> USDT (ethereum network)
+```
+0x840E78D3E47A7ed4987bc36b4A4f0C5240bd7DE8
+```

luci-app-zapret/Makefile

@@ -5,15 +5,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-zapret
-PKG_RELEASE:=20241016
-PKG_VERSION:=65-$(PKG_RELEASE)
+PKG_VERSION:=69.20241206
 PKG_LICENSE:=MIT
+PKG_MAINTAINER:=remittor <https://github.com/remittor>
 
 LUCI_TITLE:=LuCI support for zapret
 LUCI_DEPENDS:=+zapret
 LUCI_PKGARCH:=all
 
-#include ../../luci.mk
+define Package/$(PKG_NAME)/postinst
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	rm -f /tmp/luci-index*
+	rm -rf /tmp/luci-modulecache/
+	#killall -HUP rpcd 2>/dev/null
+	/etc/init.d/rpcd reload
+	[ -f "/sbin/luci-reload" ] && /sbin/luci-reload
+	[ -f "/etc/init.d/uhttpd" ] && /etc/init.d/uhttpd reload
+fi
+exit 0
+endef
+
 include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature

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

@@ -14,111 +14,111 @@ const btn_style_warning  = 'btn cbi-button-negative';
 const btn_style_success  = 'btn cbi-button-success important';
 
 return view.extend({
-    disableButtons: function(flag, btn, elems = [ ]) {
-        let btn_start   = elems[1] || document.getElementById("btn_start");
-        //let btn_destroy = elems[4] || document.getElementById("btn_destroy");
-        let btn_enable  = elems[2] || document.getElementById("btn_enable");
-        let btn_update  = elems[3] || document.getElementById("btn_update");
-
-        btn_start.disabled   = flag;
-        btn_update.disabled  = true; // TODO
-        //btn_destroy.disabled = flag;
-        if (btn === btn_update) {
-            btn_enable.disabled = false;
-        } else {
-            btn_enable.disabled = flag;
+    get_svc_buttons: function(elems = { }) {
+        return {
+            enable  : elems.btn_enable  || document.getElementById('btn_enable'),
+            disable : elems.btn_disable || document.getElementById('btn_disable'),
+            start   : elems.btn_start   || document.getElementById('btn_start'),
+            restart : elems.btn_restart || document.getElementById('btn_restart'),
+            stop    : elems.btn_stop    || document.getElementById('btn_stop'),
+            update  : elems.btn_update  || document.getElementById('btn_update'),
+            reset   : elems.btn_update  || document.getElementById('btn_reset'),
+        };
+    },
+    
+    disableButtons: function(flag, button, elems = { }) {
+        let error_code = 0;
+        if (Number.isInteger(button) && button < 0) {
+            error_code = button;
         }
+        let btn = this.get_svc_buttons(elems);
+        btn.enable.disabled  = flag;
+        btn.disable.disabled = flag;
+        btn.start.disabled   = flag;
+        btn.restart.disabled = flag;
+        btn.stop.disabled    = flag;
+        btn.update.disabled  = true; // TODO
+        btn.reset.disabled   = (error_code == 0) ? flag : false;
     },
 
     getAppStatus: function() {
         return Promise.all([
-            { code: -1 }, //fs.exec(tools.execPath, [ 'raw-status' ]),
-            { code: -1 }, //fs.exec(tools.execPath, [ 'vpn-route-status' ]),
-            tools.getInitStatus(tools.appName),
-            //L.resolveDefault(fs.read(tools.tokenFile), 0),
-            uci.load(tools.appName),
+            tools.getInitState(tools.appName),      // svc_boot
+            fs.exec(tools.execPath, [ 'enabled' ]), // svc_en
+            fs.exec(tools.execPath, [ 'info' ]),    // svc_info
+            fs.exec('/bin/ps'),                     // process list
+            fs.exec(tools.packager.path, tools.packager.args),  // installed packages
+            uci.load(tools.appName),              // config
         ]).catch(e => {
             ui.addNotification(null, E('p', _('Unable to execute or read contents')
                 + ': %s [ %s | %s | %s ]'.format(
-                    e.message, tools.execPath, 'tools.getInitStatus', 'uci.zapret'
+                    e.message, tools.execPath, 'tools.getInitState', 'uci.zapret'
             )));
         });
     },
 
-    setAppStatus: function(status_array, elems = [ ], force_app_code = 0) {
-        let section = uci.get(tools.appName, 'config');
-        if (!status_array || section == null || typeof(section) !== 'object') {
-            (elems[0] || document.getElementById("status")).innerHTML = tools.makeStatusString(1);
+    setAppStatus: function(status_array, elems = { }, force_app_status = 0) {
+        let cfg = uci.get(tools.appName, 'config');
+        if (!status_array || cfg == null || typeof(cfg) !== 'object') {
+            let elem_status = elems.status || document.getElementById("status");
+            elem_status.innerHTML = tools.makeStatusString(null);
             ui.addNotification(null, E('p', _('Unable to read the contents') + ': setAppStatus()'));
-            this.disableButtons(true, null, elems);
+            this.disableButtons(true, -1, elems);
             return;
         }
-
-        let app_status_code       = (force_app_code) ? force_app_code : status_array[0].code;
-        let vpn_route_status_code = status_array[1].code;
-        let enabled_flag          = status_array[2];
-        let z_fwtype              = section.FWTYPE;
-        let z_mode                = section.MODE;
-        let bllist_preset         = 'user_only';
-
-        let btn_enable = elems[2] || document.getElementById('btn_enable');
-        /*
-        if (enabled_flag == true) {
-            btn_enable.onclick     = ui.createHandlerFn(this, this.serviceAction, 'disable', 'btn_enable');
-            btn_enable.textContent = _('Enabled');
-            btn_enable.className   = btn_style_positive;
+        let svc_boot  = status_array[0] ? true : false;
+        let svc_en    = status_array[1];   // stdout: empty or error text
+        let svc_info  = status_array[2];   // stdout: JSON as text
+        let proc_list = status_array[3];   // stdout: multiline text
+        let pkg_list  = status_array[4];   // stdout: installed packages
+        
+        //console.log('svc_en: ' + svc_en.code);
+        svc_en = (svc_en.code == 0) ? true : false;
+        
+        if (svc_info.code != 0) {
+            ui.addNotification(null, E('p', _('Unable to read the service info') + ': setAppStatus()'));
+            this.disableButtons(true, -1, elems);
+            return;
+        }
+        if (proc_list.code != 0) {
+            ui.addNotification(null, E('p', _('Unable to read process list') + ': setAppStatus()'));
+            this.disableButtons(true, -1, elems);
+            return;
+        }
+        if (pkg_list.code != 0) {
+            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
+            this.disableButtons(true, -1, elems);
+            return;
+        }
+        let svcinfo;
+        if (force_app_status) {
+            svcinfo = force_app_status;
         } else {
-            btn_enable.onclick     = ui.createHandlerFn(this, this.serviceAction, 'enable', 'btn_enable');
-            btn_enable.textContent = _('Disabled');
-            btn_enable.className   = btn_style_negative;
+            svcinfo = tools.decode_svc_info(svc_en, svc_info, proc_list, cfg);
         }
-        */
-        let btn_start   = elems[1] || document.getElementById('btn_start');
-        let btn_update  = elems[3] || document.getElementById('btn_update');
-        //let btn_destroy = elems[4] || document.getElementById('btn_destroy');
+        let btn = this.get_svc_buttons(elems);
+        btn.update.disabled = true;   // TODO
+        btn.reset.disabled = false;
 
-        let btnStartStateOn = () => {
-            //btn_start.onclick     = ui.createHandlerFn(this, this.appAction, 'stop', 'btn_start');
-            //btn_start.textContent = _('Enabled');
-            //btn_start.className   = btn_style_positive;
-        };
-
-        let btnStartStateOff = () => {
-            //btn_start.onclick     = ui.createHandlerFn(this, this.appAction, 'start', 'btn_start');
-            //btn_start.textContent = _('Disabled');
-            //btn_start.className   = btn_style_negative;
-        };
-
-        if (app_status_code == -1) {
-            this.disableButtons(false, null, elems);
-            btnStartStateOn();
-        }
-        else if (app_status_code == 0) {
-            this.disableButtons(false, null, elems);
-            btnStartStateOn();
-            //btn_destroy.disabled = false;
-            btn_update.disabled  = false;
-        }
-        else if (app_status_code == 2) {
-            this.disableButtons(false, null, elems);
-            btnStartStateOff();
-            btn_update.disabled = true;
-        }
-        else if (app_status_code == 3) {
-            btnStartStateOff();
-            this.disableButtons(true, btn_start, elems);
-        }
-        else if (app_status_code == 4) {
-            btnStartStateOn();
-            this.disableButtons(true, btn_update, elems);
-        }
-        else {
+        if (Number.isInteger(svcinfo)) {
             ui.addNotification(null, E('p', _('Error')
-                + ' %s: return code = %s'.format(tools.execPath, app_status_code)));
-            this.disableButtons(true, null, elems);
+                + ' %s: return code = %s'.format('decode_svc_info', svcinfo + ' ')));
+            this.disableButtons(true, -1, elems);
+        } else {
+            btn.enable.disabled  = (svc_en) ? true : false;
+            btn.disable.disabled = (svc_en) ? false : true;
+            if (!svcinfo.dmn.inited) {
+                btn.start.disabled = false;
+                btn.restart.disabled = true;
+                btn.stop.disabled = true;
+            } else {
+                btn.start.disabled = true;
+                btn.restart.disabled = false;
+                btn.stop.disabled = false;
+            }
         }
-
-        (elems[0] || document.getElementById("status")).innerHTML = tools.makeStatusString(app_status_code, z_fwtype, bllist_preset);
+        let elem_status = elems.status || document.getElementById("status");
+        elem_status.innerHTML = tools.makeStatusString(svcinfo, cfg.FWTYPE, 'user_only');
         
         if (!poll.active()) {
             poll.start();
@@ -130,31 +130,67 @@ return view.extend({
             let elem = document.getElementById(button);
             this.disableButtons(true, elem);
         }
-
         poll.stop();
         
         let _this = this;
         
-        return fs.exec('/opt/zapret/sync_config.sh')
+        return tools.handleServiceAction(tools.appName, action)
+        .then(() => {
+            return _this.getAppStatus().then(
+                (status_array) => {
+                    _this.setAppStatus(status_array);
+                }
+            );
+        })
+        .catch(e => { 
+            ui.addNotification(null, E('p', _('Unable to run service action.') + ' Error: ' + e.message));
+        });
+    },
+
+    serviceActionEx: function(action, button, hide_modal = false) {
+        if (button) {
+            let elem = document.getElementById(button);
+            this.disableButtons(true, elem);
+        }
+        poll.stop();
+        
+        let _this = this;
+        let exec_cmd = null;
+        let exec_arg = [ ];
+        let errmsg = 'ERROR:';
+        if (action == 'start' || action == 'restart') {
+            exec_cmd = tools.syncCfgPath;
+            errmsg = _('Unable to run sync_config.sh script.');
+        }
+        else if (action == 'reset') {
+            exec_cmd = tools.defaultCfgPath;
+            exec_arg = [ 'sync' ];  // restore config + sync configs
+            errmsg = _('Unable to run restore-def-cfg.sh script.');
+            action = null;
+        } else {
+            ui.addNotification(null, E('p', 'ERROR: unknown action'));
+            return null;
+        }
+        return fs.exec(exec_cmd, exec_arg)
         .then(function(res) { 
             if (res.code != 0) {
-                ui.addNotification(null, E('p', _('Unable to run sync_config.sh script.') + ' res.code = ' + res.code));
+                ui.addNotification(null, E('p', errmsg + ' res.code = ' + res.code));
+                action = null;  // return with error
+            }
+            if (hide_modal) {
+                ui.hideModal();
+            }
+            if (!action) {
                 return _this.getAppStatus().then(
                     (status_array) => {
                         _this.setAppStatus(status_array);
                     }
                 );
             }
-            return tools.handleServiceAction(tools.appName, action).then(() => {
-                return _this.getAppStatus().then(
-                    (status_array) => {
-                        _this.setAppStatus(status_array);
-                    }
-                );
-            });
+            return _this.serviceAction(action, null);
         })
         .catch(e => { 
-            ui.addNotification(null, E('p', _('Unable to run sync_config.sh script.') + ' Error: ' + e.message));
+            ui.addNotification(null, E('p', errmsg + ' Error: ' + e.message));
         });
     },
 
@@ -190,29 +226,29 @@ return view.extend({
         );
     },
 
-    dialogDestroy: function(ev) {
+    dialogResetCfg: function(ev) {
         ev.target.blur();
         let cancel_button = E('button', {
             'class': btn_style_neutral,
             'click': ui.hideModal,
         }, _('Cancel'));
 
-        let shutdown_btn = E('button', {
-            'class': btn_style_warning,
-        }, _('Shutdown'));
-        shutdown_btn.onclick = ui.createHandlerFn(this, () => {
-            cancel_button.disabled = true;
-            return this.appAction('destroy');
+        let resetcfg_btn = E('button', {
+            'class': btn_style_action,
+        }, _('Reset settings'));
+        resetcfg_btn.onclick = ui.createHandlerFn(this, () => {
+            //cancel_button.disabled = true;
+            return this.serviceActionEx('reset', resetcfg_btn, true);
         });
 
-        ui.showModal(_('Shutdown'), [
+        ui.showModal(_('Reset settings to default'), [
             E('div', { 'class': 'cbi-section' }, [
-                E('p', _('The service will be disabled. Continue?')),
+                E('p', _('All settings will be reset to default. Continue?')),
             ]),
             E('div', { 'class': 'right' }, [
-                shutdown_btn,
-                ' ',
                 cancel_button,
+                ' ',
+                resetcfg_btn,
             ])
         ]);
     },
@@ -225,8 +261,13 @@ return view.extend({
         if (!status_array) {
             return;
         }
+        let cfg = uci.get(tools.appName, 'config');
 
-        let section = uci.get(tools.appName, 'config');
+        let pkg_list = status_array[4];
+        if (pkg_list === undefined || typeof(pkg_list) !== 'object' || pkg_list.code != 0) {
+            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
+            return;
+        }
 
         let status_string = E('div', {
             'id'   : 'status',
@@ -236,15 +277,15 @@ return view.extend({
 
         let layout = E('div', { 'class': 'cbi-section-node' });
 
-        function layout_append(title, descr, elem) {
+        function layout_append(title, descr, elems) {
             descr = (descr) ? E('div', { 'class': 'cbi-value-description' }, descr) : '';
-            let elist;
-            if (elem instanceof E) {
-                elist = [ elem ];
-            } else {
-                elist = elem;
+            let elist = elems;
+            let elem_list = [ ];
+            for (let i = 0; i < elist.length; i++) {
+                elem_list.push(elist[i]);
+                elem_list.push(' ');
             }
-            let vlist = [ E('div', {}, elist ) ];
+            let vlist = [ E('div', {}, elem_list ) ];
             for (let i = 0; i < elist.length; i++) {
                 let input = E('input', {
                     'id'  : elist[i].id + '_hidden',
@@ -252,9 +293,10 @@ return view.extend({
                 });
                 vlist.push(input);
             }
+            let elem_name = (elist.length == 1) ? elist[0].id + '_hidden' : null;
             layout.append(
                 E('div', { 'class': 'cbi-value' }, [
-                    E('label', { 'class': 'cbi-value-title', 'for': elem.id + '_hidden' || null }, title),
+                    E('label', { 'class': 'cbi-value-title', 'for': elem_name }, title),
                     E('div', { 'class': 'cbi-value-field' }, vlist),
                 ])
             );
@@ -272,35 +314,61 @@ return view.extend({
         btn_enable.onclick  = ui.createHandlerFn(this, this.serviceAction, 'enable', 'btn_enable');
         let btn_disable     = create_btn('btn_disable', btn_style_warning, _('Disable'));
         btn_disable.onclick = ui.createHandlerFn(this, this.serviceAction, 'disable', 'btn_disable');
-        layout_append(_('Service Status'), null, [ btn_enable, 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   = ui.createHandlerFn(this, this.serviceAction, '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 = ui.createHandlerFn(this, this.serviceAction, '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    = ui.createHandlerFn(this, this.serviceAction, 'stop', 'btn_stop');
-        layout_append(_('Service Control'), null, [ btn_start, btn_restart, btn_stop ] );
+        layout_append(_('Service daemons control'), null, [ btn_start, btn_restart, btn_stop ] );
 
         let btn_update      = create_btn('btn_update',  btn_style_action, _('Update'));
         btn_update.onclick  = ui.createHandlerFn(this, () => { this.appAction('update', 'btn_update') });
-        layout_append(_('Update blacklist'), null, btn_update);
+        layout_append(_('Update blacklist'), null, [ btn_update ] );
         
-        let btn_destroy     = create_btn('btn_destroy', btn_style_negative, _('Shutdown'));
-        btn_destroy.onclick = L.bind(this.dialogDestroy, this);
-        //layout_append(_('Shutdown'), _('Complete service shutdown'), btn_destroy);
+        let btn_reset       = create_btn('btn_reset', btn_style_action, _('Reset settings'));
+        btn_reset.onclick   = L.bind(this.dialogResetCfg, this);
+        layout_append(_('Reset settings to default'), null, [ btn_reset ] );
 
-        //let elems = [ status_string, btn_start, btn_enable, btn_update, btn_destroy ];
-        let elems = [ status_string, btn_start, btn_enable, btn_update ];
+        let elems = {
+            "status": status_string,
+            "btn_enable": btn_enable,
+            "btn_disable": btn_disable,
+            "btn_start": btn_start,
+            "btn_restart": btn_restart,
+            "btn_stop": btn_stop,
+            "btn_update": btn_update,
+            "btn_reset": btn_reset,
+        };
         this.setAppStatus(status_array, elems);
 
         poll.add(L.bind(this.statusPoll, this));
 
+        let page_title = _('Zapret');
+        let pkgdict = tools.decode_pkg_list(pkg_list.stdout);
+        page_title += ' &nbsp ';
+        if (pkgdict['zapret'] === undefined || pkgdict['zapret'] == '') {
+            page_title += 'unknown version';
+        } else {
+            page_title += 'v' + pkgdict['zapret'];
+        }
+        let aux1 = E('em');
+        let aux2 = E('em');
+        if (pkgdict['zapret'] != pkgdict['luci-app-zapret']) {
+            let errtxt = 'LuCI APP v' + pkgdict['luci-app-zapret'] + ' [ incorrect version! ]';
+            aux1 = E('div', { 'class': 'label-status error' }, errtxt);
+            aux2 = E('div', { }, '&nbsp');
+        }
+        
         let url1 = 'https://github.com/bol-van/zapret';
         let url2 = 'https://github.com/remittor/zapret-openwrt';
 
         return E([
-            E('h2', { 'class': 'fade-in' }, _('Zapret')),
+            E('h2', { 'class': 'fade-in' }, page_title),
+            aux1,
+            aux2,
             E('div', { 'class': 'cbi-section-descr fade-in' },
                 E('a', { 'href': url1, 'target': '_blank' }, url1),
             ),
@@ -309,7 +377,6 @@ return view.extend({
             ),
             E('div', { 'class': 'cbi-section fade-in' }, [
                 status_string,
-                E('hr'),
             ]),
             E('div', { 'class': 'cbi-section fade-in' },
                 layout

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

@@ -64,10 +64,10 @@ return view.extend({
         //o.value('iptables', 'iptables');
         //o.value('ipfw',     'ipfw');
 
-        o = s.taboption(tabname, form.ListValue, 'MODE', _('MODE'));
-        o.value('nfqws',   'nfqws');
-        //o.value('tpws',    'tpws');
-        
+        o = s.taboption(tabname, form.Flag, 'POSTNAT', _('POSTNAT'));
+        o.rmempty = false;
+        o.default = 1;
+
         o = s.taboption(tabname, form.ListValue, 'FLOWOFFLOAD', _('FLOWOFFLOAD'));
         o.value('donttouch', 'donttouch');
         o.value('none',      'none');
@@ -92,32 +92,6 @@ return view.extend({
         o.value('hostlist',     'hostlist');
         o.value('autohostlist', 'autohostlist');
 
-        o = s.taboption(tabname, form.Flag, 'MODE_HTTP', _('MODE_HTTP'));
-        o.rmempty = false;
-        o.default = 0;
-
-        o = s.taboption(tabname, form.Flag, 'MODE_HTTP_KEEPALIVE', _('MODE_HTTP_KEEPALIVE'));
-        o.rmempty = false;
-        o.default = 0;
-
-        o = s.taboption(tabname, form.Flag, 'MODE_HTTPS', _('MODE_HTTPS'));
-        o.rmempty = false;
-        o.default = 0;
-
-        o = s.taboption(tabname, form.Flag, 'MODE_QUIC', _('MODE_QUIC'));
-        o.rmempty = false;
-        o.default = 0;
-
-        o = s.taboption(tabname, form.Value, 'DESYNC_MARK', _('DESYNC_MARK'));
-        //o.description = _("nfqws option for DPI desync attack");
-        o.rmempty     = false;
-        o.datatype    = 'string';
-
-        o = s.taboption(tabname, form.Value, 'DESYNC_MARK_POSTNAT', _('DESYNC_MARK_POSTNAT'));
-        //o.description = _("nfqws option for DPI desync attack");
-        o.rmempty     = false;
-        o.datatype    = 'string';
-
         /* NFQWS_OPT_DESYNC tab */
 
         tabname = 'nfqws_params';
@@ -129,67 +103,154 @@ return view.extend({
             o.default = '<hr style="width: 620px; height: 1px; margin: 1px 0 1px; border-top: 1px solid;">';
         };
 
-        let add_param = function(sec, param, locname = null, rows = 10) {
+        let add_param = function(sec, param, locname = null, rows = 10, multiline = false) {
             if (!locname)
                 locname = param;
             let btn = sec.taboption(tabname, form.Button, '_' + param + '_btn', locname);
             btn.inputtitle = _('Edit');
             btn.inputstyle = 'edit btn';
             let val = sec.taboption(tabname, form.DummyValue, '_' + param);
-            val.rawhtml = false;
+            val.rawhtml = multiline ? true : false;
             val.cfgvalue = function(section_id) {
-                let name = uci.get(tools.appName, section_id, param);
-                if (name == null || name == "")
-                    name = "";
-                return name;
+                let value = uci.get(tools.appName, section_id, param);
+                if (value == null) {
+                    return "";
+                }
+                value = value.trim();
+                if (multiline == 2) {
+                    value = value.replace(/\n  --/g, "\n--");
+                    value = value.replace(/\n --/g, "\n--");
+                    value = value.replace(/ --/g, "\n--");
+                }
+                if (val.rawhtml) {
+                    value = value.replace(/</g, '˂');
+                    value = value.replace(/>/g, '˃');
+                    value = value.replace(/\n/g, '<br/>');
+                }
+                return value;
             };
             val.validate = function(section_id, value) {
-                if (!value)
-                    return "";
-                return value.trim();
+                return (value) ? value.trim() : "";
             };
-            btn.onclick = () => new tools.longstrEditDialog('config', param, param, locname, rows).show();
+            btn.onclick = () => new tools.longstrEditDialog('config', param, param, locname, rows, multiline).show();
         };
 
+        o = s.taboption(tabname, form.Flag, 'NFQWS_ENABLE', _('NFQWS_ENABLE'));
+        o.rmempty = false;
+        o.default = 1;
+
+        o = s.taboption(tabname, form.Value, 'DESYNC_MARK', _('DESYNC_MARK'));
+        //o.description = _("nfqws option for DPI desync attack");
+        o.rmempty     = false;
+        o.datatype    = 'string';
+
+        o = s.taboption(tabname, form.Value, 'DESYNC_MARK_POSTNAT', _('DESYNC_MARK_POSTNAT'));
+        //o.description = _("nfqws option for DPI desync attack");
+        o.rmempty     = false;
+        o.datatype    = 'string';
+        
+        o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_TCP', _('NFQWS_PORTS_TCP'));
+        o.rmempty     = false;
+        o.datatype    = 'string';
+
+        o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_UDP', _('NFQWS_PORTS_UDP'));
+        o.rmempty     = false;
+        o.datatype    = 'string';
+
+        o = s.taboption(tabname, form.Value, 'NFQWS_TCP_PKT_OUT', _('NFQWS_TCP_PKT_OUT'));
+        o.rmempty     = false;
+        o.datatype    = 'string';
+
+        o = s.taboption(tabname, form.Value, 'NFQWS_TCP_PKT_IN', _('NFQWS_TCP_PKT_IN'));
+        o.rmempty     = false;
+        o.datatype    = 'string';
+
+        o = s.taboption(tabname, form.Value, 'NFQWS_UDP_PKT_OUT', _('NFQWS_UDP_PKT_OUT'));
+        o.rmempty     = false;
+        o.datatype    = 'string';
+
+        o = s.taboption(tabname, form.Value, 'NFQWS_UDP_PKT_IN', _('NFQWS_UDP_PKT_IN'));
+        o.rmempty     = false;
+        o.datatype    = 'string';
+
+        o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_TCP_KEEPALIVE', _('NFQWS_PORTS_TCP_KEEPALIVE'));
+        o.rmempty     = false;
+        o.datatype    = 'uinteger';
+
+        o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_UDP_KEEPALIVE', _('NFQWS_PORTS_UDP_KEEPALIVE'));
+        o.rmempty     = false;
+        o.datatype    = 'uinteger';
+
         add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_SUFFIX');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTP');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTP_SUFFIX');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTPS');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTPS_SUFFIX');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTP6');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTP6_SUFFIX');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTPS6');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_HTTPS6_SUFFIX');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_QUIC');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_QUIC_SUFFIX');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_QUIC6');
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT_DESYNC_QUIC6_SUFFIX');
+        add_param(s, 'NFQWS_OPT', null, 18, 2);
+
+        /* AutoHostList settings */
+
+        tabname = 'autohostlist_tab'; 
+        s.tab(tabname, _('AutoHostList'));
+        
+        o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_THRESHOLD', _('RETRANS_THRESHOLD'));
+        o.rmempty     = false;
+        o.datatype    = 'uinteger';
+
+        o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_FAIL_THRESHOLD', _('FAIL_THRESHOLD'));
+        o.rmempty     = false;
+        o.datatype    = 'uinteger';
+
+        o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_FAIL_TIME', _('FAIL_TIME'));
+        o.rmempty     = false;
+        o.datatype    = 'uinteger';
+
+        o = s.taboption(tabname, form.Button, '_auto_host_btn', _('Auto host list entries'));
+        o.inputtitle = _('Edit');
+        o.inputstyle = 'edit btn';
+        o.description = tools.autoHostListFN;
+        o.onclick = () => new tools.fileEditDialog(
+            tools.autoHostListFN,
+            _('Auto host list'),
+            '',
+            '',
+            15
+        ).show();
+
+        o = s.taboption(tabname, form.Flag, 'AUTOHOSTLIST_DEBUGLOG', _('DEBUGLOG'));
+        o.rmempty     = false;
+        o.default     = 0;
+
+        o = s.taboption(tabname, form.Button, '_auto_host_debug_btn', _('Auto host debug list entries'));
+        o.inputtitle = _('Edit');
+        o.inputstyle = 'edit btn';
+        o.description = tools.autoHostListDbgFN;
+        o.onclick = () => new tools.fileEditDialog(
+            tools.autoHostListDbgFN,
+            _('Auto host debug list'),
+            '',
+            '',
+            15
+        ).show();
         
         /* Blacklist settings */
 
         tabname = 'blacklist_tab'; 
         s.tab(tabname, _('Blacklist settings'));
 
+        o = s.taboption(tabname, form.Button, '_google_entries_btn', _('Google hostname entries'));
+        o.inputtitle = _('Edit');
+        o.inputstyle = 'edit btn';
+        o.description = tools.hostsGoogleFN;
+        o.onclick = () => new tools.fileEditDialog(
+            tools.hostsGoogleFN,
+            _('Google hostname entries'),
+            _('One hostname per line.<br />Examples:'),
+            '<code>youtube.com<br />googlevideo.com</code>',
+            15
+        ).show();
+
         o = s.taboption(tabname, form.Button, '_user_entries_btn', _('User hostname entries'));
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.hostsUserFN;
-        o.onclick = () => new tools.fileEditDialog(            
+        o.onclick = () => new tools.fileEditDialog(
             tools.hostsUserFN,
             _('User entries'),
             _('One hostname per line.<br />Examples:'),
@@ -201,7 +262,7 @@ return view.extend({
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.hostsUserExcludeFN;
-        o.onclick = () => new tools.fileEditDialog(            
+        o.onclick = () => new tools.fileEditDialog(
             tools.hostsUserExcludeFN,
             _('User excluded entries'),
             _('One hostname per line.<br />Examples:'),

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

@@ -35,8 +35,13 @@ document.head.append(E('style', {'type': 'text/css'},
 `));
 
 return baseclass.extend({
+    packager          : null,
     appName           : 'zapret',
-    execPath          : '/opt/zapret/init.d/openwrt/zapret',
+    execPath          : '/etc/init.d/zapret',
+    syncCfgPath       : '/opt/zapret/sync_config.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',
@@ -45,13 +50,26 @@ return baseclass.extend({
     custFileMax       : 4,
     custFileTemplate  : '/opt/zapret/ipset/cust%s.txt',
 
-    infoLabelStarting : '<span class="label-status starting">' + _('Starting') + '</span>',
-    infoLabelRunning  : '<span class="label-status running">' + _('Enabled') + '</span>',
-    infoLabelUpdating : '<span class="label-status updating">' + _('Updating') + '</span>',
-    infoLabelStopped  : '<span class="label-status stopped">' + _('Disabled') + '</span>',
-    infoLabelError    : '<span class="label-status error">' + _('Error') + '</span>',
+    autoHostListFN    : '/opt/zapret/ipset/zapret-hosts-auto.txt',
+    autoHostListDbgFN : '/opt/zapret/ipset/zapret-hosts-auto-debug.log',
 
-    callInitStatus: rpc.declare({
+    infoLabelRunning  : '<span class="label-status running">'  + _('Running')  + '</span>',
+    infoLabelStarting : '<span class="label-status starting">' + _('Starting') + '</span>',
+    infoLabelStopped  : '<span class="label-status stopped">'  + _('Stopped')  + '</span>',
+    infoLabelDisabled : '<span class="label-status stopped">'  + _('Disabled') + '</span>',
+    infoLabelError    : '<span class="label-status error">'    + _('Error')    + '</span>',
+
+    infoLabelUpdating : '<span class="label-status updating">' + _('Updating') + '</span>',
+
+    statusDict: {
+        error    : { code: 0, name: _('Error')    , label: this.infoLabelError    },
+        disabled : { code: 1, name: _('Disabled') , label: this.infoLabelDisabled },
+        stopped  : { code: 2, name: _('Stopped')  , label: this.infoLabelStopped  },
+        starting : { code: 3, name: _('Starting') , label: this.infoLabelStarting },
+        running  : { code: 4, name: _('Running')  , label: this.infoLabelRunning  },
+    },
+
+    callInitState: rpc.declare({
         object: 'luci',
         method: 'getInitList',
         params: [ 'name' ],
@@ -65,10 +83,27 @@ return baseclass.extend({
         expect: { result: false }
     }),
 
-    getInitStatus: function(name) {
-        return this.callInitStatus(name).then(res => {
+    init_consts: function() {
+        if (!this.packager) {
+            this.packager = { };
+            if (L.hasSystemFeature('apk')) {
+                this.packager.name = 'apk';
+                this.packager.path = '/usr/bin/apk';
+                this.packager.args = [ 'list', '-I', '*zapret*' ];
+            } else {
+                this.packager.name = 'opkg';
+                this.packager.path = '/bin/opkg';
+                this.packager.args = [ 'list-installed', '*zapret*' ];
+            }
+            //console.log('PACKAGER: ' + this.packager.name);
+        }
+    },
+
+    getInitState: function(name) {
+        this.init_consts();
+        return this.callInitState(name).then(res => {
             if (res) {
-                return res[name].enabled;
+                return res[name].enabled ? true : false;
             } else {
                 throw _('Command failed');
             }
@@ -92,72 +127,182 @@ return baseclass.extend({
         return (v && typeof(v) === 'string') ? v.trim().replace(/\r?\n/g, '') : v;
     },
 
-    makeStatusString: function(app_status_code, fwtype, bllist_preset) {
-        let app_status_label;
-        let spinning = '';
-        /*
-        switch(app_status_code) {
-            case 0:
-                app_status_label = this.infoLabelRunning;
-                break;
-            case 2:
-                app_status_label = this.infoLabelStopped;
-                break;
-            case 3:
-                app_status_label = this.infoLabelStarting;
-                spinning = ' spinning';
-                break;
-            case 4:
-                app_status_label = this.infoLabelUpdating;
-                spinning = ' spinning';
-                break;
-            default:
-                app_status_label = this.infoLabelError;
-                return `<table class="table">
-                            <tr class="tr">
-                                <td class="td left" style="min-width:33%%">
-                                    ${_('Status')}:
-                                </td>
-                                <td class="td left">
-                                    ${app_status_label}
-                                </td>
-                            </tr>
-                        </table>`;
+    decode_pkg_list: function(pkg_list) {
+        let pkg_dict = { };
+        let lines = pkg_list.trim().split('\n');
+        for (let i = 0; i < lines.length; i++) {
+            let line = lines[i].trim();
+            let name;
+            let ver;
+            if (this.packager.name == 'apk') {
+                let fullname = line.split(' ')[0];
+                let mpos = fullname.lastIndexOf("-");
+                if (mpos <= 0)
+                    continue;
+                if (fullname.substring(mpos+1, mpos+2) == 'r') {
+                    // release number
+                    fullname = fullname.substring(0, mpos);
+                }
+                mpos = fullname.lastIndexOf("-");
+                if (mpos <= 0)
+                    continue;
+                name = fullname.substring(0, mpos).trim();
+                ver = fullname.substring(mpos+1).trim();
+            } else {
+                if (!line.includes(' - '))
+                    continue;
+                name = line.split(' - ')[0].trim();
+                ver  = line.split(' - ')[1].trim();
+                let spos = ver.indexOf(" ");
+                if (spos > 0) {
+                    ver = ver.substring(0, spos);
+                }
+            }
+            pkg_dict[name] = ver;
         }
-        */
-        return `<table class="table">
+        return pkg_dict;
+    },
+
+    get_pid_list: function(proc_list) {
+        let plist = [ ];
+        let lines = proc_list.trim().split('\n');
+        for (let i = 0; i < lines.length; i++) {
+            let line = lines[i].trim();
+            if (line.length > 5) {
+                let word_list = line.split(/\s+/);
+                let pid = word_list[0];
+                let isnum = /^\d+$/.test(pid);
+                if (isnum) {
+                    plist.push(parseInt(pid));
+                }
+            }
+        }
+        return plist;
+    },
+
+    decode_svc_info: function(svc_autorun, svc_info, proc_list, cfg) {
+        let result = {
+            "autorun": svc_autorun,
+            "dmn": {
+                inited: false,
+                total: 0,
+                running: 0,
+                working: 0,
+            },
+            "status": this.statusDict.error,
+        };
+        if (svc_info.code != 0) {
+            return -1;
+        }
+        if (proc_list.code != 0) {
+            return -2;
+        }        
+        let plist = this.get_pid_list(proc_list.stdout);
+        
+        if (plist.length < 4) {
+            return -3;
+        }
+        if (typeof(svc_info.stdout) !== 'string') {
+            return -4;
+        }
+        if (svc_info.stdout.length < 3) {
+            return -5;
+        }
+        let jdata;
+        try {
+            jdata = JSON.parse(svc_info.stdout);
+        } catch (e) {
+            console.log('Incorrect JSON: ' + svc_info.stdout);
+            return -6;
+        }
+        if (typeof(jdata) !== 'object') {
+            return -7;
+        }
+        if (typeof(jdata.zapret) == 'object') {
+            result.dmn.inited = true;
+            let dmn_list = jdata.zapret.instances;
+            if (typeof(dmn_list) == 'object') {
+                for (const [dmn_name, daemon] of Object.entries(dmn_list)) {
+                    result.dmn.total += 1;
+                    if (daemon.running) {
+                        result.dmn.running += 1;
+                    }
+                    if (daemon.pid !== undefined && daemon.pid != null) {
+                        if (plist.includes(daemon.pid)) {
+                            result.dmn.working += 1;
+                        }
+                    }
+                }
+            }
+        }
+        //console.log('SVC_DAEMONS: ' + result.dmn.working + ' / ' + result.dmn.total);
+        if (result.dmn.total == 0) {
+            result.status = (!svc_autorun) ? this.statusDict.disabled : this.statusDict.stopped;
+        } else {
+            result.status = (result.dmn.inited) ? this.statusDict.started : this.statusDict.running;
+        }
+        return result;
+    },
+
+    makeStatusString: function(svcinfo, fwtype, bllist_preset) {
+        let svc_autorun = _('Unknown');
+        let svc_daemons = _('Unknown');
+        
+        if (typeof(svcinfo) == 'object') {
+            svc_autorun = (svcinfo.autorun) ? _('Enabled') : _('Disabled');
+            if (!svcinfo.dmn.inited) {
+                svc_daemons = _('Stopped');
+            } else {
+                svc_daemons = (!svcinfo.dmn.working) ? _('Starting') : _('Running');
+                svc_daemons += ' [' + svcinfo.dmn.working + '/' + svcinfo.dmn.total + ']';
+            }
+        }
+        let update_mode = _('user entries only');
+        
+        let td_name_width = 40;
+        let td_name_style = `style="width: ${td_name_width}%; min-width:${td_name_width}%; max-width:${td_name_width}%;"`;
+        let out = `
+                <table class="table">
                     <tr class="tr">
-                        <td class="td left" style="min-width:33%%">
-                            ${_('Status')}:
+                        <td class="td left" ${td_name_style}>
+                            ${_('Service autorun status')}:
                         </td>
-                        <td class="td left%s">
-                            %s %s
+                        <td class="td left">
+                            ${svc_autorun}
                         </td>
                     </tr>
                     <tr class="tr">
-                        <td class="td left">
+                        <td class="td left" ${td_name_style}>
+                            ${_('Service daemons status')}:
+                        </td>
+                        <td class="td left %s">
+                            ${svc_daemons}
+                        </td>
+                    </tr>
+                    <tr class="tr">
+                        <td class="td left" ${td_name_style}>
                             ${_('FW type')}:
                         </td>
                         <td class="td left">
-                            %s
+                            ${fwtype}
                         </td>
                     </tr>
                     <tr class="tr">
-                        <td class="td left">
+                        <td class="td left" ${td_name_style}>
                             ${_('Blacklist update mode')}:
                         </td>
                         <td class="td left">
-                            %s
+                            ${update_mode}
                         </td>
                     </tr>
-                </table>
-        `.format(
-            spinning,
-            app_status_label,
-            '',
-            fwtype,
-            _('user entries only')
-        );
+                    <tr class="tr">
+                        <td class="td left" ${td_name_style}>
+                        </td>
+                        <td class="td left">
+                        </td>
+                    </tr>
+                </table>`;
+        return out;
     },
 
     fileEditDialog: baseclass.extend({
@@ -261,16 +406,26 @@ return baseclass.extend({
     }),
 
     longstrEditDialog: baseclass.extend({
-        __init__: function(cfgsec, cfgparam, title, desc, rows = 10) {
+        __init__: function(cfgsec, cfgparam, title, desc, rows = 10, multiline = false) {
             this.cfgsec      = cfgsec;
             this.cfgparam    = cfgparam;
             this.title       = title;
             this.desc        = desc;
             this.rows        = rows;
+            this.multiline   = multiline;
         },
 
         load: function() {
-            return uci.get('zapret', this.cfgsec, this.cfgparam);
+            let value = uci.get('zapret', this.cfgsec, this.cfgparam);
+            if (typeof(value) === 'string') {
+                value = value.trim();
+                if (this.multiline == 2) {
+                    value = value.replace(/\n  --/g, "\n--");
+                    value = value.replace(/\n --/g, "\n--");
+                    value = value.replace(/ --/g, "\n--");
+                }
+            }
+            return value;
         },
 
         render: function(content) {
@@ -308,13 +463,40 @@ return baseclass.extend({
 
         handleSave: function(ev) {
             let txt = document.getElementById('widget.modal_content');
-            let value = txt.value.trim().replace(/\r\n/g, ' ').replace(/\r/g, ' ').replace(/\n/g, ' ').trim();
-
+            let value = txt.value.trim();
+            if (this.multiline) {
+                value = value.replace(/\r/g, '');
+                if (value != "" && value != "\t") {
+                    value = '\n' + value + '\n';
+                    if (this.multiline == 2) {
+                        value = value.replace(/"/g, '');
+                        value = value.replace(/'/g, '');
+                    }
+                }
+            } else {
+                value = value.replace(/\r\n/g, ' ');
+                value = value.replace(/\r/g, ' ');
+                value = value.replace(/\n/g, ' ');
+                value = value.trim();
+            }
+            if (value == "") {
+                value = "\t";
+            }
+            value = value.replace(/˂/g, '<');
+            value = value.replace(/˃/g, '>');
             uci.set('zapret', this.cfgsec, this.cfgparam, value);
             uci.save();
             let elem = document.getElementById("cbi-zapret-" + this.cfgsec + "-_" + this.cfgparam);
             if (elem) {
-                elem.querySelector('div').textContent = value;
+                let val = value.trim();
+                if (this.multiline) {
+                    val = val.replace(/</g, '˂');
+                    val = val.replace(/>/g, '˃');
+                    val = val.replace(/\n/g, '<br/>');
+                    elem.querySelector('div').innerHTML = val;
+                } else {
+                    elem.querySelector('div').textContent = val;
+                }
             }
             ui.hideModal();
             /*

luci-app-zapret/root/usr/share/luci/menu.d/luci-app-zapret.json

@@ -10,6 +10,7 @@
 			"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 }

luci-app-zapret/root/usr/share/rpcd/acl.d/luci-app-zapret.json

@@ -8,6 +8,10 @@
 				"/opt/zapret/ipset/*": [ "read" ],
 				"/etc/crontabs/root": [ "read" ],
 				"/etc/init.d/zapret*": [ "exec" ],
+				"/bin/ps*": [ "exec" ],
+				"/bin/opkg*": [ "exec" ],
+				"/usr/bin/apk*": [ "exec" ],
+				"/opt/zapret/restore-def-cfg.sh*": [ "exec" ],
 				"/opt/zapret/sync_config.sh*": [ "exec" ]
 			},
 			"uci": [ "zapret", "network" ],

zapret-ip2net/Makefile

@@ -1,8 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-ip2net
-PKG_VERSION:=65
-PKG_RELEASE:=20241016
+PKG_VERSION:=69.20241206
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -10,8 +9,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fc0b8266e3e02c62af699b18c032800b0032866f
-PKG_SOURCE_DATE:=2024-10-16
+PKG_SOURCE_VERSION:=4e5caf4087d79ada0715387dbb14035783b6be41
+PKG_SOURCE_DATE:=2024-12-06
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret-mdig/Makefile

@@ -1,8 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-mdig
-PKG_VERSION:=65
-PKG_RELEASE:=20241016
+PKG_VERSION:=69.20241206
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -10,8 +9,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fc0b8266e3e02c62af699b18c032800b0032866f
-PKG_SOURCE_DATE:=2024-10-16
+PKG_SOURCE_VERSION:=4e5caf4087d79ada0715387dbb14035783b6be41
+PKG_SOURCE_DATE:=2024-12-06
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret-tpws/Makefile

@@ -1,8 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-tpws
-PKG_VERSION:=65
-PKG_RELEASE:=20241016
+PKG_VERSION:=69.20241206
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -10,8 +9,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fc0b8266e3e02c62af699b18c032800b0032866f
-PKG_SOURCE_DATE:=2024-10-16
+PKG_SOURCE_VERSION:=4e5caf4087d79ada0715387dbb14035783b6be41
+PKG_SOURCE_DATE:=2024-12-06
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?

zapret/Makefile

@@ -5,8 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret
-PKG_VERSION:=65
-PKG_RELEASE:=20241016
+PKG_VERSION:=69.20241206
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -14,8 +13,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fc0b8266e3e02c62af699b18c032800b0032866f
-PKG_SOURCE_DATE:=2024-10-16
+PKG_SOURCE_VERSION:=4e5caf4087d79ada0715387dbb14035783b6be41
+PKG_SOURCE_DATE:=2024-12-06
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?
@@ -77,35 +76,45 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/openwrt/90-zapret $(1)/etc/hotplug.d/iface/90-zapret
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/openwrt/zapret $(1)/etc/init.d/zapret
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./zapret.config $(1)/etc/config/zapret
-	$(INSTALL_CONF) ./config        $(1)/opt/zapret/config
-	#$(INSTALL_CONF) ./ipset/zapret-hosts-auto.txt         $(1)/opt/zapret/ipset/zapret-hosts-auto.txt
-	$(INSTALL_CONF) ./ipset/zapret-hosts-user.txt         $(1)/opt/zapret/ipset/zapret-hosts-user.txt
+	$(INSTALL_BIN) ./init.d.sh $(1)/etc/init.d/zapret
+	$(INSTALL_CONF) ./config.default $(1)/opt/zapret/config.default
+	$(INSTALL_CONF) ./ipset/zapret-hosts-google.txt       $(1)/opt/zapret/ipset/zapret-hosts-google.txt
 	$(INSTALL_CONF) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-	$(INSTALL_CONF) ./ipset/zapret-hosts-user-ipban.txt   $(1)/opt/zapret/ipset/zapret-hosts-user-ipban.txt
-	#$(INSTALL_CONF) ./ipset/zapret-ip.txt                 $(1)/opt/zapret/ipset/zapret-ip.txt
 	$(INSTALL_CONF) ./ipset/zapret-ip-exclude.txt         $(1)/opt/zapret/ipset/zapret-ip-exclude.txt
-	$(INSTALL_CONF) ./ipset/zapret-ip-user.txt            $(1)/opt/zapret/ipset/zapret-ip-user.txt
-	$(INSTALL_CONF) ./ipset/zapret-ip-user-exclude.txt    $(1)/opt/zapret/ipset/zapret-ip-user-exclude.txt
-	$(INSTALL_CONF) ./ipset/zapret-ip-user-ipban.txt      $(1)/opt/zapret/ipset/zapret-ip-user-ipban.txt
-	$(INSTALL_CONF) ./ipset/cust1.txt      $(1)/opt/zapret/ipset/cust1.txt
-	$(INSTALL_CONF) ./ipset/cust2.txt      $(1)/opt/zapret/ipset/cust2.txt
-	$(INSTALL_CONF) ./ipset/cust3.txt      $(1)/opt/zapret/ipset/cust3.txt
-	$(INSTALL_CONF) ./ipset/cust4.txt      $(1)/opt/zapret/ipset/cust4.txt
-	$(INSTALL_BIN) ./sync_config.sh $(1)/opt/zapret/sync_config.sh
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./uci-def-cfg.sh     $(1)/etc/uci-defaults/zapret-uci-def-cfg.sh
+	$(INSTALL_BIN) ./uci-def-cfg.sh     $(1)/opt/zapret/uci-def-cfg.sh
+	$(INSTALL_BIN) ./comfunc.sh         $(1)/opt/zapret/comfunc.sh
+	$(INSTALL_BIN) ./def-cfg.sh         $(1)/opt/zapret/def-cfg.sh
+	$(INSTALL_BIN) ./renew-cfg.sh       $(1)/opt/zapret/renew-cfg.sh
+	$(INSTALL_BIN) ./restore-def-cfg.sh $(1)/opt/zapret/restore-def-cfg.sh
+	$(INSTALL_BIN) ./sync_config.sh     $(1)/opt/zapret/sync_config.sh
 endef
 
 define Package/$(PKG_NAME)/preinst
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
+	if [ -f "/etc/init.d/zapret" ]; then
+		SCRIPT=$$( readlink /etc/init.d/zapret )
+		if [ -n "$${SCRIPT}" ]; then
+			echo "Please uninstall original zapret utility!"
+			exit 44
+		fi
+	fi
 	if [ "$${PKG_UPGRADE}" = "1" ]; then
 		# stop service if PKG_UPGRADE
 		[ -x "/etc/init.d/zapret" ] && /etc/init.d/zapret stop >/dev/null 2>&1
 	fi
-fi	
+	if [ ! -f "/opt/zapret/ipset/zapret-hosts-google.txt" ]; then
+		if [ -f "/opt/zapret/ipset/zapret-hosts-user.txt" ]; then
+			CFGLISTHASH=$$( md5sum "/opt/zapret/ipset/zapret-hosts-user.txt" | awk '{print $$1;}' )
+			if [ "$${CFGLISTHASH}" = "79e35df62b0d1ae455d0a7e04c4cecac" ]; then
+				rm -f "/opt/zapret/ipset/zapret-hosts-user.txt"
+			fi
+		fi
+	fi
+fi
 exit 0
 endef
 
@@ -113,32 +122,38 @@ define Package/$(PKG_NAME)/postinst
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	NEWCFGNAME=zapret-opkg
-	NEWCFGFILE=/etc/config/$${NEWCFGNAME}
-	if [ -f "$${NEWCFGFILE}" ]; then
-		uci -m -f /etc/config/zapret import "$${NEWCFGNAME}"
-		uci commit "$${NEWCFGNAME}"
-		uci -m -f "$${NEWCFGFILE}" import zapret
-		uci commit zapret
-		rm -f "$${NEWCFGFILE}"
-		echo "File /etc/config/zapret merged from IPK"
+	ZAPRET_CONFIG=/opt/zapret/config
+	ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
+	# creating main config if its not exists
+	if [ ! -f "$${ZAPRET_CONFIG}" ]; then
+		cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
 	fi
-	NEWCONFIG=/opt/zapret/config-opkg
-	if [ -f "$${NEWCONFIG}" ]; then
-		# backup current main config
-		mv -f /opt/zapret/config /opt/zapret/config.backup
-		# renew main config
-		mv -f "$${NEWCONFIG}" /opt/zapret/config
-		echo "File /opt/zapret/config replaced from IPK"
+	# 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
-	# synchnonize main config
+	# check existing uci-config
+	[ -f "/etc/config/zapret" ] && ZAPRET_CFG_EXISTS=1 || ZAPRET_CFG_EXISTS=0
+	# create or merge uci-config
+	/opt/zapret/uci-def-cfg.sh
+	[ "$${ZAPRET_CFG_EXISTS}" = "1" ] && echo "Config /etc/config/zapret merged with default uci-config"
+	# remove uci-default script from system dir (used into /etc/init.d/boot)
+	rm -f /etc/uci-defaults/zapret-uci-def-cfg.sh
+	# copy (sync) all params from uci-config to main config
 	/opt/zapret/sync_config.sh
+	# check main config
+	sh -n "$${ZAPRET_CONFIG}" 2>/dev/null || cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
+	sh -n "$${ZAPRET_CONFIG}" 2>/dev/null || exit 58
 	# enable main service
 	/etc/init.d/zapret enable
 	# stop all
 	/etc/init.d/zapret stop_fw
 	/etc/init.d/zapret stop_daemons
-	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $1}' | xargs -r kill -9
+	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
 	# start main service
 	/etc/init.d/zapret start
 	# restart firewall
@@ -154,7 +169,14 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	EXEDIR=/opt/zapret
 	ZAPRET_BASE=/opt/zapret
 	ZAPRET_CONFIG=/opt/zapret/config
+	ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
 	OPENWRT_FW_INCLUDE=/etc/firewall.zapret
+	# check main config
+	sh -n "$${ZAPRET_CONFIG}" 2>/dev/null || cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
+	if ! sh -n "$${ZAPRET_CONFIG}" 2>/dev/null ; then
+		ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
+		exit 0
+	fi
 	. "$${ZAPRET_CONFIG}"
 	. "$${ZAPRET_BASE}/common/base.sh"
 	. "$${ZAPRET_BASE}/common/fwtype.sh"
@@ -162,7 +184,7 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	. "$${ZAPRET_BASE}/common/installer.sh"
 	/etc/init.d/zapret disable
 	/etc/init.d/zapret stop
-	ps w | grep '/opt/zapret/nfq/nfqws' | 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
@@ -175,7 +197,7 @@ define Package/$(PKG_NAME)/postrm
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
 	[ -f "/etc/config/zapret-opkg" ] && rm -f "/etc/config/zapret-opkg"
-	[ -f "/opt/zapret/config" ] && cp -f /opt/zapret/config "/opt/zapret/config.backup2"
+	[ -f "/opt/zapret/config" ] && cp -f /opt/zapret/config "/opt/zapret/config.backup"
 	#rm -rf /opt/zapret
 	#echo "Directory /opt/zapret removed!"
 fi

zapret/comfunc.sh

@@ -0,0 +1,124 @@
+#!/bin/sh
+# Copyright (c) 2024 remittor
+
+EXEDIR=/opt/zapret
+ZAPRET_BASE=/opt/zapret
+
+ZAPRET_INITD=/etc/init.d/zapret
+ZAPRET_ORIG_INITD="$ZAPRET_BASE/init.d/openwrt/zapret"
+
+ZAPRET_CONFIG="$ZAPRET_BASE/config"
+ZAPRET_CONFIG_NEW="$ZAPRET_BASE/config.new"
+ZAPRET_CONFIG_DEF="$ZAPRET_BASE/config.default"
+
+ZAPRET_CFG=/etc/config/zapret
+ZAPRET_CFG_NAME=zapret
+ZAPRET_CFG_SEC_NAME="$( uci -q get $ZAPRET_CFG_NAME.config )"
+
+. $ZAPRET_BASE/def-cfg.sh
+
+function adapt_for_sed
+{
+	local str=$( ( echo $1|sed -r 's/([\$\.\*\/\[\\^])/\\\1/g'|sed 's/[]]/\\]/g' )>&1 )
+	echo "$str"
+}
+
+function is_valid_config
+{
+	local fname=${1:-$ZAPRET_CONFIG}
+	sh -n "$fname" &>/dev/null
+	return $?
+}
+
+function get_ppid_by_pid
+{
+	local pid=$1
+	local ppid="$( cat /proc/$pid/status 2>/dev/null | grep '^PPid:' | awk '{print $2}' )"
+	echo "$ppid"
+}
+
+function get_proc_path_by_pid
+{
+	local pid=$1
+	local path=$( cat /proc/$pid/cmdline 2>/dev/null | tr '\0' '\n' | head -n1 )
+	echo "$path"
+}
+
+function get_proc_cmd_by_pid
+{
+	local pid=$1
+	local delim="$2"
+	local cmdline
+	if [ "$delim" = "" ]; then
+		cmdline="$( cat /proc/$pid/cmdline 2>/dev/null | tr '\0' '\n' )"
+	else
+		cmdline="$( cat /proc/$pid/cmdline 2>/dev/null | tr '\0' "$delim" )"
+	fi
+	echo "$cmdline"
+}
+
+function is_run_via_procd
+{
+	local pname
+	[ "$$" = "1" ] && return 0	
+	pname="$( get_proc_path_by_pid $$ )"
+	[ "$pname" = "/sbin/procd" ] && return 0
+	[ "$PPID" = "1" ] && return 0
+	pname="$( get_proc_path_by_pid $PPID )"
+	[ "$pname" = "/sbin/procd" ] && return 0
+	return 1
+}
+
+function is_run_on_boot
+{
+	local cmdline="$( get_proc_cmd_by_pid $$ ' ' )"
+	if echo "$cmdline" | grep -q " /etc/rc.d/S" ; then
+		if echo "$cmdline" | grep -q " boot $" ; then
+			return 0
+		fi
+	fi
+	return 1
+}
+
+function get_run_on_boot_option
+{
+	if [ "$( uci -q get $ZAPRET_CFG_NAME.config.run_on_boot )" = "1" ]; then
+		echo 1
+	else
+		echo 0
+	fi
+}
+
+function create_default_cfg
+{
+	local cfgname=${1:-$ZAPRET_CFG_NAME}
+	local cfgfile=/etc/config/$cfgname
+	rm -f $cfgfile
+	touch $cfgfile
+	uci set $cfgname.config=main
+	set_cfg_default_values $cfgname
+	return 0
+}
+
+function merge_cfg_with_def_values
+{
+	local cfgname=${1:-$ZAPRET_CFG_NAME}
+	local force=$2
+	local cfgfile=/etc/config/$cfgname
+	local NEWCFGNAME="zapret-default"
+	local NEWCFGFILE="/etc/config/$NEWCFGNAME"
+
+	local cfg_sec_name="$( uci -q get $ZAPRET_CFG_NAME.config )"
+	[ -z "$cfg_sec_name" ] && create_default_cfg
+
+	create_default_cfg "$NEWCFGNAME"
+	[ ! -f "$NEWCFGFILE" ] && return 1 
+
+	uci -m -f $cfgfile import "$NEWCFGNAME"
+	uci commit "$NEWCFGNAME"
+	uci -m -f "$NEWCFGFILE" import $cfgname
+	uci commit $cfgname
+	rm -f "$NEWCFGFILE"	
+	return 0
+}
+

zapret/config

@@ -1,144 +0,0 @@
-# this file is included from init scripts
-# change values here
-
-# can help in case /tmp has not enough space
-#TMPDIR=/opt/zapret/tmp
-
-# override firewall type : iptables,nftables,ipfw
-FWTYPE=nftables
-
-# options for ipsets
-# maximum number of elements in sets. also used for nft sets
-SET_MAXELEM=522288
-
-# too low hashsize can cause memory allocation errors on low RAM systems , even if RAM is enough
-# too large hashsize will waste lots of RAM
-IPSET_OPT="hashsize 262144 maxelem $SET_MAXELEM"
-
-# dynamically generate additional ip. $1 = ipset/nfset/table name
-#IPSET_HOOK="/etc/zapret.ipset.hook"
-
-# options for ip2net. "-4" or "-6" auto added by ipset create script
-IP2NET_OPT4="--prefix-length=22-30 --v4-threshold=3/4"
-IP2NET_OPT6="--prefix-length=56-64 --v6-threshold=5"
-
-# options for auto hostlist
-AUTOHOSTLIST_RETRANS_THRESHOLD=3
-AUTOHOSTLIST_FAIL_THRESHOLD=3
-AUTOHOSTLIST_FAIL_TIME=60
-# 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
-
-# ipset/*.sh can compress large lists
-GZIP_LISTS=0
-
-# command to reload ip/host lists after update
-# comment or leave empty for auto backend selection : ipset or ipfw if present
-# on BSD systems with PF no auto reloading happens. you must provide your own command
-# set to "-" to disable reload
-#LISTS_RELOAD="pfctl -f /etc/pf.conf"
-
-# override ports
-#HTTP_PORTS=80-81,85
-#HTTPS_PORTS=443,500-501
-#QUIC_PORTS=443,444
-
-# CHOOSE OPERATION MODE
-# MODE : nfqws,tpws,tpws-socks,filter,custom
-# nfqws : nfqws for dpi desync
-# tpws : tpws transparent mode
-# tpws-socks : tpws socks mode
-# filter : no daemon, just create ipset or download hostlist
-# custom : custom mode. should modify custom init script and add your own code
-MODE=nfqws
-
-MODE_HTTP=1
-MODE_HTTP_KEEPALIVE=0
-MODE_HTTPS=1
-MODE_QUIC=1
-
-# none,ipset,hostlist,autohostlist
-MODE_FILTER=hostlist
-
-# CHOOSE NFQWS DAEMON OPTIONS for DPI desync mode. run "nfq/nfqws --help" for option list
-DESYNC_MARK=0x40000000
-DESYNC_MARK_POSTNAT=0x20000000
-
-
-NFQWS_OPT_DESYNC="--dpi-desync=fake,split2 --dpi-desync-ttl=7 --dpi-desync-ttl6=0 --dpi-desync-repeats=20 --dpi-desync-fooling=md5sig,badseq --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin"
-
-NFQWS_OPT_DESYNC_SUFFIX=""
-
-NFQWS_OPT_DESYNC_HTTP=""
-
-NFQWS_OPT_DESYNC_HTTP_SUFFIX=""
-
-NFQWS_OPT_DESYNC_HTTPS=""
-
-NFQWS_OPT_DESYNC_HTTPS_SUFFIX=""
-
-NFQWS_OPT_DESYNC_HTTP6=""
-
-NFQWS_OPT_DESYNC_HTTP6_SUFFIX=""
-
-NFQWS_OPT_DESYNC_HTTPS6=""
-
-NFQWS_OPT_DESYNC_HTTPS6_SUFFIX=""
-
-NFQWS_OPT_DESYNC_QUIC="--dpi-desync=fake,split2 --dpi-desync-repeats=15 --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin --new --dpi-desync=fake --dpi-desync-repeats=15"
-
-NFQWS_OPT_DESYNC_QUIC_SUFFIX=""
-
-NFQWS_OPT_DESYNC_QUIC6=""
-
-NFQWS_OPT_DESYNC_QUIC6_SUFFIX=""
-
-
-# CHOOSE TPWS DAEMON OPTIONS. run "tpws/tpws --help" for option list
-# SUFFIX VARS define additional lower priority desync profile. it's required if MODE_FILTER=hostlist and strategy has hostlist-incompatible 0-phase desync methods (mss)
-TPWS_OPT="--hostspell=HOST --split-http-req=method --split-pos=3 --oob"
-#TPWS_OPT_SUFFIX="--mss 88"
-
-# FlowOffload mode : donttouch,none,software,hardware
-FLOWOFFLOAD=none
-
-# openwrt: specify networks to be treated as LAN. default is "lan"
-#OPENWRT_LAN="lan lan2 lan3"
-
-# openwrt: specify networks to be treated as WAN. default wans are interfaces with default route
-#OPENWRT_WAN4="wan vpn"
-#OPENWRT_WAN6="wan6 vpn6"
-
-# for routers based on desktop linux and macos. has no effect in openwrt.
-# CHOOSE LAN and optinally WAN/WAN6 NETWORK INTERFACES
-# or leave them commented if its not router
-# it's possible to specify multiple interfaces like this : IFACE_LAN="eth0 eth1 eth2"
-# 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"
-
-# should start/stop command of init scripts apply firewall rules ?
-# not applicable to openwrt with firewall3+iptables
-INIT_APPLY_FW=1
-
-# firewall apply hooks
-#INIT_FW_PRE_UP_HOOK="/etc/firewall.zapret.hook.pre_up"
-#INIT_FW_POST_UP_HOOK="/etc/firewall.zapret.hook.post_up"
-#INIT_FW_PRE_DOWN_HOOK="/etc/firewall.zapret.hook.pre_down"
-#INIT_FW_POST_DOWN_HOOK="/etc/firewall.zapret.hook.post_down"
-
-# do not work with ipv4
-DISABLE_IPV4=0
-
-# do not work with ipv6
-DISABLE_IPV6=1
-
-# select which init script will be used to get ip or host list
-# possible values : get_user.sh get_antizapret.sh get_combined.sh get_reestr.sh get_hostlist.sh
-# comment if not required
-#GETLIST=get_antizapret_domains.sh
-#GETLIST=get_antifilter_ipsmart.sh

zapret/config.default

@@ -0,0 +1,137 @@
+# this file is included from init scripts
+# change values here
+
+# can help in case /tmp has not enough space
+#TMPDIR=/opt/zapret/tmp
+
+# override firewall type : iptables,nftables,ipfw
+FWTYPE=nftables
+
+# nftables only : set this to 0 to use pre-nat mode. default is post-nat.
+# pre-nat mode disables some bypass techniques for forwarded traffic but allows to see client IP addresses in debug log
+POSTNAT=1
+
+# options for ipsets
+# maximum number of elements in sets. also used for nft sets
+SET_MAXELEM=522288
+
+# too low hashsize can cause memory allocation errors on low RAM systems , even if RAM is enough
+# too large hashsize will waste lots of RAM
+IPSET_OPT="hashsize 262144 maxelem $SET_MAXELEM"
+
+# dynamically generate additional ip. $1 = ipset/nfset/table name
+#IPSET_HOOK="/etc/zapret.ipset.hook"
+
+# options for ip2net. "-4" or "-6" auto added by ipset create script
+IP2NET_OPT4="--prefix-length=22-30 --v4-threshold=3/4"
+IP2NET_OPT6="--prefix-length=56-64 --v6-threshold=5"
+
+# options for auto hostlist
+AUTOHOSTLIST_RETRANS_THRESHOLD=3
+AUTOHOSTLIST_FAIL_THRESHOLD=3
+AUTOHOSTLIST_FAIL_TIME=60
+# 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
+
+# ipset/*.sh can compress large lists
+GZIP_LISTS=0
+
+# command to reload ip/host lists after update
+# comment or leave empty for auto backend selection : ipset or ipfw if present
+# on BSD systems with PF no auto reloading happens. you must provide your own command
+# set to "-" to disable reload
+#LISTS_RELOAD="pfctl -f /etc/pf.conf"
+
+# none,ipset,hostlist,autohostlist
+MODE_FILTER=hostlist
+
+# mark bit used by nfqws to prevent loop
+DESYNC_MARK=0x40000000
+DESYNC_MARK_POSTNAT=0x20000000
+
+
+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.
+NFQWS_PORTS_TCP="80,443"
+NFQWS_PORTS_UDP="443"
+
+# PKT_OUT means connbytes dir original
+# PKT_IN means connbytes dir reply
+# this is --dpi-desync-cutoff=nX kernel mode implementation for linux. it saves a lot of CPU.
+NFQWS_TCP_PKT_OUT="9"
+NFQWS_TCP_PKT_IN="3"
+NFQWS_UDP_PKT_OUT="9"
+NFQWS_UDP_PKT_IN="0"
+
+# redirect outgoing traffic without connbytes limiter and incoming with connbytes limiter
+# normally it's needed only for stateless DPI that matches every packet in a single TCP session
+# typical example are plain HTTP keep alives
+# this mode can be very CPU consuming. enable with care !
+NFQWS_PORTS_TCP_KEEPALIVE=0
+NFQWS_PORTS_UDP_KEEPALIVE=0
+
+# use <HOSTLIST> and <HOSTLIST_NOAUTO> placeholders to engage standard hostlists and autohostlist in ipset dir
+# hostlist markers are replaced to empty string if MODE_FILTER does not satisfy
+# <HOSTLIST_NOAUTO> appends ipset/zapret-hosts-auto.txt as normal list
+NFQWS_OPT="--filter-tcp=80 <HOSTLIST> --dpi-desync=fake,fakedsplit --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --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=md5sig --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin --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=fake,multidisorder --dpi-desync-split-pos=midsld --dpi-desync-repeats=6 --dpi-desync-fooling=badseq,md5sig"
+
+
+# FlowOffload mode : donttouch,none,software,hardware
+FLOWOFFLOAD=none
+
+# openwrt: specify networks to be treated as LAN. default is "lan"
+#OPENWRT_LAN="lan lan2 lan3"
+
+# openwrt: specify networks to be treated as WAN. default wans are interfaces with default route
+#OPENWRT_WAN4="wan vpn"
+#OPENWRT_WAN6="wan6 vpn6"
+
+# for routers based on desktop linux and macos. has no effect in openwrt.
+# CHOOSE LAN and optinally WAN/WAN6 NETWORK INTERFACES
+# or leave them commented if its not router
+# it's possible to specify multiple interfaces like this : IFACE_LAN="eth0 eth1 eth2"
+# 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"
+
+# should start/stop command of init scripts apply firewall rules ?
+# not applicable to openwrt with firewall3+iptables
+INIT_APPLY_FW=1
+
+# firewall apply hooks
+#INIT_FW_PRE_UP_HOOK="/etc/firewall.zapret.hook.pre_up"
+#INIT_FW_POST_UP_HOOK="/etc/firewall.zapret.hook.post_up"
+#INIT_FW_PRE_DOWN_HOOK="/etc/firewall.zapret.hook.pre_down"
+#INIT_FW_POST_DOWN_HOOK="/etc/firewall.zapret.hook.post_down"
+
+# do not work with ipv4
+DISABLE_IPV4=0
+
+# do not work with ipv6
+DISABLE_IPV6=1
+
+# select which init script will be used to get ip or host list
+# possible values : get_user.sh get_antizapret.sh get_combined.sh get_reestr.sh get_hostlist.sh
+# comment if not required
+#GETLIST=get_antizapret_domains.sh

zapret/def-cfg.sh

@@ -0,0 +1,67 @@
+#!/bin/sh
+# Copyright (c) 2024 remittor
+
+function set_cfg_default_values
+{
+	local cfgname=${1:-$ZAPRET_CFG_NAME}
+	local TAB="$( echo -n -e '\t' )"
+	uci batch <<-EOF
+		set $cfgname.config.run_on_boot='0'
+		# settings for zapret service
+		set $cfgname.config.FWTYPE='nftables'
+		set $cfgname.config.POSTNAT='1'
+		set $cfgname.config.FLOWOFFLOAD='none'
+		set $cfgname.config.INIT_APPLY_FW='1'
+		set $cfgname.config.DISABLE_IPV4='0'
+		set $cfgname.config.DISABLE_IPV6='1'
+		set $cfgname.config.MODE_FILTER='hostlist'
+		# 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.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'
+		set $cfgname.config.NFQWS_OPT="
+			--filter-tcp=80 <HOSTLIST>
+			--dpi-desync=fake,fakedsplit
+			--dpi-desync-autottl=2
+			--dpi-desync-fooling=md5sig
+			--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=md5sig
+			--dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+			--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=fake,multidisorder
+			--dpi-desync-split-pos=midsld
+			--dpi-desync-repeats=6
+			--dpi-desync-fooling=badseq,md5sig
+		"
+		# save changes
+		commit $cfgname
+	EOF
+	return 0
+}

zapret/init.d.sh

@@ -0,0 +1,73 @@
+#!/bin/sh /etc/rc.common
+# Copyright (c) 2024 remittor
+
+USE_PROCD=1
+# after network
+START=21
+
+SCRIPT_FILENAME=$1
+
+. /opt/zapret/comfunc.sh
+
+if ! is_valid_config ; then
+	logger -p err -t ZAPRET "Wrong main config: $ZAPRET_CONFIG"
+	exit 91
+fi
+
+. $ZAPRET_ORIG_INITD
+
+EXEDIR=/opt/zapret
+ZAPRET_BASE=/opt/zapret
+
+is_run_on_boot && IS_RUN_ON_BOOT=1 || IS_RUN_ON_BOOT=0
+
+
+function enable
+{
+	local run_on_boot=""
+	if [ "$IS_RUN_ON_BOOT" = "1" ]; then
+		if [ -n "$ZAPRET_CFG_SEC_NAME" ]; then
+			run_on_boot=$( get_run_on_boot_option )
+			if [ $run_on_boot != 1 ]; then
+				logger -p notice -t ZAPRET "Attempt to enable service, but service blocked!"
+				return 61
+			fi
+		fi
+	fi
+	if [ -n "$ZAPRET_CFG_SEC_NAME" ]; then
+		uci set $ZAPRET_CFG_NAME.config.run_on_boot=1
+		uci commit
+	fi
+	/bin/sh /etc/rc.common $ZAPRET_ORIG_INITD enable
+}
+
+function enabled
+{
+	local run_on_boot=""
+	if [ -n "$ZAPRET_CFG_SEC_NAME" ]; then
+		run_on_boot=$( get_run_on_boot_option )
+		if [ $run_on_boot != 1 ]; then
+			if [ "$IS_RUN_ON_BOOT" = "1" ]; then
+				logger -p notice -t ZAPRET "Service is blocked!"
+			fi
+			return 61
+		fi
+	fi
+	/bin/sh /etc/rc.common $ZAPRET_ORIG_INITD enabled
+}
+
+function boot
+{
+	local run_on_boot=""
+	if [ "$IS_RUN_ON_BOOT" = "1" ]; then
+		if [ -n "$ZAPRET_CFG_SEC_NAME" ]; then
+			run_on_boot=$( get_run_on_boot_option )
+			if [ $run_on_boot != 1 ]; then
+				logger -p notice -t ZAPRET "Attempt to run service on boot! Service is blocked!"
+				return 61
+			fi
+		fi
+	fi
+	/bin/sh /etc/rc.common $ZAPRET_ORIG_INITD start "$@"
+}
+

zapret/renew-cfg.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+# Copyright (c) 2024 remittor
+
+. /opt/zapret/comfunc.sh
+
+merge_cfg_with_def_values
+
+CONFIGS_SYNC=0
+
+[ ! -f "$ZAPRET_CONFIG" ] && CONFIGS_SYNC=1
+[ "$1" = "sync" ] && CONFIGS_SYNC=1
+
+if [ "$CONFIGS_SYNC" = "1" ]; then
+	# renew main config
+	/opt/zapret/sync_config.sh
+fi

zapret/restore-def-cfg.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+# Copyright (c) 2024 remittor
+
+. /opt/zapret/comfunc.sh
+
+cfg_run_on_boot="$( uci -q get zapret.config.run_on_boot )"
+
+create_default_cfg
+
+if [ "$cfg_run_on_boot" = "1" ]; then
+	uci set zapret.config.run_on_boot=1
+	uci commit
+fi
+
+if [ "$1" = "sync" ]; then
+	# renew main config
+	/opt/zapret/sync_config.sh
+fi

zapret/sync_config.sh

@@ -1,21 +1,30 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor
 
-EXEDIR=/opt/zapret
-ZAPRET_BASE=/opt/zapret
-ZAPRET_CONFIG="$ZAPRET_BASE/config"
-ZAPRET_CFG=/etc/config/zapret
+. /opt/zapret/comfunc.sh
 
-function get_sed_compat
+function uncomment_param
 {
-	local str=$( ( echo $1|sed -r 's/([\$\.\*\/\[\\^])/\\\1/g'|sed 's/[]]/\\]/g' )>&1 )
-	echo "$str"
+	local param=$1
+	local fname=${2:-$ZAPRET_CONFIG}
+	sed -i "/^#$param=/s/^#//" $fname
+}
+
+function append_param
+{
+	local param=$1
+	local fname=${2:-$ZAPRET_CONFIG}
+	grep -q "^$param=" $fname
+	if [ "$?" != "0" ]; then
+		echo "" >> $fname
+		echo "$param=" >> $fname
+	fi
 }
 
 function set_param_value
 {
 	local param=$1
-	local value=$( get_sed_compat "$2" )
+	local value=$( adapt_for_sed "$2" )
 	local fname=${3:-$ZAPRET_CONFIG}
 	sed -i "s/^$param=.*/$param=$value/g" $fname
 }
@@ -23,7 +32,7 @@ function set_param_value
 function set_param_value_str
 {
 	local param=$1
-	local value=$( get_sed_compat "$2" )
+	local value=$( adapt_for_sed "$2" )
 	local fname=${3:-$ZAPRET_CONFIG}
 	sed -i "s/^$param=.*/$param=\"$value\"/g" $fname
 }
@@ -32,38 +41,65 @@ function sync_param
 {
 	local param=$1
 	local vtype=$2
-	local value=$( uci -q get zapret.@main[0].$param )
+	local value="$( uci -q get zapret.config.$param )"
+	uncomment_param $param
+	append_param $param
+	local TAB="$( echo -n -e '\t' )"
+	if [ "$value" = "$TAB" ]; then
+		value=""
+	fi
 	if [ "$vtype" = "str" ]; then
 		set_param_value_str $param "$value"
 	else
 		set_param_value $param $value
 	fi
 }
-	
-sync_param MODE
+
+if [ ! -f "$ZAPRET_CONFIG" ]; then
+	if [ ! -f "$ZAPRET_CONFIG_DEF" ]; then
+		touch "$ZAPRET_CONFIG"
+	else
+		cp -f "$ZAPRET_CONFIG_DEF" "$ZAPRET_CONFIG"
+	fi
+fi
+
+cp -f "$ZAPRET_CONFIG" "$ZAPRET_CONFIG_NEW"
+
+ZAPRET_CONFIG__SAVED="$ZAPRET_CONFIG"
+ZAPRET_CONFIG="$ZAPRET_CONFIG_NEW"
+
+sync_param FWTYPE
+sync_param POSTNAT
 sync_param FLOWOFFLOAD
 sync_param INIT_APPLY_FW
 sync_param DISABLE_IPV4
 sync_param DISABLE_IPV6
 sync_param MODE_FILTER
+
+sync_param AUTOHOSTLIST_RETRANS_THRESHOLD
+sync_param AUTOHOSTLIST_FAIL_THRESHOLD
+sync_param AUTOHOSTLIST_FAIL_TIME
+sync_param AUTOHOSTLIST_DEBUGLOG
+
+sync_param NFQWS_ENABLE
 sync_param DESYNC_MARK
 sync_param DESYNC_MARK_POSTNAT
-sync_param NFQWS_OPT_DESYNC str
-sync_param NFQWS_OPT_DESYNC_SUFFIX str
-sync_param MODE_HTTP
-sync_param MODE_HTTP_KEEPALIVE
-sync_param NFQWS_OPT_DESYNC_HTTP str
-sync_param NFQWS_OPT_DESYNC_HTTP_SUFFIX str
-sync_param NFQWS_OPT_DESYNC_HTTP6 str
-sync_param NFQWS_OPT_DESYNC_HTTP6_SUFFIX str
-sync_param MODE_HTTPS
-sync_param NFQWS_OPT_DESYNC_HTTPS str
-sync_param NFQWS_OPT_DESYNC_HTTPS_SUFFIX str
-sync_param NFQWS_OPT_DESYNC_HTTPS6 str
-sync_param NFQWS_OPT_DESYNC_HTTPS6_SUFFIX str
-sync_param MODE_QUIC
-sync_param NFQWS_OPT_DESYNC_QUIC str
-sync_param NFQWS_OPT_DESYNC_QUIC_SUFFIX str
-sync_param NFQWS_OPT_DESYNC_QUIC6 str
-sync_param NFQWS_OPT_DESYNC_QUIC6_SUFFIX str
+sync_param NFQWS_PORTS_TCP str
+sync_param NFQWS_PORTS_UDP str
+sync_param NFQWS_TCP_PKT_OUT str
+sync_param NFQWS_TCP_PKT_IN str
+sync_param NFQWS_UDP_PKT_OUT str
+sync_param NFQWS_UDP_PKT_IN str
+sync_param NFQWS_PORTS_TCP_KEEPALIVE
+sync_param NFQWS_PORTS_UDP_KEEPALIVE
+sync_param NFQWS_OPT str
 
+ZAPRET_CONFIG="$ZAPRET_CONFIG__SAVED"
+
+if is_valid_config "$ZAPRET_CONFIG_NEW" ; then
+	cp -f "$ZAPRET_CONFIG_NEW" "$ZAPRET_CONFIG"
+	rm -f "$ZAPRET_CONFIG_NEW"
+else
+	rm -f "$ZAPRET_CONFIG_NEW"
+	return 97
+fi

zapret/uci-def-cfg.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+# Copyright (c) 2024 remittor
+
+. /opt/zapret/comfunc.sh
+
+# create empty txt files into ipset directory
+[ ! -f "/opt/zapret/ipset/zapret-hosts-google.txt"     ] && touch "/opt/zapret/ipset/zapret-hosts-google.txt"
+#[ ! -f "/opt/zapret/ipset/zapret-hosts-auto.txt"      ] && touch "/opt/zapret/ipset/zapret-hosts-auto.txt"
+[ ! -f "/opt/zapret/ipset/zapret-hosts-user.txt"       ] && touch "/opt/zapret/ipset/zapret-hosts-user.txt"
+[ ! -f "/opt/zapret/ipset/zapret-hosts-user-ipban.txt" ] && touch "/opt/zapret/ipset/zapret-hosts-user-ipban.txt"
+#[ ! -f "/opt/zapret/ipset/zapret-ip.txt"              ] && touch "/opt/zapret/ipset/zapret-ip.txt"
+[ ! -f "/opt/zapret/ipset/zapret-ip-user.txt"          ] && touch "/opt/zapret/ipset/zapret-ip-user.txt"
+[ ! -f "/opt/zapret/ipset/zapret-ip-user-exclude.txt"  ] && touch "/opt/zapret/ipset/zapret-ip-user-exclude.txt"
+[ ! -f "/opt/zapret/ipset/zapret-ip-user-ipban.txt"    ] && touch "/opt/zapret/ipset/zapret-ip-user-ipban.txt"
+
+# create or merge uci-config
+$ZAPRET_BASE/renew-cfg.sh
+	

zapret/zapret.config

@@ -1,29 +0,0 @@
-config main 'config'
-	option autostart '0'
-	option FWTYPE 'nftables'
-	option MODE 'nfqws'
-	option FLOWOFFLOAD 'none'
-	option INIT_APPLY_FW '1'
-	option DISABLE_IPV4 '0'
-	option DISABLE_IPV6 '1'
-	option MODE_FILTER 'hostlist'
-	option DESYNC_MARK '0x40000000'
-	option DESYNC_MARK_POSTNAT '0x20000000'
-	option NFQWS_OPT_DESYNC '--dpi-desync=fake,split2 --dpi-desync-ttl=7 --dpi-desync-ttl6=0 --dpi-desync-repeats=20 --dpi-desync-fooling=md5sig,badseq --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin'
-	option NFQWS_OPT_DESYNC_SUFFIX ''
-	option MODE_HTTP '1'
-	option MODE_HTTP_KEEPALIVE '0'
-	option NFQWS_OPT_DESYNC_HTTP ''
-	option NFQWS_OPT_DESYNC_HTTP_SUFFIX ''
-	option NFQWS_OPT_DESYNC_HTTP6 ''
-	option NFQWS_OPT_DESYNC_HTTP6_SUFFIX ''
-	option MODE_HTTPS '1'
-	option NFQWS_OPT_DESYNC_HTTPS ''
-	option NFQWS_OPT_DESYNC_HTTPS_SUFFIX ''
-	option NFQWS_OPT_DESYNC_HTTPS6 ''
-	option NFQWS_OPT_DESYNC_HTTPS6_SUFFIX ''
-	option MODE_QUIC '1'
-	option NFQWS_OPT_DESYNC_QUIC '--dpi-desync=fake,split2 --dpi-desync-repeats=15 --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin --new --dpi-desync=fake --dpi-desync-repeats=15'
-	option NFQWS_OPT_DESYNC_QUIC_SUFFIX ''
-	option NFQWS_OPT_DESYNC_QUIC6 ''
-	option NFQWS_OPT_DESYNC_QUIC6_SUFFIX ''