Bump version to v72.20260116

.github/workflows/build.yml

@@ -276,6 +276,8 @@ jobs:
         run: |
           make defconfig
           sed -i 's/CONFIG_LUCI_JSMIN=y/CONFIG_LUCI_JSMIN=n/g' .config
+          sed -i 's/CONFIG_LUCI_CSSMIN=y/CONFIG_LUCI_CSSMIN=n/g' .config
+          grep -q '^CONFIG_LUCI_CSSMIN=' .config || echo 'CONFIG_LUCI_CSSMIN=n' >> .config
           echo "status=success" >> $GITHUB_OUTPUT
 
       - name: Show config

luci-app-zapret/Makefile

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

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

@@ -30,6 +30,12 @@ return baseclass.extend({
         this.appendLog('Original sources: https://github.com/hyperion-cs/dpi-checkers');
         this.appendLog('WEB-version: https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/');
         let cmd = [ fn_dwc_sh ];
+        let resolve_dns = document.getElementById('cfg_resolve_dns');
+        let dns_ip = resolve_dns.options[resolve_dns.selectedIndex].text;
+        if (dns_ip && dns_ip != 'default') {
+            cmd.push(...[ '-d', dns_ip.trim() ]);
+        }
+        cmd.push('-R');  // show recommendations
         let log = '/tmp/'+tools.appName+'_dwc.log';
         let callback = this.execAndReadCallback;
         let wnd = this;
@@ -60,6 +66,32 @@ return baseclass.extend({
     {
         this.pkg_arch = pkg_arch;
 
+        let DNS_LIST = [
+            '8.8.8.8',          // Google
+            '8.8.4.4',          // Google
+            '1.1.1.1',          // Cloudflare
+            '1.0.0.1',          // Cloudflare
+            '9.9.9.9',          // Quad9
+            '149.112.112.112',  // Quad9
+            '208.67.222.222',   // OpenDNS
+            '208.67.220.220',   // OpenDNS
+            '8.26.56.26',       // Comodo
+            '8.20.247.20',      // Comodo
+            '64.6.64.6',        // Verisign
+            '64.6.65.6',        // Verisign
+        ];
+        let dns_list = [ ];
+        dns_list.push( E('option', { value: 'dns_default' }, [ 'default' ] ) );
+        for (let id = 0; id < DNS_LIST.length; id++) {
+            let dns_ipaddr = '' + DNS_LIST[id];
+            let val = 'dns_' + dns_ipaddr.replace(/\./g, "_");
+            dns_list.push( E('option', { value: val }, [ dns_ipaddr ] ));
+        } 
+        let resolve_dns = E('label', [
+            _('Resolve IP-Addr via') + ': ',
+            E('select', { id: 'cfg_resolve_dns' }, dns_list)
+        ]);
+ 
         this.logArea = E('textarea', {
             'id': 'widget.modal_content',
             'readonly': true,
@@ -84,6 +116,8 @@ return baseclass.extend({
         
         ui.showModal(_('Diagnostics'), [
             E('div', { 'class': 'cbi-section' }, [
+                resolve_dns,
+                E('br'), E('br'),
                 this.logArea,
             ]),
             E('div', { 'class': 'right' }, [

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

@@ -244,8 +244,18 @@ return view.extend({
             ' ', _('Set AutoHostList mode')
         ]);
 
+        let erase_autohostlist = E('label', [
+            E('input', { type: 'checkbox', id: 'cfg_erase_autohostlist' }),
+            ' ', _('Erase AutoHostList (ipset)')
+        ]);
+
+        let enable_custom_d = E('label', [
+            E('input', { type: 'checkbox', id: 'cfg_enable_custom_d' }),
+            ' ', _('Enable use  custom.d scripts')
+        ]);
+
         let strat_list = [ ];
-        strat_list.push( E('option', { value: 'strat__skip__' }, [ '-' ] ) );
+        strat_list.push( E('option', { value: 'strat__skip__' }, [ 'not change' ] ) );
         for (let id = 0; id < this.nfqws_strat_list.length; id++) {
             let strat = '' + this.nfqws_strat_list[id];
             strat_list.push( E('option', { value: 'strat_' + id }, [ strat ] ) );
@@ -276,10 +286,19 @@ return view.extend({
             if (document.getElementById('cfg_autohostlist').checked) {
                 opt_flags += '(set_mode_autohostlist)';
             };
+            if (document.getElementById('cfg_erase_autohostlist').checked) {
+                opt_flags += '(erase_autohostlist)';
+            };
+            if (document.getElementById('cfg_enable_custom_d').checked) {
+                opt_flags += '(enable_custom_d)';
+            };
             //console.log('RESET: opt_flags = ' + opt_flags);
             let sel_strat = document.getElementById('cfg_nfqws_strat');
             let opt_strat = sel_strat.options[sel_strat.selectedIndex].text;
             //console.log('RESET: strat = ' + opt_strat);
+            if (opt_strat == 'not change') {
+                opt_strat = '-';
+            }
             opt_flags += '(sync)';
             let args = [ opt_flags, opt_strat ];
             return this.serviceActionEx('reset', resetcfg_btn, args, true);
@@ -293,6 +312,10 @@ return view.extend({
                 E('br'), E('br'),
                 set_autohostlist,
                 E('br'), E('br'),
+                erase_autohostlist,
+                E('br'), E('br'),
+                enable_custom_d,
+                E('br'), E('br'),
                 nfqws_strat,
                 E('br'), E('br')
             ]),

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

@@ -370,11 +370,46 @@ return baseclass.extend({
             ]);
         },
 
-        handleSaveAdv: function(ev) {
+        writeAdv: async function(fileName, data, chunkSize = 8000)
-            let txt = document.getElementById('widget.modal_content');
+        {
-            let value = txt.value.trim().replace(/\r\n/g, '\n') + '\n';
+            let tmpFile = fileName + '.tmp';
+            try {
+                for (let wsize = 0; wsize <= data.length; wsize += chunkSize) {
+                    let chunk = data.slice(wsize, wsize + chunkSize);
+                    if (wsize > 0 && chunk.length == 0) {
+                        break;  // EOF
+                    }
+                    chunk = chunk.replace(/'/g, `'\"'\"'`);
+                    let teeArg = (wsize === 0) ? '' : '-a';
+                    let cmd = `printf %s '${chunk}' | tee ${teeArg} '${tmpFile}'`;
+                    let res = await fs.exec('/bin/busybox', [ 'sh', '-c', cmd ]);
+                    if (res.code !== 0) {
+                        throw new Error('tee failed, rc = ' + res.code);
+                    }
+                }
+                let res = await fs.exec('/bin/busybox', [ 'mv', '-f', tmpFile, fileName ]);
+                if (res.code != 0) {
+                    throw new Error('mv failed, rc = ' + res.code);
+                }
+            } catch(e) {
+                try {
+                    await fs.exec('/bin/busybox', [ 'rm', '-f', tmpFile ]);
+                } catch(e2) {
+                    // nothing
+                }
+                throw e;
+            }
+            return fs.stat(fileName);
+        },
 
-            return fs.write(this.file, value).then(async rc => {
+        handleSaveAdv: async function(ev)
+        {
+            let txt = document.getElementById('widget.modal_content');
+            let value = txt.value.trim().replace(/\r\n/g, '\n');
+            if (value.length > 0) {
+                value += '\n';
+            }
+            return this.writeAdv(this.file, value).then(async rc => {
                 txt.value = value;
                 ui.addNotification(null, E('p', _('Contents have been saved.')), 'info');
                 if (this.callback) {

zapret/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret
-PKG_VERSION:=72.20260114
+PKG_VERSION:=72.20260116
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=bol-van
@@ -14,8 +14,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=76764ad6b0ee7d3991c97e7b8c24d53189d25c28
+PKG_SOURCE_VERSION:=c849e55ef0f1c244206f5a05ff7b1ab41a3824ee
-PKG_SOURCE_DATE:=2026-01-14
+PKG_SOURCE_DATE:=2026-01-16
 
 #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?
@@ -56,87 +56,99 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/mdig $(TARGET_CONFIGURE_OPTS)
 endef
 
+ZAPRET_DIR := /opt/zapret
+
+define ZAPRET_CONFFILES_LIST
+$(ZAPRET_DIR)/config
+$(ZAPRET_DIR)/ipset/zapret-hosts-google.txt
+$(ZAPRET_DIR)/ipset/zapret-hosts-user.txt
+$(ZAPRET_DIR)/ipset/zapret-hosts-user-exclude.txt
+$(ZAPRET_DIR)/ipset/zapret-ip-exclude.txt
+$(ZAPRET_DIR)/ipset/zapret-hosts-auto.txt
+$(ZAPRET_DIR)/ipset/cust1.txt
+$(ZAPRET_DIR)/ipset/cust2.txt
+$(ZAPRET_DIR)/ipset/cust3.txt
+$(ZAPRET_DIR)/ipset/cust4.txt
+$(ZAPRET_DIR)/init.d/openwrt/custom.d/10-script.sh
+$(ZAPRET_DIR)/init.d/openwrt/custom.d/20-script.sh
+$(ZAPRET_DIR)/init.d/openwrt/custom.d/50-script.sh
+$(ZAPRET_DIR)/init.d/openwrt/custom.d/60-script.sh
+$(ZAPRET_DIR)/init.d/openwrt/custom.d/90-script.sh
+endef
+
+$(eval ZAPRET_CONFFILES := $(foreach file,$(ZAPRET_CONFFILES_LIST),$(strip $(file))))
+
 define Package/$(PKG_NAME)/conffiles
-/opt/zapret/config
+$(ZAPRET_CONFFILES_LIST)
-/opt/zapret/ipset/zapret-hosts-google.txt
-/opt/zapret/ipset/zapret-hosts-user.txt
-/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-/opt/zapret/ipset/zapret-ip-exclude.txt
-/opt/zapret/ipset/zapret-hosts-auto.txt
-/opt/zapret/init.d/openwrt/custom.d/10-script.sh
-/opt/zapret/init.d/openwrt/custom.d/20-script.sh
-/opt/zapret/init.d/openwrt/custom.d/50-script.sh
-/opt/zapret/init.d/openwrt/custom.d/60-script.sh
-/opt/zapret/init.d/openwrt/custom.d/90-script.sh
 endef
 
 define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/opt/zapret
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)
-	$(INSTALL_DIR) $(1)/opt/zapret/$(MAKE_PATH)
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/$(MAKE_PATH)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws $(1)/opt/zapret/$(MAKE_PATH)/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws $(1)$(ZAPRET_DIR)/$(MAKE_PATH)/
-	$(INSTALL_DIR) $(1)/opt/zapret/ip2net
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/ip2net
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip2net/ip2net $(1)/opt/zapret/ip2net/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip2net/ip2net $(1)$(ZAPRET_DIR)/ip2net/
-	$(INSTALL_DIR) $(1)/opt/zapret/mdig
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/mdig
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdig/mdig $(1)/opt/zapret/mdig/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdig/mdig $(1)$(ZAPRET_DIR)/mdig/
-	$(INSTALL_DIR) $(1)/opt/zapret/common
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/common
-	$(CP) $(PKG_BUILD_DIR)/common/* $(1)/opt/zapret/common/
+	$(CP) $(PKG_BUILD_DIR)/common/* $(1)$(ZAPRET_DIR)/common/
-	#$(INSTALL_DIR) $(1)/opt/zapret/docs
+	#$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/docs
-	#$(CP) $(PKG_BUILD_DIR)/docs/* $(1)/opt/zapret/docs/
+	#$(CP) $(PKG_BUILD_DIR)/docs/* $(1)$(ZAPRET_DIR)/docs/
-	$(INSTALL_DIR) $(1)/opt/zapret/files
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/files
-	$(CP) $(PKG_BUILD_DIR)/files/* $(1)/opt/zapret/files/
+	$(CP) $(PKG_BUILD_DIR)/files/* $(1)$(ZAPRET_DIR)/files/
-	$(CP)                ./files/* $(1)/opt/zapret/files/
+	$(CP)                ./files/* $(1)$(ZAPRET_DIR)/files/
-	$(INSTALL_DIR) $(1)/opt/zapret/ipset
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/ipset
-	$(CP) $(PKG_BUILD_DIR)/ipset/* $(1)/opt/zapret/ipset/
+	$(CP) $(PKG_BUILD_DIR)/ipset/* $(1)$(ZAPRET_DIR)/ipset/
-	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/blockcheck.sh  $(1)/opt/zapret/blockcheck.sh
+	$(INSTALL_BIN)  $(PKG_BUILD_DIR)/blockcheck.sh  $(1)$(ZAPRET_DIR)/blockcheck.sh
-	#$(INSTALL_DATA) $(PKG_BUILD_DIR)/config.default $(1)/opt/zapret/config.default
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/tmp
-	$(INSTALL_DIR) $(1)/opt/zapret/tmp
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d/openwrt
-	$(INSTALL_DIR) $(1)/opt/zapret/init.d/openwrt
+	$(CP) $(PKG_BUILD_DIR)/init.d/openwrt/* $(1)$(ZAPRET_DIR)/init.d/openwrt/
-	$(CP) $(PKG_BUILD_DIR)/init.d/openwrt/* $(1)/opt/zapret/init.d/openwrt/
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/openwrt/90-zapret $(1)/etc/hotplug.d/iface/90-zapret
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./init.d.sh $(1)/etc/init.d/zapret
-	$(INSTALL_DATA) ./config.default $(1)/opt/zapret/config.default
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d
-	$(INSTALL_DATA) ./config.default $(1)/opt/zapret/config
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d/openwrt
-	$(INSTALL_DATA) ./ipset/zapret-hosts-google.txt       $(1)/opt/zapret/ipset/zapret-hosts-google.txt
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/init.d/openwrt/custom.d
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user.txt         $(1)/opt/zapret/ipset/zapret-hosts-user.txt
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret/ipset/zapret-hosts-user-exclude.txt
-	$(INSTALL_DATA) ./ipset/zapret-ip-exclude.txt         $(1)/opt/zapret/ipset/zapret-ip-exclude.txt
-	$(INSTALL_DIR) $(1)/opt/zapret/ipset_def
-	$(INSTALL_DATA) ./ipset/zapret-hosts-google.txt       $(1)/opt/zapret/ipset_def/zapret-hosts-google.txt
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user.txt         $(1)/opt/zapret/ipset_def/zapret-hosts-user.txt
-	$(INSTALL_DATA) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret/ipset_def/zapret-hosts-user-exclude.txt
-	$(INSTALL_DATA) ./ipset/zapret-ip-exclude.txt         $(1)/opt/zapret/ipset_def/zapret-ip-exclude.txt
-	$(INSTALL_DIR) $(1)/opt/zapret/init.d
-	$(INSTALL_DIR) $(1)/opt/zapret/init.d/openwrt
-	$(INSTALL_DIR) $(1)/opt/zapret/init.d/openwrt/custom.d
-	$(CP) ./custom.d/* $(1)/opt/zapret/init.d/openwrt/custom.d/
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./uci-def-cfg.sh     $(1)/etc/uci-defaults/zapret-uci-def-cfg.sh
 	# install all sh-scripts
-	$(CP) ./*.sh $(1)/opt/zapret/
+	$(CP) ./*.sh $(1)$(ZAPRET_DIR)/
-	rm -f $(1)/opt/zapret/init.d.sh
+	rm -f $(1)$(ZAPRET_DIR)/init.d.sh
-	# Create empty conf files
+	# Install conf files
-	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/ipset/zapret-hosts-auto.txt
+	$(foreach cfg,$(ZAPRET_CONFFILES), \
-	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/ipset/cust1.txt
+		rel="$(cfg:$(ZAPRET_DIR)/%=%)"; \
-	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/ipset/cust2.txt
+		src="./$$$$rel"; \
-	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/ipset/cust3.txt
+		if echo "$$$$rel" | grep -q "/custom.d/"; then \
-	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/ipset/cust4.txt
+			src="./custom.d/$$$$(basename $$$$rel)"; \
-	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/init.d/openwrt/custom.d/10-script.sh
+		fi; \
-	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/init.d/openwrt/custom.d/20-script.sh
+		dst="$(1)$(cfg)"; \
-	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/init.d/openwrt/custom.d/60-script.sh
+		mkdir -p "$(1)$(dir $(cfg))"; \
-	$(INSTALL_DATA) /dev/null $(1)/opt/zapret/init.d/openwrt/custom.d/90-script.sh
+		rm -f "$$$${dst}"; \
+		if [ -f "$$$${src}" ]; then \
+			$(INSTALL_DATA) "$$$${src}" "$$$${dst}"; \
+		else \
+			$(INSTALL_DATA) /dev/null "$$$${dst}"; \
+		fi; \
+	)
+	# Fix main config file
+	rm -f $(1)$(ZAPRET_DIR)/config
+	$(INSTALL_DATA) ./config.default $(1)$(ZAPRET_DIR)/config
+	$(INSTALL_DATA) ./config.default $(1)$(ZAPRET_DIR)/config.default
+	# Install def conf files
+	$(INSTALL_DIR) $(1)$(ZAPRET_DIR)/ipset_def
+	$(CP) ./ipset/zapret*.txt  $(1)$(ZAPRET_DIR)/ipset_def/
 	# Fix permissions
-	chmod 644 $(1)/opt/zapret/ipset/*.txt
+	chmod 644 $(1)$(ZAPRET_DIR)/ipset/*.txt
-	chmod 644 $(1)/opt/zapret/ipset_def/*.txt
+	chmod 644 $(1)$(ZAPRET_DIR)/ipset_def/*.txt
-	chmod 644 $(1)/opt/zapret/init.d/openwrt/custom.d/*.sh
+	chmod 644 $(1)$(ZAPRET_DIR)/init.d/openwrt/custom.d/*.sh
-	chmod 644 $(1)/opt/zapret/config*
+	chmod 644 $(1)$(ZAPRET_DIR)/config*
-	chmod 755 $(1)/opt/zapret/*.sh
+	chmod 755 $(1)$(ZAPRET_DIR)/*.sh
-	chmod 755 $(1)/opt/zapret/$(MAKE_PATH)/*
+	chmod 755 $(1)$(ZAPRET_DIR)/$(MAKE_PATH)/*
-	chmod 755 $(1)/opt/zapret/ip2net/*
+	chmod 755 $(1)$(ZAPRET_DIR)/ip2net/*
-	chmod 755 $(1)/opt/zapret/mdig/*
+	chmod 755 $(1)$(ZAPRET_DIR)/mdig/*
 	# Disable TPWS in blockcheck
-	grep -q '^SKIP_TPWS=' $(1)/opt/zapret/blockcheck.sh || sed -i '/^NFT_TABLE=blockcheck$$$$/a SKIP_TPWS=$$$${SKIP_TPWS:-1}' $(1)/opt/zapret/blockcheck.sh
+	grep -q '^SKIP_TPWS=' $(1)$(ZAPRET_DIR)/blockcheck.sh || sed -i '/^NFT_TABLE=blockcheck$$$$/a SKIP_TPWS=$$$${SKIP_TPWS:-1}' $(1)$(ZAPRET_DIR)/blockcheck.sh
 endef
 
 define Package/$(PKG_NAME)/preinst

zapret/def-cfg.sh

@@ -292,6 +292,57 @@ function set_cfg_nfqws_strat
 			commit $cfgname
 		EOF
 	fi
+	if [ "$strat" = "v7_by_StressOzz" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS_PORTS_TCP='80,443,2053,2083,2087,2096,8443'
+			set $cfgname.config.NFQWS_PORTS_UDP='443,19294-19344,50000-50100'
+			set $cfgname.config.NFQWS_OPT="
+				# Strategy $strat
+				
+				--filter-tcp=443
+				--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+				--dpi-desync=fake,multisplit
+				--dpi-desync-split-pos=2,sld
+				--dpi-desync-fake-tls=0x0F0F0F0F
+				--dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				--dpi-desync-fake-tls-mod=rnd,dupsid,sni=ggpht.com
+				--dpi-desync-split-seqovl=620
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+				--dpi-desync-fooling=badsum,badseq
+
+				--new
+				--filter-tcp=443 <HOSTLIST>
+				--dpi-desync=fake,multisplit
+				--dpi-desync-split-seqovl=654
+				--dpi-desync-split-pos=1
+				--dpi-desync-fooling=ts
+				--dpi-desync-repeats=8
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/max.bin
+				--dpi-desync-fake-tls=/opt/zapret/files/fake/max.bin
+
+				--new
+				--filter-udp=443 <HOSTLIST_NOAUTO>
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+				--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
+
+				--new
+				--filter-udp=19294-19344,50000-50100
+				--filter-l7=discord,stun
+				--dpi-desync=fake
+				--dpi-desync-repeats=6
+
+				--new
+				--filter-tcp=2053,2083,2087,2096,8443
+				--hostlist-domains=discord.media
+				--dpi-desync=multisplit
+				--dpi-desync-split-seqovl=652
+				--dpi-desync-split-pos=2
+				--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+			"
+			commit $cfgname
+		EOF
+	fi
 	if [ "$strat" = "ALT7_by_Flowseal" ]; then
 		uci batch <<-EOF
 			set $cfgname.config.NFQWS_PORTS_TCP='80,443'
@@ -391,5 +442,17 @@ function set_cfg_default_values
 			commit $cfgname
 		EOF
 	fi
+	if echo "$opt_flags" | grep -q "(enable_custom_d)"; then
+		uci batch <<-EOF
+			set $cfgname.config.DISABLE_CUSTOM='0'
+			commit $cfgname
+		EOF
+	fi
+	if echo "$opt_flags" | grep -q "(disable_custom_d)"; then
+		uci batch <<-EOF
+			set $cfgname.config.DISABLE_CUSTOM='1'
+			commit $cfgname
+		EOF
+	fi
 	return 0
 }

zapret/dwc.sh

@@ -1,11 +1,28 @@
 #!/bin/sh
 # Copyright (c) 2026 remittor
 
-. /opt/zapret/comfunc.sh
-
 ZAP_TMP_DIR=/tmp/zapret_dwc
 
-rm -rf $ZAP_TMP_DIR
+opt_dig=
+opt_recom=
+opt_tmp_dir=
+opt_test=
+
+while getopts "d:RT:t" opt; do
+	case $opt in
+		d) opt_dig="$OPTARG";;
+		R) opt_recom="true";;     # Recommendations
+		T) opt_tmp_dir="$OPTARG";;
+		t) opt_test="true";;
+	esac
+done 
+
+[ "$opt_tmp_dir" != "" ] && ZAP_TMP_DIR="$opt_tmp_dir"
+
+TARGET_LIST_FILE="$ZAP_TMP_DIR/targets"
+
+[ -f "$TARGET_LIST_FILE" ] && rm -rf "$ZAP_TMP_DIR"
+[ -f "$TARGET_LIST_FILE" ] && exit 3
 
 CURL_TIMEOUT=5
 CURL_RANGETO=65535
@@ -27,6 +44,26 @@ if ! echo "$CURL_INFO" | grep -q 'https'; then
 	return 11
 fi
 
+if [ "$opt_dig" != "" ]; then
+	if ! command -v dig >/dev/null 2>&1; then
+		echo "ERROR: package \"bind-dig\" not installed!"
+		return 12
+	fi
+	OPT_DIG_DNS="@$opt_dig"
+	[ "$opt_dig" = "@"  ] && OPT_DIG_DNS=''
+	[ "$opt_dig" = "8"  ] && OPT_DIG_DNS='@8.8.8.8'
+	[ "$opt_dig" = "1"  ] && OPT_DIG_DNS='@1.1.1.1'
+	[ "$opt_dig" = "9"  ] && OPT_DIG_DNS='@9.9.9.9'
+fi
+
+if [ -f /etc/openwrt_release ]; then
+	CA_CERTS=/etc/ssl/certs/ca-certificates.crt
+	if [ ! -f $CA_CERTS ]; then
+		echo "ERROR: package \"ca-bundle\" not installed!"
+		return 15
+	fi
+fi
+ 
 #echo 'Original sources: https://github.com/hyperion-cs/dpi-checkers'
 #echo 'WEB-version: https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/'
 
@@ -65,7 +102,6 @@ function trim
 
 mkdir -p "$ZAP_TMP_DIR"
 
-TARGET_LIST_FILE="$ZAP_TMP_DIR/targets"
 : > "$TARGET_LIST_FILE"
 IDX=0
 while IFS= read -r line; do
@@ -102,21 +138,25 @@ while IFS='|' read -r ID TAG COUNTRY PROVIDER TIMES URL; do
 	#echo "TAG=$TAG , COUNTRY=$COUNTRY , PROVIDER=$PROVIDER , DOMAIN=$DOMAIN , URL=$URL"
 	FNAME="$ZAP_TMP_DIR/$ID3=$TAG=$PROVIDER"
 	(
-		DST_IP="???"
+		DST_IP=
-		if [ "$DST_IP" = "" ]; then
+		RESOLVE_OPT=
-			CURL_TIMEOUTS="--connect-timeout 5 --max-time 6 --speed-time 5 --speed-limit 1"
+		if [ "$opt_dig" != "" ]; then
-			#DST_IP=$( curl -4 -I -s $CURL_TIMEOUTS -o /dev/null -w '%{remote_ip}\n' "$URL" )
+			DST_IP=$( dig +time=2 +retry=1 $OPT_DIG_DNS +short "$DOMAIN" 2>/dev/null | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | head -n1 )
+		else
+			CURL_TIMEOUTS="--connect-timeout 2 --max-time 3 --speed-time 3 --speed-limit 1"
+			DST_IP=$( curl -4 -I -s $CURL_TIMEOUTS -o /dev/null -w '%{remote_ip}\n' "$URL" )
 			if [ -z "$DST_IP" ]; then
 				DST_IP=$( curl -4 -s $CURL_TIMEOUTS -o /dev/null -r 0-0 -w '%{remote_ip}\n' "$URL" )
 			fi
-			if [ -z "$DST_IP" ]; then
-				DST_IP="$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p')"
-			fi
 		fi
-		echo "$URL" > "$FNAME.url"
+		if [ "$DST_IP" = "" ]; then
+			DST_IP=$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p' )
+		fi
+		[ "$DST_IP" != "" ] && RESOLVE_OPT="--resolve $DOMAIN:443:$DST_IP"
 		echo "$DST_IP" > "$FNAME.ip"
-		RESOLVE_OPT="--resolve $DOMAIN:443:$DST_IP"
+		echo "$URL" > "$FNAME.url"
 		curl "$URL" \
+			$RESOLVE_OPT \
 			--connect-timeout $CURL_CON_TIMEOUT \
 			--max-time $CURL_TIMEOUT \
 			--speed-time $CURL_SPEED_TIME \
@@ -125,45 +165,70 @@ while IFS='|' read -r ID TAG COUNTRY PROVIDER TIMES URL; do
 			-A "$CURL_USERAGENT" \
 			-D "$FNAME.hdr" \
 			-o "$FNAME.body"
-	) > "$FNAME.txt" 2>&1 &
+	) > "$FNAME.log" 2>&1 &
 done < "$TARGET_LIST_FILE"
 
 wait
 
-printf '%s\n' "$ZAP_TMP_DIR"/*.txt | sort | while IFS= read -r file; do
+FAIL_URL_LIST="$ZAP_TMP_DIR/FAIL_URL_LIST.txt"
+rm -f "$FAIL_URL_LIST"
+
+printf '%s\n' "$ZAP_TMP_DIR"/*.log | sort | while IFS= read -r file; do
 	[ -f "$file" ] || continue
-	FNAME="${file##*/}"
+	FILENAME="${file##*/}"
-	FNAME="${FNAME%.txt}" 
+	FILENAME="${FILENAME%.log}"
-	ID=$( echo "$FNAME" | cut -d= -f1)
+	ID=$( echo "$FILENAME" | cut -d= -f1)
-	TAG=$( echo "$FNAME" | cut -d= -f2)
+	TAG=$( echo "$FILENAME" | cut -d= -f2)
-	PROVIDER=$(echo "$FNAME" | cut -d= -f3 )
+	PROVIDER=$(echo "$FILENAME" | cut -d= -f3 )
-	FNAME="$ZAP_TMP_DIR/$FNAME"
+	FNAME="$ZAP_TMP_DIR/$FILENAME"
 	BODY_SIZE=0
 	[ -f "$FNAME.body" ] && BODY_SIZE=$( wc -c < "$FNAME.body" )
+	IPADDR="x.x.x.x"
+	[ -s "$FNAME.ip" ] && IPADDR=$( cat "$FNAME.ip" )
+	res=0
 	status=
-	if [ ! -f "$FNAME.ip" ]; then
+	if [ ! -f "$FNAME.hdr" ]; then
-		status="ERROR: cannot get IP-Addr"
-	elif [ ! -s "$FNAME.ip" ]; then
-		status="ERROR: cannot get ip-addr"
-	elif [ ! -f "$FNAME.hdr" ]; then
 		status="ERROR: cannot Get Headers"
 	elif [ ! -s "$FNAME.hdr" ]; then
 		status="ERROR: cannot get headers"
 	elif [ ! -f "$FNAME.body" ]; then
-		status="ERROR: cannot get body"
+		status="Possibly detected*"
 	elif [ ! -s "$FNAME.body" ]; then
 		status="Possibly detected"
 	else
 		if [ "$BODY_SIZE" -le $CURL_RANGETO ]; then
-			status="Failed to complete detection (recv $BODY_SIZE bytes)"
+			status="Failed (recv $BODY_SIZE bytes)"
+			res=5
 		else
 			status="[ OK ]"
+			res=100
 		fi
 	fi
-	printf '%12s / %-13s: %s \n' "$TAG" "$PROVIDER" "$status"
+	printf '%12s / %-15s / %-13s: %s \n' "$TAG" "$IPADDR" "$PROVIDER" "$status"
 	echo "$BODY_SIZE" > "$FNAME.size"
+	if [ $res != 100 ]; then
+		URL=$( cat "$FNAME.url" )
+		echo "$FILENAME : $URL" >> "$FAIL_URL_LIST"
+	fi
 done
 
 rm -f "$ZAP_TMP_DIR"/*.body >/dev/null 2>&1
 
+[ "$opt_recom" != "true" ] && return 0
+
+[ ! -f "$FAIL_URL_LIST" ] && return 0
+
+echo "==================================================="
+echo "Recommendations:"
+echo "Try adding the specified domains to the \"zapret-hosts-user.txt\" file:"
+
+while IFS=' : ' read -r FILENAME URL; do
+	[ -z "$FILENAME" ] && continue
+	URL_NO_PROTO="${URL#*://}"
+	DOMAIN="${URL_NO_PROTO%%/*}"
+	URLPATH="/${URL_NO_PROTO#*/}"
+	[ "$URLPATH" = "/$URL_NO_PROTO" ] && URLPATH="/"
+	echo "$DOMAIN"
+done < "$FAIL_URL_LIST"
+
 return 0 

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

@@ -16,6 +16,8 @@ gov.ru
 sudrf.ru
 ottai.com
 ipstream.one
+vkusvill.ru
+kinopoisk.ru
 #################################### Epicgames
 easy.ac
 fab.com
@@ -37,45 +39,14 @@ cubicmotion.com
 playparagon.com
 realityscan.com
 epicgamescdn.com
-et.epicgames.com
-ol.epicgames.com
 radgametools.com
 unrealengine.com
-api.epicgames.dev
 easyanticheat.net
 shadowcomplex.com
 battlebreakers.com
-store.epicgames.com
 capturingreality.com
 unrealtournament.com
-cdn1.unrealengine.com
-cdn2.unrealengine.com
-accounts.epicgames.com
-download.epicgames.com
-tracking.epicgames.com
-download2.epicgames.com
-download3.epicgames.com
-download4.epicgames.com
-metrics.ol.epicgames.com
-datarouter.ol.epicgames.com
-fastly-download.epicgames.com
-store-content.ak.epicgames.com
-static-assets-prod.epicgames.com
 epicgames-download1.akamaized.net
-launcher-website-prod07.ol.epicgames.com
-ut-public-service-prod10.ol.epicgames.com
-store-site-backend-static.ak.epicgames.com
-library-service.live.use1a.on.epicgames.com
-accountportal-website-prod07.ol.epicgames.com
-account-public-service-prod03.ol.epicgames.com
-catalog-public-service-prod06.ol.epicgames.com
-friends-public-service-prod06.ol.epicgames.com
-launcher-public-service-prod06.ol.epicgames.com
-entitlement-public-service-prod08.ol.epicgames.com
-lightswitch-public-service-prod06.ol.epicgames.com
-orderprocessor-public-service-ecomprod01.ol.epicgames.com
-launcherwaitingroom-public-service-prod06.ol.epicgames.com
-datastorage-public-service-liveegs.live.use1a.on.epicgames.com
 #################################### Steam
 s.team
 steam.tv
@@ -103,99 +74,49 @@ valvesoftware.net
 steam.cdn.webra.ru
 steambroadcast.com
 steamcommunity.com
-cdn.steamstatic.com
-cs.steampowered.com
 dl.steam.clngaa.com
 steam.ru.qtlglb.com
-api.steampowered.com
 steam.eca.qtlglb.com
 steamusercontent.com
-help.steampowered.com
 steam.apac.qtlglb.com
 steam.naeu.qtlglb.com
 cdn.steamcommunity.com
 gstore.val.manlaxy.com
-login.steampowered.com
-media.steampowered.com
 partner.steamgames.com
-shared.steamstatic.com
 steam.cdn.orcon.net.nz
-store.steampowered.com
 steamcdn-a.akamaihd.net
 steampipe.akamaized.net
-partner.steampowered.com
 steamcdn-a.akamaized.net
 steamdeckusercontent.com
-support.steampowered.com
-checkout.steampowered.com
-community.steamstatic.com
 steam.cdn.slingshot.co.nz
 steammobile.akamaized.net
 steamstatic.akamaized.net
 steamstore-a.akamaihd.net
 steamvideo-a.akamaihd.net
-workshop.steampowered.com
-cdn.akamai.steamstatic.com
-cdn.fastly.steamstatic.com
 client-update.queniuqe.com
-community.steampowered.com
 steamdeckcdn.akamaized.net
 steampipe-kr.akamaized.net
-clan.fastly.steamstatic.com
 steamcontent-a.akamaihd.net
 steambroadcast.akamaized.net
 steamcommunity.akamaized.net
-store.akamai.steamstatic.com
-store.fastly.steamstatic.com
 scontent.steamusercontent.com
-shared.fastly.steamstatic.com
 steamcommunity-a.akamaihd.net
-avatars.fastly.steamstatic.com
-cdn.cloudflare.steamstatic.com
 edge.steam-dns.top.comcast.net
 steamcommunity-a.akamaized.net
 steamuserimages-a.akamaihd.net
 steampipe-partner.akamaized.net
 steamusercontent-a.akamaihd.net
-client-download.steampowered.com
-community.fastly.steamstatic.com
-store.cloudflare.steamstatic.com
-community.cloudflare.steamstatic.com
 steamcdn-a.akamaihd.net.edgesuite.net
 steamcloudsweden.blob.core.windows.net
-steamcommunity.cloudflare.steamstatic.com
 steamcommunity-a.akamaihd.net.edgesuite.net
 #################################### OpenWRT
-github.com
 openwrt.org
-gh.openwrt.org
-cdn.openwrt.org
-dev.openwrt.org
-git.openwrt.org
 lede-project.org
-wiki.openwrt.org
-forum.openwrt.org
-lists.openwrt.org
-openwrt.gitlab.io
-archive.openwrt.org
-downloads.openwrt.org
-fwdownloads.openwrt.org
-mirror-01.infra.openwrt.org
-mirror-02.infra.openwrt.org
-mirror-03.infra.openwrt.org
-mirror-04.infra.openwrt.org
 #################################### UbisoftConnect
 ubi.com
 ubisoft.com
-store.ubi.com
 ubisoftconnect.com
-connect.ubisoft.com
+connect.ubisoft.comubisoft-orbit-savegames.s3.amazonaws.com
-drops-register.ubi.com
-public-ubiservices.ubi.com
-ubisoftconnect.cdn.ubi.com
-uplaypc-s-ubisoft.cdn.ubi.com
-uplaypc-s-ubisoft-ww.cdn.ubi.com
-ubisoft-orbit-savegames.s3.amazonaws.com
 ubisoft-uplay-savegames.s3.amazonaws.com
 #################################### Aliexpress
 ae.com
@@ -215,55 +136,33 @@ playstation.net
 playstation.com
 account.sony.com
 psremoteplay.com
-ps4.playstation.com
-ps5.playstation.com
 playstationcloud.com
-psapi.playstation.net
-store.playstation.com
-media.playstation.com
-auth.np.ac.playstation.net
 sonyentertainmentnetwork.com
-np.community.playstation.net
-id.sonyentertainmentnetwork.com
 #################################### Twitch
 twitch.tv
 ttvnw.net
 jtvnw.net
-twimg.com
-m.twitch.tv
-id.twitch.tv
-www.twitch.tv
 twitchcdn.net
 ext-twitch.tv
 twitchsvc.net
-api.twitch.tv
-gql.twitch.tv
-dev.twitch.tv
 live-video.net
 twitch.a2z.com
-chat.twitch.tv
-help.twitch.tv
-assets.twitch.tv
 twitch-shadow.net
-passport.twitch.tv
-irc.chat.twitch.tv
-vod-metro.twitch.tv
 twitchcdn-shadow.net
-static.twitchcdn.net
-vod-secure.twitch.tv
-irc-ws.chat.twitch.tv
-pubsub-edge.twitch.tv
-vod-pop-secure.twitch.tv
 #################################### Valorant
+qq.com
 pvp.net
 vivox.com
 sd-rtn.com
+adjust.com
 riotcdn.net
 adobess.com
 valorant.com
 akamaihd.net
+myqcloud.com
 riotgames.com
 playvalorant.com
+wildrift-na.akamaized.net
 #################################### TikTok
 musical.ly
 tiktok.com
@@ -359,4 +258,30 @@ xiaomifactory.com
 airstarfinance.net
 dreame-technology.cn
 dreame-technology.com
+#################################### Picooc
+picoocru.com
+picooc-g.com
+picooc-int.com
+#################################### Huawei
+hc-cdn.cn
+huawei.ru
+huawei.com
+hc-cdn.com
+huawei.net
+dbankcdn.ru
+hicloud.com
+dbankcdn.com
+dbankcloud.ru
+dbankcloud.cn
+dbankcloud.com
+huaweicloud.com
+huaweistatic.com
+hwclouds-dns.com
+hwclouds-dns.net
+myhuaweicloud.cn
+myhuaweicloud.com
+huaweicloud-dns.cn
+huaweicloud-dns.ru
+huaweicloud-dns.com
+huaweicloud-dns.org
 ####################################

zapret/restore-def-cfg.sh

@@ -13,6 +13,11 @@ opt_strat=$2
 if echo "$opt_flags" | grep -q "(reset_ipset)"; then
 	restore_all_ipset_cfg
 fi
+
+if echo "$opt_flags" | grep -q "(erase_autohostlist)"; then
+	: > $ZAPRET_BASE/ipset/zapret-hosts-auto.txt
+	: > $ZAPRET_BASE/ipset/zapret-hosts-auto-debug.log
+fi
 	
 create_default_cfg "$opt_flags" "$opt_strat"
 

zapret/update-pkg.sh

@@ -75,9 +75,13 @@ ZAP_PKG_URL=
 if command -v apk >/dev/null; then
 	PKG_MGR=apk
 	ZAP_PKG_EXT=apk
+	PKG_CHECK="apk info -e "
+	PKG_REMOVE="apk del --force "
 elif command -v opkg >/dev/null; then
 	PKG_MGR=opkg
 	ZAP_PKG_EXT=ipk
+	PKG_CHECK="opkg status "
+	PKG_REMOVE="opkg remove --force-remove "
 else
 	echo "ERROR: No package manager found"
 	return 1
@@ -487,7 +491,7 @@ if [ "$opt_update" != "" ]; then
 		fi
 	fi
 	if ! command -v unzip >/dev/null 2>&1; then
-		echo "ERROR: package \"upzip\" not installed!"
+		echo "ERROR: package \"unzip\" not installed!"
 		return 218
 	fi
 	unzip -q "$ZAP_PKG_FN" -d $ZAP_PKG_DIR
@@ -525,6 +529,14 @@ if [ "$opt_update" != "" ]; then
 	if [ "$opt_forced" = true ]; then
 		pkg_mgr_update
 	fi
+	if ${PKG_CHECK} ${ZAPRET_CFG_NAME}-mdig >/dev/null 2>&1; then
+		echo "Uninstall mdig..."
+		${PKG_REMOVE} ${ZAPRET_CFG_NAME}-mdig
+	fi
+	if ${PKG_CHECK} ${ZAPRET_CFG_NAME}-ip2net >/dev/null 2>&1; then
+		echo "Uninstall ip2net..."
+		${PKG_REMOVE} ${ZAPRET_CFG_NAME}-ip2net
+	fi
 	echo "Install downloaded packages..."
 	if [ "$PKG_MGR" != "apk" ]; then
 		opkg install --force-reinstall "$ZAP_PKG_BASE_FN"