Bump version to v72.20251122

Source: dc1dc5c876

.github/workflows/build.yml

@@ -110,10 +110,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [ openwrt-23.05, SNAPSHOT ]
+        branch: [ openwrt-24.10, SNAPSHOT ]
         arch:
           - aarch64_cortex-a53
           - aarch64_cortex-a72
+          - aarch64_cortex-a76
           - aarch64_generic
           - arm_arm1176jzf-s_vfp
           - arm_arm926ej-s
@@ -127,7 +128,6 @@ jobs:
           - arm_cortex-a9_neon
           - arm_cortex-a9_vfpv3-d16
           - arm_fa526
-          - arm_mpcore
           - arm_xscale
           - mips64_octeonplus
           - mips_24kc
@@ -141,20 +141,18 @@ jobs:
         isTestOrFake:
           - ${{ needs.check.outputs.test_build == 'true' || needs.check.outputs.fake_build == 'true' }}
         exclude:
-          - branch: SNAPSHOT
-            arch: arm_mpcore
           - branch: SNAPSHOT
             arch: arm_cortex-a9_vfpv3-d16
+          - branch: SNAPSHOT
+            arch: arm_cortex-a7_neon-vfpv4
           - { isTestOrFake: true }
         include:
-          - branch: openwrt-23.05
+          - branch: openwrt-24.10
             arch: x86_64
-          - branch: openwrt-23.05
+          - branch: openwrt-24.10
             arch: aarch64_cortex-a53
           - branch: SNAPSHOT
             arch: aarch64_cortex-a53
-          - branch: SNAPSHOT
-            arch: aarch64_cortex-a76
     container:
       image: openwrt/sdk:${{ matrix.arch }}-${{ matrix.branch }}
       options: --user root
@@ -181,7 +179,7 @@ jobs:
           sed -r -i 's/^rm.+//' setup.sh
           ./setup.sh
           ls -lh
-          if [ "$BRANCH" = "openwrt-23.05" ]; then
+          if [ "$BRANCH" = "openwrt-24.10" ]; then
               echo "PKGTYPE=ipk" >> $GITHUB_ENV
           else
               echo "PKGTYPE=apk" >> $GITHUB_ENV

README.md

@@ -1,4 +1,4 @@
-[![build](https://github.com/remittor/zapret-openwrt/actions/workflows/build.yml/badge.svg)](https://github.com/remittor/zapret-openwrt/releases)
+[![GitHub Release](https://img.shields.io/github/release/remittor/zapret-openwrt)](https://github.com/remittor/zapret-openwrt/releases)
 [![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)

luci-app-zapret/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-zapret
-PKG_VERSION:=70.20250210
+PKG_VERSION:=72.20251122
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=remittor <https://github.com/remittor>
 

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

@@ -12,6 +12,7 @@ return view.extend({
         return Promise.all([
             L.resolveDefault(fs.stat('/bin/cat'), null),
             fs.exec('/usr/bin/find', [ '/tmp', '-maxdepth', '1', '-type', 'f', '-name', 'zapret+*.log' ]),
+            uci.load(tools.appName),
         ]).then(function(status_array) {
             var filereader = status_array[0] ? status_array[0].path : null;
             var log_data   = status_array[1];   // stdout: multiline text
@@ -19,14 +20,20 @@ return view.extend({
                 ui.addNotification(null, E('p', _('Unable to get log files') + '(code = ' + log_data.code + ') : retrieveLog()'));
                 return null;
             }
+            var reason = '';
+            var uci_cfg = uci.get(tools.appName, 'config');
+            if (uci_cfg !== null && typeof(uci_cfg) === 'object') {
+                let flag = uci_cfg.DAEMON_LOG_ENABLE;
+                if (flag != '1') {
+                    reason = ' (Reason: option DAEMON_LOG_ENABLE = ' + flag + ')';
+                }
+            }
             if (typeof(log_data.stdout) !== 'string') {
-                ui.addNotification(null, E('p', _('Unable to get log files') + '(undefined stdout) : retrieveLog()'));
-                return null;
+                return 'Log files not found.' + reason;
             }
             var log_list = log_data.stdout.trim().split('\n');
             if (log_list.length <= 0) {
-                ui.addNotification(null, E('p', _('Unable to get log files') + '(not found) : retrieveLog()'));
-                return null;
+                return 'Log files not found!' + reason;
             }
             for (let i = 0; i < log_list.length; i++) {
                 let logfn = log_list[i].trim();
@@ -56,15 +63,16 @@ return view.extend({
                 return logdata;
             }).catch(function(e) {
                 ui.addNotification(null, E('p', _('Unable to execute or read contents')
-                    + ': %s [ %s | %s | %s | %s ]'.format(
-                        e.message, tools.execPath, 'retrieveLogData', 'uci.zapret'
+                    + ': %s [ %s | %s | %s ]'.format(
+                        e.message, 'retrieveLogData', 'uci.zapret'
                 )));
                 return null;
             });
         }).catch(function(e) {
+            const [, lineno, colno] = e.stack.match(/(\d+):(\d+)/);
             ui.addNotification(null, E('p', _('Unable to execute or read contents')
-                + ': %s [ %s | %s | %s | %s ]'.format(
-                    e.message, tools.execPath, 'retrieveLog', 'uci.zapret'
+                + ': %s [ lineno: %s | %s | %s | %s ]'.format(
+                    e.message, lineno, 'retrieveLog', 'uci.zapret'
             )));
             return null;
         });
@@ -79,7 +87,7 @@ return view.extend({
                 break;
             if (logdate_len == -2) {
                 logdata = await this.retrieveLog();
-                logdate_len = (logdata) ? logdata.length : -1;
+                logdate_len = (Array.isArray(logdata)) ? logdata.length : -1;
             }
             let elem_name = elem.getAttribute("name");
             let founded = false;
@@ -112,6 +120,15 @@ return view.extend({
         if (!logdata) {
             return;
         }
+        if (typeof(logdata) === 'string') {
+            return E('div', {}, [
+                E('p', {'class': 'cbi-title-field'}, [ logdata ]),
+            ]);
+        }
+        if (!Array.isArray(logdata)) {
+            ui.addNotification(null, E('p', _('Unable to get log files') + ' : render()'));
+            return;
+        }
         var h2 = E('div', {'class' : 'cbi-title-section'}, [
             E('h2', {'class': 'cbi-title-field'}, [ _('Zapret') + ' - ' + _('Log Viewer') ]),
         ]);

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

@@ -45,7 +45,7 @@ return view.extend({
         return Promise.all([
             tools.getInitState(tools.appName),      // svc_boot
             fs.exec(tools.execPath, [ 'enabled' ]), // svc_en
-            fs.exec(tools.execPath, [ 'info' ]),    // svc_info
+            tools.getSvcInfo(),                     // svc_info
             fs.exec('/bin/busybox', [ 'ps' ]),      // process list
             fs.exec(tools.packager.path, tools.packager.args),  // installed packages
             uci.load(tools.appName),              // config
@@ -75,7 +75,7 @@ return view.extend({
         //console.log('svc_en: ' + svc_en.code);
         svc_en = (svc_en.code == 0) ? true : false;
         
-        if (svc_info.code != 0) {
+        if (typeof(svc_info) !== 'object') {
             ui.addNotification(null, E('p', _('Unable to read the service info') + ': setAppStatus()'));
             this.disableButtons(true, -1, elems);
             return;
@@ -254,7 +254,12 @@ return view.extend({
     },
 
     load: function() {
-        return this.getAppStatus();
+        var _this = this;
+        return Promise.all([
+            L.resolveDefault(fs.stat('/bin/cat'), null),
+        ]).then(function(data) {
+            return _this.getAppStatus();
+        });
     },
 
     render: function(status_array) {
@@ -326,7 +331,7 @@ return view.extend({
 
         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 HostLists'), null, [ btn_update ] );
         
         let btn_reset       = create_btn('btn_reset', btn_style_action, _('Reset settings'));
         btn_reset.onclick   = L.bind(this.dialogResetCfg, this);

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

@@ -86,6 +86,10 @@ return view.extend({
         o.rmempty = false;
         o.default = 0;
 
+        o = s.taboption(tabname, form.Flag, 'FILTER_TTL_EXPIRED_ICMP', 'FILTER_TTL_EXPIRED_ICMP');
+        o.rmempty = false;
+        o.default = 1;
+
         o = s.taboption(tabname, form.ListValue, 'MODE_FILTER', _('MODE_FILTER'));
         //o.value('none',         'none');
         //o.value('ipset',        'ipset');
@@ -105,10 +109,13 @@ return view.extend({
         tabname = 'nfqws_params';
         s.tab(tabname, _('NFQWS options'));
 
-        let add_delim = function(sec) {
+        let add_delim = function(sec, url = null) {
             let o = sec.taboption(tabname, form.DummyValue, '_hr');
             o.rawhtml = true;
             o.default = '<hr style="width: 620px; height: 1px; margin: 1px 0 1px; border-top: 1px solid;">';
+            if (url) {
+                o.default += '<br/>' + _('Help') + ': <a target=_blank href=%s>%s</a>'.format(url);
+            }
         };
 
         let add_param = function(sec, param, locname = null, rows = 10, multiline = false) {
@@ -140,7 +147,11 @@ return view.extend({
             val.validate = function(section_id, value) {
                 return (value) ? value.trim() : "";
             };
-            btn.onclick = () => new tools.longstrEditDialog('config', param, param, locname, rows, multiline).show();
+            let desc = locname;
+            if (multiline == 2) {
+                desc += '<br/>' + _('Example') + ': <a target=_blank href=%s>%s</a>'.format(tools.nfqws_opt_url);
+            }
+            btn.onclick = () => new tools.longstrEditDialog('config', param, param, desc, rows, multiline).show();
         };
 
         o = s.taboption(tabname, form.Flag, 'NFQWS_ENABLE', _('NFQWS_ENABLE'));
@@ -156,6 +167,11 @@ return view.extend({
         //o.description = _("nfqws option for DPI desync attack");
         o.rmempty     = false;
         o.datatype    = 'string';
+
+        o = s.taboption(tabname, form.Value, 'FILTER_MARK', _('FILTER_MARK'));
+        o.rmempty     = false;
+        o.validate = function(section_id, value) { return true; };
+        o.write = function(section_id, value) { return form.Value.prototype.write.call(this, section_id, (value == null || value.trim() == '') ? "\t" : value.trim()); };
         
         o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_TCP', _('NFQWS_PORTS_TCP'));
         o.rmempty     = false;
@@ -189,8 +205,8 @@ return view.extend({
         o.rmempty     = false;
         o.datatype    = 'uinteger';
 
-        add_delim(s);
-        add_param(s, 'NFQWS_OPT', null, 18, 2);
+        add_delim(s, tools.nfqws_opt_url);
+        add_param(s, 'NFQWS_OPT', null, 21, 2);
 
         /* AutoHostList settings */
 
@@ -237,10 +253,10 @@ return view.extend({
             15
         ).show();
         
-        /* Blacklist settings */
+        /* HostList settings */
 
-        tabname = 'blacklist_tab'; 
-        s.tab(tabname, _('Blacklist settings'));
+        tabname = 'hostlist_tab'; 
+        s.tab(tabname, _('Host lists'));
 
         o = s.taboption(tabname, form.Button, '_google_entries_btn', _('Google hostname entries'));
         o.inputtitle = _('Edit');
@@ -254,7 +270,7 @@ return view.extend({
             15
         ).show();
 
-        o = s.taboption(tabname, form.Button, '_user_entries_btn', _('User hostname entries'));
+        o = s.taboption(tabname, form.Button, '_user_entries_btn', _('User hostname entries <HOSTLIST>'));
         o.inputtitle = _('Edit');
         o.inputstyle = 'edit btn';
         o.description = tools.hostsUserFN;
@@ -262,7 +278,7 @@ return view.extend({
             tools.hostsUserFN,
             _('User entries'),
             _('One hostname per line.<br />Examples:'),
-            '<code>domain.net<br />sub.domain.com<br />googlevideo.com</code>',
+            '<code>domain.net<br />sub.domain.com<br />facebook.com</code>',
             15
         ).show();
 
@@ -274,7 +290,7 @@ return view.extend({
             tools.hostsUserExcludeFN,
             _('User excluded entries'),
             _('One hostname per line.<br />Examples:'),
-            '<code>domain.net<br />sub.domain.com<br />googlevideo.com</code>',
+            '<code>domain.net<br />sub.domain.com<br />gosuslugi.ru</code>',
             15
         ).show();
         
@@ -347,7 +363,16 @@ return view.extend({
             o.inputtitle = _('Edit');
             o.inputstyle = 'edit btn';
             o.description = fn;
-            let desc = (num == tools.discord_num) ? _('Example') + ': <a href=%s>%s</a>'.format(tools.discord_url) : '';
+            let desc = '';
+            if (num == tools.discord_num) {
+                desc = _('Example') + ': ';
+                for (let k = 0; k < tools.discord_url.length; k++) {
+                    let url = tools.discord_url[k];
+                    if (k > 0) desc += ' <br> ';
+                    const filename = url.substring(url.lastIndexOf("/") + 1).split("?")[0];
+                    desc += '<a target=_blank href=' + url + '>' + filename + '</a>';
+                }
+            }
             o.onclick = () => new tools.fileEditDialog(fn, name, desc, '', 15).show();
         }
 

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

@@ -52,7 +52,12 @@ return baseclass.extend({
     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/master/init.d/custom.d.examples.linux/50-discord',
+    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',
@@ -73,6 +78,13 @@ return baseclass.extend({
         running  : { code: 4, name: _('Running')  , label: this.infoLabelRunning  },
     },
 
+    callServiceList: rpc.declare({
+        object: 'service',
+        method: 'list',
+        params: [ 'name', 'verbose' ],
+        expect: { '': {} }
+    }),
+
     callInitState: rpc.declare({
         object: 'luci',
         method: 'getInitList',
@@ -103,6 +115,17 @@ return baseclass.extend({
         }
     },
 
+    getSvcInfo: function(svc_name = null) {
+        this.init_consts();
+        let name = (svc_name) ? svc_name : this.appName;
+        let verbose = 1;
+        return this.callServiceList(name, verbose).then(res => {
+            return res;
+        }).catch(e => {
+            ui.addNotification(null, E('p', _('Failed to get %s service info: %s').format(name, e)));
+        });
+    },
+
     getInitState: function(name) {
         this.init_consts();
         return this.callInitState(name).then(res => {
@@ -161,6 +184,11 @@ return baseclass.extend({
                 if (spos > 0) {
                     ver = ver.substring(0, spos);
                 }
+                let mpos = ver.lastIndexOf("-");
+                if (mpos > 0 && ver.substring(mpos+1, mpos+2) == 'r') {
+                    // release number
+                    ver = ver.substring(0, mpos);
+                }
             }
             pkg_dict[name] = ver;
         }
@@ -195,9 +223,6 @@ return baseclass.extend({
             },
             "status": this.statusDict.error,
         };
-        if (svc_info.code != 0) {
-            return -1;
-        }
         if (proc_list.code != 0) {
             return -2;
         }        
@@ -206,22 +231,10 @@ return baseclass.extend({
         if (plist.length < 4) {
             return -3;
         }
-        if (typeof(svc_info.stdout) !== 'string') {
+        if (typeof(svc_info) !== 'object') {
             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;
-        }
+        let jdata = svc_info;
         if (typeof(jdata.zapret) == 'object') {
             result.dmn.inited = true;
             let dmn_list = jdata.zapret.instances;
@@ -293,7 +306,7 @@ return baseclass.extend({
                     </tr>
                     <tr class="tr">
                         <td class="td left" ${td_name_style}>
-                            ${_('Blacklist update mode')}:
+                            ${_('HostLists update mode')}:
                         </td>
                         <td class="td left">
                             ${update_mode}
@@ -435,6 +448,9 @@ return baseclass.extend({
             if (typeof(value) === 'string') {
                 value = value.trim();
                 if (this.multiline == 2) {
+                    value = value.replace(/\n\t\t\t--/g, "\n--");
+                    value = value.replace(/\n\t\t--/g, "\n--");
+                    value = value.replace(/\n\t--/g, "\n--");
                     value = value.replace(/\n  --/g, "\n--");
                     value = value.replace(/\n --/g, "\n--");
                     value = value.replace(/ --/g, "\n--");

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

@@ -6,6 +6,7 @@
 			"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" ],
@@ -20,7 +21,8 @@
 			},
 			"uci": [ "zapret", "network" ],
 			"ubus": {
-				"luci": [ "getInitList", "setInitAction" ]
+				"luci": [ "getInitList", "setInitAction" ],
+				"service": [ "list" ]
 			}
 		},
 		"write": {

zapret-ip2net/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-ip2net
-PKG_VERSION:=70.20250210
+PKG_VERSION:=72.20251122
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -9,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:=f62b289cb5e0566633aa51f163651c656f9e1cc1
-PKG_SOURCE_DATE:=2025-02-10
+PKG_SOURCE_VERSION:=97cefbace9eee57c5f3799743df9d755690dac4c
+PKG_SOURCE_DATE:=2025-11-22
 
 #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,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-mdig
-PKG_VERSION:=70.20250210
+PKG_VERSION:=72.20251122
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -9,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:=f62b289cb5e0566633aa51f163651c656f9e1cc1
-PKG_SOURCE_DATE:=2025-02-10
+PKG_SOURCE_VERSION:=97cefbace9eee57c5f3799743df9d755690dac4c
+PKG_SOURCE_DATE:=2025-11-22
 
 #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,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret-tpws
-PKG_VERSION:=70.20250210
+PKG_VERSION:=72.20251122
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -9,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:=f62b289cb5e0566633aa51f163651c656f9e1cc1
-PKG_SOURCE_DATE:=2025-02-10
+PKG_SOURCE_VERSION:=97cefbace9eee57c5f3799743df9d755690dac4c
+PKG_SOURCE_DATE:=2025-11-22
 
 #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,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret
-PKG_VERSION:=70.20250210
+PKG_VERSION:=72.20251122
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -13,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:=f62b289cb5e0566633aa51f163651c656f9e1cc1
-PKG_SOURCE_DATE:=2025-02-10
+PKG_SOURCE_VERSION:=97cefbace9eee57c5f3799743df9d755690dac4c
+PKG_SOURCE_DATE:=2025-11-22
 
 #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?
@@ -108,7 +108,9 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	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
+		if [ -x "/etc/init.d/zapret" ]; then
+			/etc/init.d/zapret running && /etc/init.d/zapret stop >/dev/null 2>&1
+		fi
 	fi
 	if [ ! -f "/opt/zapret/ipset/zapret-hosts-google.txt" ]; then
 		if [ -f "/opt/zapret/ipset/zapret-hosts-user.txt" ]; then
@@ -186,8 +188,8 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
 	. "$${ZAPRET_BASE}/common/fwtype.sh"
 	. "$${ZAPRET_BASE}/common/nft.sh"
 	. "$${ZAPRET_BASE}/common/installer.sh"
+	/etc/init.d/zapret running && /etc/init.d/zapret stop
 	/etc/init.d/zapret disable
-	/etc/init.d/zapret stop
 	ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
 	remove_openwrt_firewall
 	nft_del_table

zapret/comfunc.sh

@@ -17,10 +17,11 @@ ZAPRET_CFG_SEC_NAME="$( uci -q get $ZAPRET_CFG_NAME.config )"
 
 . $ZAPRET_BASE/def-cfg.sh
 
+CRONTAB_FILE="/etc/crontabs/root"
+
 function adapt_for_sed
 {
-	local str=$( ( echo $1|sed -r 's/([\$\.\*\/\[\\^])/\\\1/g'|sed 's/[]]/\\]/g' )>&1 )
-	echo "$str"
+	echo -n "$1" | tr '\r' ' ' | tr '\n' ' ' | tr '\t' ' ' | sed -r 's/([\$\.\*\/\[\\^])/\\\1/g' | sed 's/[]]/\\]/g'
 }
 
 function is_valid_config
@@ -122,3 +123,69 @@ function merge_cfg_with_def_values
 	return 0
 }
 
+function remove_cron_task_logs
+{
+	if [ -f "$CRONTAB_FILE" ]; then
+		sed -i "/-name 'zapret\*.log' -size +/d" "$CRONTAB_FILE"
+	fi
+}
+
+function insert_cron_task_logs
+{
+	[ ! -f "$CRONTAB_FILE" ] && touch "$CRONTAB_FILE"
+	[ ! -f "$CRONTAB_FILE" ] && return 1
+	if ! grep -q -e "-name 'zapret\*\.log' -size \+" "$CRONTAB_FILE"; then
+		echo "*/2 * * * * /usr/bin/find /tmp -maxdepth 1 -type f -name 'zapret*.log' -size +2600k -exec rm -f {} \;" >> "$CRONTAB_FILE"
+		/etc/init.d/cron restart 2> /dev/null
+	fi
+	return 0
+}
+
+function init_before_start
+{
+	local DAEMON_LOG_ENABLE=$1
+	local HOSTLIST_FN="$ZAPRET_BASE/ipset/zapret-hosts-user.txt"
+	[ ! -f "$HOSTLIST_FN" ] && touch "$HOSTLIST_FN"
+	chmod 644 $ZAPRET_BASE/ipset/*.txt
+	chmod 666 $ZAPRET_BASE/ipset/*.log
+	rm -f /tmp/zapret*.log
+	#*/
+	if [ "$DAEMON_LOG_ENABLE" = "1" ]; then
+		insert_cron_task_logs
+	else
+		remove_cron_task_logs
+	fi
+	return 0
+}
+
+function patch_luci_header_ut
+{
+	# INFO: https://github.com/openwrt/luci/pull/7725
+	local header_ut=/usr/share/ucode/luci/template/header.ut
+	local runtime_uc=/usr/share/ucode/luci/runtime.uc
+	local newenv
+	[ ! -f $header_ut ] && return 0
+	[ ! -f $runtime_uc ] && return 0
+	if grep -q "pkgs_update_time" $runtime_uc; then
+		return 0
+	fi
+	if grep -q "pkgs_update_time" $header_ut; then
+		return 0
+	fi
+	sed -i "/^import { access/i import { stat } from 'fs';" $runtime_uc
+	if ! grep -q "{ stat }" $runtime_uc; then
+		return 1
+	fi
+	newenv="self.env.pkgs_update_time = stat('/lib/apk/db/installed')?.mtime ?? stat('/usr/lib/opkg/status')?.mtime ?? 0;"
+	newenv=`adapt_for_sed "$newenv"`
+	sed -i "/self.env.include =/i $newenv" $runtime_uc
+	if ! grep -q "pkgs_update_time" $runtime_uc; then
+		return 1
+	fi
+	sed -i 's/luci.js?v=\(.*\)"><\/script>/luci.js?v=\1-{{ pkgs_update_time }}"><\/script>/g' $header_ut
+	if ! grep -q "pkgs_update_time" $header_ut; then
+		return 1
+	fi
+	logger -p notice -t ZAPRET "patch_luci_header_ut: OK"
+	return 0
+}

zapret/config.default

@@ -56,6 +56,13 @@ DESYNC_MARK=0x40000000
 DESYNC_MARK_POSTNAT=0x20000000
 
 
+# do not pass outgoing traffic to tpws/nfqws not marked with this bit
+# this setting allows to write your own rules to limit traffic that should be fooled
+# for example based on source IP or incoming interface name
+# no filter if not defined
+FILTER_MARK=""
+
+
 TPWS_SOCKS_ENABLE=0
 # tpws socks listens on this port on localhost and LAN interfaces
 TPPORT_SOCKS=987
@@ -90,13 +97,13 @@ NFQWS_UDP_PKT_IN="0"
 # 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
+NFQWS_PORTS_TCP_KEEPALIVE=""
+NFQWS_PORTS_UDP_KEEPALIVE=""
 
 # use <HOSTLIST> and <HOSTLIST_NOAUTO> placeholders to engage standard hostlists and autohostlist in ipset dir
 # hostlist markers are replaced to empty string if MODE_FILTER does not satisfy
 # <HOSTLIST_NOAUTO> appends ipset/zapret-hosts-auto.txt as normal list
-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"
+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=0
@@ -136,6 +143,11 @@ DISABLE_IPV4=0
 # do not work with ipv6
 DISABLE_IPV6=1
 
+# drop icmp time exceeded messages for nfqws tampered connections
+# in POSTNAT mode this can interfere with default mtr/traceroute in tcp or udp mode. use source port not redirected to nfqws
+# set to 0 if you are not expecting connection breakage due to icmp in response to TCP SYN or UDP
+FILTER_TTL_EXPIRED_ICMP=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

zapret/def-cfg.sh

@@ -14,6 +14,7 @@ function set_cfg_default_values
 		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='0'
 		set $cfgname.config.WS_USER='daemon'
@@ -28,6 +29,7 @@ function set_cfg_default_values
 		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'
@@ -37,32 +39,27 @@ function set_cfg_default_values
 		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
+			--filter-tcp=443
+			--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+			--hostlist=/opt/zapret/ipset/zapret-hosts-user.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
+			--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
+			--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
 		"
 		# save changes
 		commit $cfgname

zapret/init.d.sh

@@ -25,6 +25,7 @@ is_run_on_boot && IS_RUN_ON_BOOT=1 || IS_RUN_ON_BOOT=0
 function enable
 {
 	local run_on_boot=""
+	patch_luci_header_ut
 	if [ "$IS_RUN_ON_BOOT" = "1" ]; then
 		if [ -n "$ZAPRET_CFG_SEC_NAME" ]; then
 			run_on_boot=$( get_run_on_boot_option )
@@ -59,6 +60,7 @@ function enabled
 function boot
 {
 	local run_on_boot=""
+	patch_luci_header_ut
 	if [ "$IS_RUN_ON_BOOT" = "1" ]; then
 		if [ -n "$ZAPRET_CFG_SEC_NAME" ]; then
 			run_on_boot=$( get_run_on_boot_option )
@@ -68,11 +70,18 @@ function boot
 			fi
 		fi
 	fi
+	init_before_start "$DAEMON_LOG_ENABLE"
+	/bin/sh /etc/rc.common $ZAPRET_ORIG_INITD start "$@"
+}
+
+function start
+{
+	init_before_start "$DAEMON_LOG_ENABLE"
 	/bin/sh /etc/rc.common $ZAPRET_ORIG_INITD start "$@"
 }
 
 function restart
 {
-	rm -f /tmp/zapret*.log
+	init_before_start "$DAEMON_LOG_ENABLE"
 	/bin/sh /etc/rc.common $ZAPRET_ORIG_INITD restart "$@"
 }

zapret/ipset/zapret-hosts-google.txt

@@ -1,13 +1,198 @@
+cdn.youtube.com
+fonts.googleapis.com
+fonts.gstatic.com
+ggpht.com
+googleapis.com
+googleusercontent.com
 googlevideo.com
-youtubei.googleapis.com
-ytimg.com
-yt3.ggpht.com
-yt4.ggpht.com
-youtube.com
-youtubeembeddedplayer.googleapis.com
-ytimg.l.google.com
+i.ytimg.com
+i9.ytimg.com
 jnn-pa.googleapis.com
+kids.youtube.com
+m.youtube.com
+manifest.googlevideo.com
+music.youtube.com
+nhacmp3youtube.com
+returnyoutubedislikeapi.com
+s.ytimg.com
+signaler-pa.youtube.com
+studio.youtube.com
+tv.youtube.com
+wide-youtube.l.google.com
+withyoutube.com
+youtu.be
+youtube.com
+youtube.googleapis.com
+youtubeeducation.com
+youtubeembeddedplayer.googleapis.com
+youtubefanfest.com
+youtubegaming.com
+youtubei.googleapis.com
+youtubekids.com
+youtubemobilesupport.com
 youtube-nocookie.com
 youtube-ui.l.google.com
+yt.be
+yt3.ggpht.com
+yt3.googleusercontent.com
+yt4.ggpht.com
+ytimg.com
+ytimg.l.google.com
+yting.com
 yt-video-upload.l.google.com
-wide-youtube.l.google.com
+youtube.ae
+youtube.al
+youtube.am
+youtube.at
+youtube.az
+youtube.ba
+youtube.be
+youtube.bg
+youtube.bh
+youtube.bo
+youtube.by
+youtube.ca
+youtube.cat
+youtube.ch
+youtube.cl
+youtube.co
+youtube.co.ae
+youtube.co.at
+youtube.co.cr
+youtube.co.hu
+youtube.co.id
+youtube.co.il
+youtube.co.in
+youtube.co.jp
+youtube.co.ke
+youtube.co.kr
+youtube.co.ma
+youtube.co.nz
+youtube.co.th
+youtube.co.tz
+youtube.co.ug
+youtube.co.uk
+youtube.co.ve
+youtube.co.za
+youtube.co.zw
+youtube.com.ar
+youtube.com.au
+youtube.com.az
+youtube.com.bd
+youtube.com.bh
+youtube.com.bo
+youtube.com.br
+youtube.com.by
+youtube.com.co
+youtube.com.do
+youtube.com.ec
+youtube.com.ee
+youtube.com.eg
+youtube.com.es
+youtube.com.gh
+youtube.com.gr
+youtube.com.gt
+youtube.com.hk
+youtube.com.hn
+youtube.com.hr
+youtube.com.jm
+youtube.com.jo
+youtube.com.kw
+youtube.com.lb
+youtube.com.lv
+youtube.com.ly
+youtube.com.mk
+youtube.com.mt
+youtube.com.mx
+youtube.com.my
+youtube.com.ng
+youtube.com.ni
+youtube.com.om
+youtube.com.pa
+youtube.com.pe
+youtube.com.ph
+youtube.com.pk
+youtube.com.pt
+youtube.com.py
+youtube.com.qa
+youtube.com.ro
+youtube.com.sa
+youtube.com.sg
+youtube.com.sv
+youtube.com.tn
+youtube.com.tr
+youtube.com.tw
+youtube.com.ua
+youtube.com.uy
+youtube.com.ve
+youtube.cr
+youtube.cz
+youtube.de
+youtube.dk
+youtube.ee
+youtube.es
+youtube.fi
+youtube.fr
+youtube.ge
+youtube.gr
+youtube.gt
+youtube.hk
+youtube.hr
+youtube.hu
+youtube.ie
+youtube.in
+youtube.iq
+youtube.is
+youtube.it
+youtube.jo
+youtube.jp
+youtube.kr
+youtube.kz
+youtube.la
+youtube.lk
+youtube.lt
+youtube.lu
+youtube.lv
+youtube.ly
+youtube.ma
+youtube.md
+youtube.me
+youtube.mk
+youtube.mn
+youtube.mx
+youtube.my
+youtube.ng
+youtube.ni
+youtube.nl
+youtube.no
+youtube.pa
+youtube.pe
+youtube.ph
+youtube.pk
+youtube.pl
+youtube.pr
+youtube.pt
+youtube.qa
+youtube.ro
+youtube.rs
+youtube.ru
+youtube.sa
+youtube.se
+youtube.sg
+youtube.si
+youtube.sk
+youtube.sn
+youtube.soy
+youtube.sv
+youtube.tn
+youtube.tv
+youtube.ua
+youtube.ug
+youtube.uy
+youtube.vn
+youtubego.co.id
+youtubego.co.in
+youtubego.com
+youtubego.com.br
+youtubego.id
+youtubego.in

zapret/ipset/zapret-hosts-user-exclude.txt

@@ -1,6 +1,180 @@
+127.0.0.0/8
 10.0.0.0/8
 172.16.0.0/12
 192.168.0.0/16
 169.254.0.0/16
+100.64.0.0/10
+::1
 fc00::/7
 fe80::/10
+####################################
+gosuslugi.ru
+#################################### Epicgames
+3lateral.com
+accountportal-website-prod07.ol.epicgames.com
+account-public-service-prod03.ol.epicgames.com
+accounts.epicgames.com
+api.epicgames.dev
+artstation.com
+battlebreakers.com
+capturingreality.com
+catalog-public-service-prod06.ol.epicgames.com
+cdn1.unrealengine.com
+cdn2.unrealengine.com
+cubicmotion.com
+datarouter.ol.epicgames.com
+datastorage-public-service-liveegs.live.use1a.on.epicgames.com
+download.epicgames.com
+download2.epicgames.com
+download3.epicgames.com
+download4.epicgames.com
+eac-cdn.com
+easy.ac
+easyanticheat.net
+entitlement-public-service-prod08.ol.epicgames.com
+epicgames.com
+epicgames.dev
+epicgamescdn.com
+epicgames-download1.akamaized.net
+et.epicgames.com
+fab.com
+fastly-download.epicgames.com
+fortnite.com
+friends-public-service-prod06.ol.epicgames.com
+hyprsense.com
+launcher-public-service-prod06.ol.epicgames.com
+launcherwaitingroom-public-service-prod06.ol.epicgames.com
+launcher-website-prod07.ol.epicgames.com
+library-service.live.use1a.on.epicgames.com
+lightswitch-public-service-prod06.ol.epicgames.com
+metrics.ol.epicgames.com
+ol.epicgames.com
+orderprocessor-public-service-ecomprod01.ol.epicgames.com
+paragon.com
+playparagon.com
+quixel.com
+quixel.se
+radgametools.com
+realityscan.com
+roborecall.com
+shadowcomplex.com
+sketchfab.com
+spyjinx.com
+static-assets-prod.epicgames.com
+store.epicgames.com
+store-content.ak.epicgames.com
+store-site-backend-static.ak.epicgames.com
+tracking.epicgames.com
+twinmotion.com
+unrealengine.com
+unrealtournament.com
+ut-public-service-prod10.ol.epicgames.com
+#################################### Steam
+api.steampowered.com
+avatars.fastly.steamstatic.com
+cdn.akamai.steamstatic.com
+cdn.cloudflare.steamstatic.com
+cdn.fastly.steamstatic.com
+cdn.steamcommunity.com
+cdn.steamstatic.com
+checkout.steampowered.com
+clan.fastly.steamstatic.com
+client-download.steampowered.com
+client-update.queniuqe.com
+community.cloudflare.steamstatic.com
+community.fastly.steamstatic.com
+community.steampowered.com
+community.steamstatic.com
+cs.steampowered.com
+dl.steam.clngaa.com
+edge.steam-dns.top.comcast.net
+gstore.val.manlaxy.com
+help.steampowered.com
+login.steampowered.com
+media.steampowered.com
+partner.steamgames.com
+partner.steampowered.com
+playartifact.com
+s.team
+scontent.steamusercontent.com
+shared.fastly.steamstatic.com
+shared.steamstatic.com
+steam.apac.qtlglb.com
+steam.cdn.on.net
+steam.cdn.orcon.net.nz
+steam.cdn.slingshot.co.nz
+steam.cdn.webra.ru
+steam.eca.qtlglb.com
+steam.naeu.qtlglb.com
+steam.ru.qtlglb.com
+steam.tv
+steam-api.com
+steambroadcast.akamaized.net
+steambroadcast.com
+steamcdn.com
+steamcdn.net
+steamcdn-a.akamaihd.net
+steamcdn-a.akamaihd.net.edgesuite.net
+steamcdn-a.akamaized.net
+steamchat.com
+steam-chat.com
+steamcloudsweden.blob.core.windows.net
+steamcommunity.akamaized.net
+steamcommunity.cloudflare.steamstatic.com
+steamcommunity.com
+steamcommunity-a.akamaihd.net
+steamcommunity-a.akamaihd.net.edgesuite.net
+steamcommunity-a.akamaized.net
+steamcontent.com
+steamcontent-a.akamaihd.net
+steamdeck.com
+steamdeckcdn.akamaized.net
+steamdeckusercontent.com
+steamgames.com
+steamgames.net
+steammobile.akamaized.net
+steampipe.akamaized.net
+steampipe-kr.akamaized.net
+steampipe-partner.akamaized.net
+steampowered.com
+steamserver.net
+steamstat.us
+steamstatic.akamaized.net
+steamstatic.com
+steamstore-a.akamaihd.net
+steamusercontent.com
+steamusercontent-a.akamaihd.net
+steamuserimages-a.akamaihd.net
+steamvideo-a.akamaihd.net
+store.akamai.steamstatic.com
+store.cloudflare.steamstatic.com
+store.fastly.steamstatic.com
+store.steampowered.com
+support.steampowered.com
+underlords.com
+valve.net
+valvecdn.com
+valvecontent.com
+valvesoftware.com
+valvesoftware.net
+workshop.steampowered.com
+#################################### OpenWRT
+archive.openwrt.org
+cdn.openwrt.org
+dev.openwrt.org
+downloads.openwrt.org
+forum.openwrt.org
+fwdownloads.openwrt.org
+gh.openwrt.org
+git.openwrt.org
+github.com
+lede-project.org
+lists.openwrt.org
+mirror-01.infra.openwrt.org
+mirror-02.infra.openwrt.org
+mirror-03.infra.openwrt.org
+mirror-04.infra.openwrt.org
+openwrt.gitlab.io
+openwrt.org
+wiki.openwrt.org
+####################################

zapret/ipset/zapret-hosts-user.txt

@@ -0,0 +1,23 @@
+dis.gd
+discord-attachments-uploads-prd.storage.googleapis.com
+discord.app
+discord.co
+discord.com
+discord.design
+discord.dev
+discord.gift
+discord.gifts
+discord.gg
+discord.media
+discord.new
+discord.store
+discord.status
+discord-activities.com
+discordactivities.com
+discordapp.com
+discordapp.net
+discordcdn.com
+discordmerch.com
+discordpartygames.com
+discordsays.com
+discordsez.com

zapret/sync_config.sh

@@ -48,6 +48,12 @@ function sync_param
 	if [ "$value" = "$TAB" ]; then
 		value=""
 	fi
+	if [ "$param" = "NFQWS_PORTS_TCP_KEEPALIVE" -o "$param" = "NFQWS_PORTS_UDP_KEEPALIVE" ]; then
+		[ "$value" = "0" ] && value=""
+	fi
+	if [ "$param" = "NFQWS_OPT" -a "$value" != "" ]; then
+		value=$( echo -n "$value" | sed '/^#/d' )
+	fi
 	if [ "$vtype" = "str" ]; then
 		set_param_value_str $param "$value"
 	else
@@ -74,6 +80,7 @@ sync_param FLOWOFFLOAD
 sync_param INIT_APPLY_FW
 sync_param DISABLE_IPV4
 sync_param DISABLE_IPV6
+sync_param FILTER_TTL_EXPIRED_ICMP
 sync_param MODE_FILTER
 sync_param DISABLE_CUSTOM
 sync_param WS_USER str
@@ -88,14 +95,15 @@ sync_param AUTOHOSTLIST_DEBUGLOG
 sync_param NFQWS_ENABLE
 sync_param DESYNC_MARK
 sync_param DESYNC_MARK_POSTNAT
+sync_param FILTER_MARK 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_PORTS_TCP_KEEPALIVE str
+sync_param NFQWS_PORTS_UDP_KEEPALIVE str
 sync_param NFQWS_OPT str
 
 ZAPRET_CONFIG="$ZAPRET_CONFIG__SAVED"