Integrate mdig and ip2net to main package

.github/workflows/build.yml

@@ -205,7 +205,7 @@ jobs:
         shell: bash
         run: |
           PKGDIR=$GITHUB_WORKSPACE/zapret-openwrt
-          MKFN=$PKGDIR/luci-app-zapret/Makefile
+          MKFN=$PKGDIR/luci-app-zapret2/Makefile
           PKGVER=$( grep -s '^PKG_VERSION:=.*' $MKFN | cut -d'=' -f2 )
           PKGREL=$( grep -s '^PKG_RELEASE:=.*' $MKFN | cut -d'=' -f2 )
           [ "$PKGREL" != "1" ] && PKGVER=$PKGVER-r$PKGREL
@@ -249,9 +249,9 @@ jobs:
               cat .config
               echo "------------- .config END -------------------"
               if [ "$ARCH" = "$LUCI_ARCH" ]; then
-                  PKGLIST=`echo package/zapret-openwrt/{zapret,zapret-mdig,zapret-ip2net,luci-app-zapret}/compile`
+                  PKGLIST=`echo package/zapret-openwrt/{zapret2,luci-app-zapret2}/compile`
               else
-                  PKGLIST=`echo package/zapret-openwrt/{zapret,zapret-mdig,zapret-ip2net}/compile`
+                  PKGLIST=`echo package/zapret-openwrt/zapret2/compile`
               fi
               if [ "$MAX_SPEED" = "false" ]; then
                   make $PKGLIST V=s CONFIG_CCACHE=1 BUILD_LOG=1

luci-app-zapret2/Makefile

@@ -5,8 +5,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-zapret2
-PKG_VERSION:=0.7.20251225
+PKG_VERSION:=0.8.20251230
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=remittor <https://github.com/remittor>
 

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

@@ -403,13 +403,13 @@ return baseclass.extend({
                     E('button', {
                         'id': 'btn_save',
                         'class': 'btn cbi-button-positive important',
-                        'click': ui.createHandlerFn(this, this.handleSave),
+                        'click': ui.createHandlerFn(this, this.handleSaveAdv),
                     }, _('Save')),
                 ]),
             ]);
         },
 
-        handleSave: function(ev) {
+        handleSaveAdv: function(ev) {
             let txt = document.getElementById('widget.modal_content');
             let value = txt.value.trim().replace(/\r\n/g, '\n') + '\n';
 
@@ -514,13 +514,13 @@ return baseclass.extend({
                     E('button', {
                         'id': 'btn_save',
                         'class': 'btn cbi-button-positive important',
-                        'click': ui.createHandlerFn(this, this.handleSave),
+                        'click': ui.createHandlerFn(this, this.handleSaveAdv),
                     }, _('Save')),
                 ]),
             ]);
         },
 
-        handleSave: function(ev) {
+        handleSaveAdv: function(ev) {
             let txt = document.getElementById('widget.modal_content');
             let value = txt.value.trim();
             if (this.multiline) {
@@ -543,17 +543,30 @@ return baseclass.extend({
             }
             value = value.replace(/˂/g, '<');
             value = value.replace(/˃/g, '>');
-            let elem = document.getElementById("cbi-zapret2-" + this.cfgsec + "-_" + this.cfgparam);
+            try {
-            if (elem) {
+                let elem2 = null;
-                let val = value.trim();
+                let elem = document.getElementById("cbi-zapret-" + this.cfgsec + "-_" + this.cfgparam);
-                if (this.multiline) {
+                if (elem) {
-                    val = val.replace(/</g, '˂');
+                    if (!elem2) {
-                    val = val.replace(/>/g, '˃');
+                        elem2 = elem.querySelector('div');
-                    val = val.replace(/\n/g, '<br/>');
+                    }
-                    elem.querySelector('div').innerHTML = val;
+                    if (!elem2) {
-                } else {
+                        elem2 = elem.querySelector('output');
-                    elem.querySelector('div').textContent = val;
+                    }
                 }
+                if (elem2) {
+                    let val = value.trim();
+                    if (this.multiline) {
+                        val = val.replace(/</g, '˂');
+                        val = val.replace(/>/g, '˃');
+                        val = val.replace(/\n/g, '<br/>');
+                        elem2.innerHTML = val;
+                    } else {
+                        elem2.textContent = val;
+                    }
+                }
+            } catch(e) {
+                console.error('ERROR: cannot found elem for ' + this.cfgparam);
             }
             uci.set('zapret2', this.cfgsec, this.cfgparam, value);
             uci.save().then(ui.hideModal);

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

@@ -171,9 +171,13 @@ return baseclass.extend({
                     this.setStage(999);
                 }
             } catch (e) {
+                if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
+                    console.warn('WARN: installUpdates: ' + e.message);
+                    return;  // goto next timer iteration
+                }
                 clearInterval(timer);
                 this.appendLog('ERROR: installUpdates: ' + e.message);
-                this.appendLog('ERROR: installUpdates: ' + e.stack?.trim().split('\n').pop());
+                this.appendLog('ERROR: installUpdates: ' + e.stack?.trim().split('\n')[0]);
                 this.setStage(999);
             } finally {
                 timerBusy = false;

zapret-ip2net/Makefile

@@ -1,45 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=zapret2-ip2net
-PKG_VERSION:=0.7.20251225
-PKG_RELEASE:=2
-
-PKG_MAINTAINER:=bol-van
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=docs/LICENSE.txt
-
-PKG_SOURCE_URL:=https://github.com/bol-van/zapret2.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9e2222549e7c2eee6f4827f7c36fb7e7c3a07b4c
-PKG_SOURCE_DATE:=2025-12-25
-
-#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-#PKG_SOURCE_URL:=https://github.com/bol-van/zapret2/archive/refs/tags/v$(PKG_VERSION).tar.gz?
-#PKG_HASH:=skip
-
-include $(INCLUDE_DIR)/package.mk
-
-#TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
-#TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
-
-MAKE_PATH:=ip2net
-
-define Package/$(PKG_NAME)
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=ip2net
-	SUBMENU:=Zapret2
-	DEPENDS:=+zlib +zapret2
-endef
-
-define Build/Prepare
-	$(Build/Prepare/Default)
-	rm -f $(PKG_BUILD_DIR)/$(MAKE_PATH)/ip2net
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/opt/zapret2/ip2net
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/ip2net $(1)/opt/zapret2/ip2net/
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

zapret-mdig/Makefile

@@ -1,45 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=zapret2-mdig
-PKG_VERSION:=0.7.20251225
-PKG_RELEASE:=2
-
-PKG_MAINTAINER:=bol-van
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=docs/LICENSE.txt
-
-PKG_SOURCE_URL:=https://github.com/bol-van/zapret2.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9e2222549e7c2eee6f4827f7c36fb7e7c3a07b4c
-PKG_SOURCE_DATE:=2025-12-25
-
-#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-#PKG_SOURCE_URL:=https://github.com/bol-van/zapret2/archive/refs/tags/v$(PKG_VERSION).tar.gz?
-#PKG_HASH:=skip
-
-include $(INCLUDE_DIR)/package.mk
-
-#TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
-#TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
-
-MAKE_PATH:=mdig
-
-define Package/$(PKG_NAME)
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=mdig
-	SUBMENU:=Zapret2
-	DEPENDS:=+zlib +zapret2
-endef
-
-define Build/Prepare
-	$(Build/Prepare/Default)
-	rm -f $(PKG_BUILD_DIR)/$(MAKE_PATH)/mdig
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/opt/zapret2/mdig
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/mdig $(1)/opt/zapret2/mdig/
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

zapret/uci-def-cfg.sh

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

zapret2/Makefile

@@ -5,8 +5,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zapret2
-PKG_VERSION:=0.7.20251225
+PKG_VERSION:=0.8.20251230
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -14,8 +14,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
 
 PKG_SOURCE_URL:=https://github.com/bol-van/zapret2.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9e2222549e7c2eee6f4827f7c36fb7e7c3a07b4c
+PKG_SOURCE_VERSION:=89f0f39b836a6826a9114e4fd705ca8309094dbb
-PKG_SOURCE_DATE:=2025-12-25
+PKG_SOURCE_DATE:=2025-12-30
 
 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret2/archive/refs/tags/v$(PKG_VERSION).tar.gz?
@@ -58,13 +58,17 @@ endef
 define Build/Prepare
 	$(Build/Prepare/Default)
 	rm -f $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws2
+	rm -f $(PKG_BUILD_DIR)/ip2net/ip2net
+	rm -f $(PKG_BUILD_DIR)/mdig/mdig
 endef
 
 #define Build/Configure
 #endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(TARGET_CONFIGURE_OPTS) LUA_CFLAGS="$(LUA_INCLUDE)" LUA_LIB="$(LUA_LIBRARY)"
+	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(TARGET_CONFIGURE_OPTS) LUA_JIT=$(LUA_JIT) LUA_CFLAGS="$(LUA_INCLUDE)" LUA_LIB="$(LUA_LIBRARY)"
+	$(MAKE) -C $(PKG_BUILD_DIR)/ip2net $(TARGET_CONFIGURE_OPTS)
+	$(MAKE) -C $(PKG_BUILD_DIR)/mdig $(TARGET_CONFIGURE_OPTS)
 endef
 
 define Package/$(PKG_NAME)/conffiles
@@ -78,6 +82,10 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/opt/zapret2
 	$(INSTALL_DIR) $(1)/opt/zapret2/$(MAKE_PATH)
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws2 $(1)/opt/zapret2/$(MAKE_PATH)/	
+	$(INSTALL_DIR) $(1)/opt/zapret2/ip2net
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip2net/ip2net $(1)/opt/zapret2/ip2net/
+	$(INSTALL_DIR) $(1)/opt/zapret2/mdig
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdig/mdig $(1)/opt/zapret2/mdig/
 	$(INSTALL_DIR) $(1)/opt/zapret2/common
 	$(CP) $(PKG_BUILD_DIR)/common/* $(1)/opt/zapret2/common/
 	$(INSTALL_DIR) $(1)/opt/zapret2/lua
@@ -130,6 +138,9 @@ define Package/$(PKG_NAME)/install
 	chmod 644 $(1)/opt/zapret2/init.d/openwrt/custom.d/*.sh
 	chmod 644 $(1)/opt/zapret2/config.default
 	chmod 755 $(1)/opt/zapret2/*.sh
+	chmod 755 $(1)/opt/zapret2/$(MAKE_PATH)/*
+	chmod 755 $(1)/opt/zapret2/ip2net/*
+	chmod 755 $(1)/opt/zapret2/mdig/*
 endef
 
 define Package/$(PKG_NAME)/preinst

zapret2/comfunc.sh

@@ -7,13 +7,16 @@ ZAPRET_BASE=/opt/zapret2
 ZAPRET_INITD=/etc/init.d/zapret2
 ZAPRET_ORIG_INITD="$ZAPRET_BASE/init.d/openwrt/zapret2"
 
+ZAP_LOG_TAG=ZAPRET2
+
 ZAPRET_CONFIG="$ZAPRET_BASE/config"
 ZAPRET_CONFIG_NEW="$ZAPRET_BASE/config.new"
 ZAPRET_CONFIG_DEF="$ZAPRET_BASE/config.default"
 
 ZAPRET_CFG=/etc/config/zapret2
 ZAPRET_CFG_NAME=zapret2
-ZAPRET_CFG_SEC_NAME="$( uci -q get $ZAPRET_CFG_NAME.config )"
+ZAPRET_CFG_SEC=$ZAPRET_CFG_NAME.config
+ZAPRET_CFG_SEC_NAME="$( uci -q get $ZAPRET_CFG_SEC )"
 
 . $ZAPRET_BASE/def-cfg.sh
 
@@ -148,7 +151,7 @@ function merge_cfg_with_def_values
 	local cfgname=${1:-$ZAPRET_CFG_NAME}
 	local force=$2
 	local cfgfile=/etc/config/$cfgname
-	local NEWCFGNAME="zapret2-default"
+	local NEWCFGNAME="$ZAPRET_CFG_NAME-default"
 	local NEWCFGFILE="/etc/config/$NEWCFGNAME"
 
 	local cfg_sec_name="$( uci -q get $ZAPRET_CFG_NAME.config )"
@@ -168,7 +171,7 @@ function merge_cfg_with_def_values
 function remove_cron_task_logs
 {
 	if [ -f "$CRONTAB_FILE" ]; then
-		sed -i "/-name 'zapret2+\*.log' -size +/d" "$CRONTAB_FILE"
+		sed -i "/-name '$ZAPRET_CFG_NAME+\*.log' -size +/d" "$CRONTAB_FILE"
 	fi
 }
 
@@ -176,8 +179,8 @@ function insert_cron_task_logs
 {
 	[ ! -f "$CRONTAB_FILE" ] && touch "$CRONTAB_FILE"
 	[ ! -f "$CRONTAB_FILE" ] && return 1
-	if ! grep -q -e "-name 'zapret2\*\.log' -size \+" "$CRONTAB_FILE"; then
+	if ! grep -q -e "-name '$ZAPRET_CFG_NAME\*\.log' -size \+" "$CRONTAB_FILE"; then
-		echo "*/2 * * * * /usr/bin/find /tmp -maxdepth 1 -type f -name 'zapret2+*.log' -size +2600k -exec rm -f {} \;" >> "$CRONTAB_FILE"
+		echo "*/2 * * * * /usr/bin/find /tmp -maxdepth 1 -type f -name '$ZAPRET_CFG_NAME+*.log' -size +2600k -exec rm -f {} \;" >> "$CRONTAB_FILE"
 		/etc/init.d/cron restart 2> /dev/null
 	fi
 	return 0
@@ -190,7 +193,7 @@ function init_before_start
 	[ ! -f "$HOSTLIST_FN" ] && touch "$HOSTLIST_FN"
 	chmod 644 $ZAPRET_BASE/ipset/*.txt
 	chmod 666 $ZAPRET_BASE/ipset/*.log
-	rm -f /tmp/zapret2+*.log
+	rm -f /tmp/$ZAPRET_CFG_NAME+*.log
 	#*/
 	if [ "$DAEMON_LOG_ENABLE" = "1" ]; then
 		insert_cron_task_logs

zapret2/def-cfg.sh

@@ -130,6 +130,35 @@ function set_cfg_nfqws_strat
 			commit $cfgname
 		EOF
 	fi
+	if [ "$strat" = "v2_by_Schiz23" ]; then
+		uci batch <<-EOF
+			set $cfgname.config.NFQWS2_PORTS_TCP='80,443'
+			set $cfgname.config.NFQWS2_PORTS_UDP='443'
+			set $cfgname.config.NFQWS2_OPT="
+				# Strategy $strat
+				
+				--filter-tcp=80
+				--filter-l7=http <HOSTLIST>
+				--payload=http_req
+				--lua-desync=fake:blob=fake_default_http:tcp_md5
+				--lua-desync=multisplit:pos=method+2
+				
+				--new
+				--filter-tcp=443
+				--filter-l7=tls <HOSTLIST>
+				--payload=tls_client_hello
+				--lua-desync=multidisorder:payload=tls_client_hello:pos=100,midsld,sniext+1,endhost-2,-10
+				--lua-desync=send:sni=.microsoft
+				
+				--new
+				--filter-udp=443
+				--filter-l7=quic <HOSTLIST_NOAUTO>
+				--payload=quic_initial
+				--lua-desync=fake:blob=fake_default_quic:repeats=4
+			"
+			commit $cfgname
+		EOF
+	fi
 	return 0
 }
 

zapret2/init.d.sh

@@ -10,14 +10,14 @@ SCRIPT_FILENAME=$1
 . /opt/zapret2/comfunc.sh
 
 if ! is_valid_config ; then
-	logger -p err -t ZAPRET2 "Wrong main config: $ZAPRET_CONFIG"
+	logger -p err -t $ZAP_LOG_TAG "Wrong main config: $ZAPRET_CONFIG"
 	exit 91
 fi
 
 . $ZAPRET_ORIG_INITD
 
-EXEDIR=/opt/zapret2
+EXEDIR=/opt/$ZAPRET_CFG_NAME
-ZAPRET_BASE=/opt/zapret2
+ZAPRET_BASE=/opt/$ZAPRET_CFG_NAME
 
 is_run_on_boot && IS_RUN_ON_BOOT=1 || IS_RUN_ON_BOOT=0
 
@@ -30,13 +30,13 @@ function enable
 		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 ZAPRET2 "Attempt to enable service, but service blocked!"
+				logger -p notice -t $ZAP_LOG_TAG "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 set $ZAPRET_CFG_SEC.run_on_boot=1
 		uci commit
 	fi
 	/bin/sh /etc/rc.common $ZAPRET_ORIG_INITD enable
@@ -49,7 +49,7 @@ function enabled
 		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 ZAPRET2 "Service is blocked!"
+				logger -p notice -t $ZAP_LOG_TAG "Service is blocked!"
 			fi
 			return 61
 		fi
@@ -65,7 +65,7 @@ function boot
 		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 ZAPRET2 "Attempt to run service on boot! Service is blocked!"
+				logger -p notice -t $ZAP_LOG_TAG "Attempt to run service on boot! Service is blocked!"
 				return 61
 			fi
 		fi

zapret2/renew-cfg.sh

@@ -1,7 +1,9 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor
 
-. /opt/zapret2/comfunc.sh
+EXE_DIR=$(cd "$(dirname "$0")" 2>/dev/null || exit 1; pwd)
+
+. $EXE_DIR/comfunc.sh
 
 merge_cfg_with_def_values
 
@@ -12,5 +14,5 @@ CONFIGS_SYNC=0
 
 if [ "$CONFIGS_SYNC" = "1" ]; then
 	# renew main config
-	/opt/zapret2/sync_config.sh
+	$ZAPRET_BASE/sync_config.sh
 fi

zapret2/restore-def-cfg.sh

@@ -1,9 +1,11 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor
 
-. /opt/zapret2/comfunc.sh
+EXE_DIR=$(cd "$(dirname "$0")" 2>/dev/null || exit 1; pwd)
 
-cfg_run_on_boot="$( uci -q get $ZAPRET_CFG_NAME.config.run_on_boot )"
+. $EXE_DIR/comfunc.sh
+
+cfg_run_on_boot="$( uci -q get $ZAPRET_CFG_SEC.run_on_boot )"
 
 opt_flags=${1:--}
 opt_strat=$2
@@ -15,7 +17,7 @@ fi
 create_default_cfg "$opt_flags" "$opt_strat"
 
 if [ "$cfg_run_on_boot" = "1" ]; then
-	uci set $ZAPRET_CFG_NAME.config.run_on_boot=1
+	uci set $ZAPRET_CFG_SEC.run_on_boot=1
 	uci commit
 fi
 
@@ -29,5 +31,5 @@ fi
 
 if [ "$ZAPRET_SYNC_CONFIG" = "1" ]; then
 	# renew main config
-	/opt/zapret2/sync_config.sh
+	$ZAPRET_BASE/sync_config.sh
 fi

zapret2/sync_config.sh

@@ -1,7 +1,9 @@
 #!/bin/sh
 # Copyright (c) 2024 remittor
 
-. /opt/zapret2/comfunc.sh
+EXE_DIR=$(cd "$(dirname "$0")" 2>/dev/null || exit 1; pwd)
+
+. $EXE_DIR/comfunc.sh
 
 function uncomment_param
 {
@@ -41,16 +43,22 @@ function sync_param
 {
 	local param=$1
 	local vtype=$2
-	local value="$( uci -q get zapret2.config.$param )"
+	local value="$( uci -q get $ZAPRET_CFG_SEC.$param )"
 	uncomment_param $param
 	append_param $param
 	local TAB="$( echo -n -e '\t' )"
 	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" = "NFQWS2_PORTS_TCP_KEEPALIVE" -o "$param" = "NFQWS2_PORTS_UDP_KEEPALIVE" ]; then
 		[ "$value" = "0" ] && value=""
 	fi
+	if [ "$param" = "NFQWS_OPT" -a "$value" != "" ]; then
+		value=$( echo -n "$value" | sed '/^#/d' )
+	fi
 	if [ "$param" = "NFQWS2_OPT" -a "$value" != "" ]; then
 		value=$( echo -n "$value" | sed '/^#/d' )
 	fi
@@ -90,21 +98,42 @@ sync_param DAEMON_LOG_FILE str
 sync_param AUTOHOSTLIST_RETRANS_THRESHOLD
 sync_param AUTOHOSTLIST_FAIL_THRESHOLD
 sync_param AUTOHOSTLIST_FAIL_TIME
+if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
+	sync_param AUTOHOSTLIST_INCOMING_MAXSEQ
+	sync_param AUTOHOSTLIST_RETRANS_MAXSEQ
+	sync_param AUTOHOSTLIST_UDP_IN
+	sync_param AUTOHOSTLIST_UDP_OUT
+fi
 sync_param AUTOHOSTLIST_DEBUGLOG
 
-sync_param NFQWS2_ENABLE
 sync_param DESYNC_MARK
 sync_param DESYNC_MARK_POSTNAT
 sync_param FILTER_MARK str
-sync_param NFQWS2_PORTS_TCP str
+
-sync_param NFQWS2_PORTS_UDP str
+if [ $ZAPRET_CFG_NAME = "zapret" ]; then
-sync_param NFQWS2_TCP_PKT_OUT str
+	sync_param NFQWS_ENABLE
-sync_param NFQWS2_TCP_PKT_IN str
+	sync_param NFQWS_PORTS_TCP str
-sync_param NFQWS2_UDP_PKT_OUT str
+	sync_param NFQWS_PORTS_UDP str
-sync_param NFQWS2_UDP_PKT_IN str
+	sync_param NFQWS_TCP_PKT_OUT str
-sync_param NFQWS2_PORTS_TCP_KEEPALIVE str
+	sync_param NFQWS_TCP_PKT_IN str
-sync_param NFQWS2_PORTS_UDP_KEEPALIVE str
+	sync_param NFQWS_UDP_PKT_OUT str
-sync_param NFQWS2_OPT str
+	sync_param NFQWS_UDP_PKT_IN str
+	sync_param NFQWS_PORTS_TCP_KEEPALIVE str
+	sync_param NFQWS_PORTS_UDP_KEEPALIVE str
+	sync_param NFQWS_OPT str
+fi
+if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
+	sync_param NFQWS2_ENABLE
+	sync_param NFQWS2_PORTS_TCP str
+	sync_param NFQWS2_PORTS_UDP str
+	sync_param NFQWS2_TCP_PKT_OUT str
+	sync_param NFQWS2_TCP_PKT_IN str
+	sync_param NFQWS2_UDP_PKT_OUT str
+	sync_param NFQWS2_UDP_PKT_IN str
+	sync_param NFQWS2_PORTS_TCP_KEEPALIVE str
+	sync_param NFQWS2_PORTS_UDP_KEEPALIVE str
+	sync_param NFQWS2_OPT str
+fi
 
 ZAPRET_CONFIG="$ZAPRET_CONFIG__SAVED"
 

zapret2/uci-def-cfg.sh

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

zapret2/update-pkg.sh

@@ -1,7 +1,9 @@
 #!/bin/sh
 # Copyright (c) 2025 remittor
 
-. /opt/zapret2/comfunc.sh
+EXE_DIR=$(cd "$(dirname "$0")" 2>/dev/null || exit 1; pwd)
+
+. $EXE_DIR/comfunc.sh
 . /usr/share/libubox/jshn.sh
 . /etc/openwrt_release
 
@@ -21,7 +23,7 @@ while getopts "cu:pft:" opt; do
 	esac
 done
 
-ZAP_PKG_DIR=/tmp/zapret2_pkg
+ZAP_PKG_DIR=/tmp/$ZAPRET_CFG_NAME-pkg
 
 if [ "$opt_test" != "" ]; then
 	echo 1; sleep 2;
@@ -34,8 +36,13 @@ if [ "$opt_test" != "" ]; then
 fi
 
 ZAP_CPU_ARCH=$(get_cpu_arch)
-ZAP_REL_URL="https://raw.githubusercontent.com/remittor/zapret-openwrt/gh-pages/releases/releases_zap2_$ZAP_CPU_ARCH.json"
 
+if [ $ZAPRET_CFG_NAME = "zapret" ]; then
+	ZAP_REL_URL="https://raw.githubusercontent.com/remittor/zapret-openwrt/gh-pages/releases/releases_zap1_$ZAP_CPU_ARCH.json"
+fi
+if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
+	ZAP_REL_URL="https://raw.githubusercontent.com/remittor/zapret-openwrt/gh-pages/releases/releases_zap2_$ZAP_CPU_ARCH.json"
+fi
 CURL_TIMEOUT=5
 CURL_HEADER1="Accept: application/json"
 CURL_HEADER2="Cache-Control: no-cache"
@@ -81,7 +88,7 @@ function get_pkg_version
 		fi
 	fi
 	if [ "$PKG_MGR" = apk ]; then
-		line=$( apk info -e "$pkg_name" 2>/dev/null || true )
+		line=$( apk info -s "$pkg_name" 2>/dev/null | head -n 1 | awk '{print $1}' || true )
 		if [ -n "$line" ]; then
 			base=${line%-r[0-9]*}
 			ver=${base##*-}
@@ -117,11 +124,16 @@ function normalize_version
 			;;
 	esac
 	old_ifs="$IFS" ; IFS='.' ; set -- $base ; IFS="$old_ifs"
+	rel=${rel:-1}
 	major=${1:-0}
 	minor=${2:-0}
-	build=${3:-0}
+	if [ $ZAPRET_CFG_NAME = "zapret" ]; then
-	rel=${rel:-1}
+		echo "$major.$minor.$rel"
-	echo "$major.$minor.$build.$rel"
+	fi
+	if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
+		build=${3:-0}
+		echo "$major.$minor.$build.$rel"
+	fi
 }
 
 function pkg_version_cmp
@@ -139,14 +151,22 @@ function pkg_version_cmp
 	x2=$( echo "$ver2" | cut -d. -f2 )
 	[ "$x1" -gt "$x2" ] && { echo -n "G"; return 0; }
 	[ "$x1" -lt "$x2" ] && { echo -n "L"; return 0; }
-	# build
+	if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
-	x1=$( echo "$ver1" | cut -d. -f3 )
+		# build
-	x2=$( echo "$ver2" | cut -d. -f3 )
+		x1=$( echo "$ver1" | cut -d. -f3 )
-	[ "$x1" -gt "$x2" ] && { echo -n "G"; return 0; }
+		x2=$( echo "$ver2" | cut -d. -f3 )
-	[ "$x1" -lt "$x2" ] && { echo -n "L"; return 0; }
+		[ "$x1" -gt "$x2" ] && { echo -n "G"; return 0; }
+		[ "$x1" -lt "$x2" ] && { echo -n "L"; return 0; }
+	fi
 	# release
-	x1=$( echo "$ver1" | cut -d. -f4 )
+	if [ $ZAPRET_CFG_NAME = "zapret" ]; then
-	x2=$( echo "$ver2" | cut -d. -f4 )
+		x1=$( echo "$ver1" | cut -d. -f3 )
+		x2=$( echo "$ver2" | cut -d. -f3 )
+	fi
+	if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
+		x1=$( echo "$ver1" | cut -d. -f4 )
+		x2=$( echo "$ver2" | cut -d. -f4 )
+	fi
 	[ "$x1" -gt "$x2" ] && { echo -n "G"; return 0; }
 	[ "$x1" -lt "$x2" ] && { echo -n "L"; return 0; }
 	echo -n "E"
@@ -154,14 +174,24 @@ function pkg_version_cmp
 
 function download_releases_info
 {
-	local txt txtlen txtlines generated_at
+	local fname resp hdr txt txtlen txtlines generated_at
 	REL_JSON=
 	echo "Download releases info..."
-	txt=$(download_json $ZAP_REL_URL)
+	fname="${ZAP_REL_URL##*/}"
+	resp=$( curl -s -D - --max-time $CURL_TIMEOUT -H "$CURL_HEADER1" -H "$CURL_HEADER2" "$ZAP_REL_URL" 2>/dev/null )
+	hdr="${resp%%$'\r\n\r\n'*}"
+	status=$( printf '%s\n' "$hdr" | head -n 1 | awk '{print $2}' )
+	if [ "$status" != 200 ]; then
+		echo "ERROR: Cannot download file \"$ZAP_REL_URL\" (status = $status)"
+		return 103
+	fi
+	txtlen=$( printf '%s\n' "$hdr" | awk -F': ' 'BEGIN{IGNORECASE=1} $1=="Content-Length"{print $2}' | tr -d '\r')
+	echo "Content-Length: $txtlen bytes"
+	txt="${resp#*$'\r\n\r\n'}"
 	txtlen=${#txt}
 	txtlines=$(printf '%s\n' "$txt" | wc -l)
 	if [[ $txtlen -lt 64 ]]; then
-		echo "ERROR: Cannot download releases info!"
+		echo "ERROR: Cannot download releases info! (size = $txtlen)"
 		return 104
 	fi
 	echo "Releases info downloaded! Size = $txtlen, Lines = $txtlines"
@@ -229,7 +259,7 @@ function get_actual_release
 	done
 	json_cleanup
 	echo "ERROR: latest release for arch \"$ZAP_CPU_ARCH\" not founded!"
-	return 1  # release not founded
+	return 150  # release not founded
 }
 
 # -------------------------------------------------------------------------------------------------------
@@ -286,7 +316,7 @@ ZAP_PKG_FN=
 ZAP_PKG_BASE_FN=
 ZAP_PKG_LUCI_FN=
 
-ZAP_CUR_PKG_VER=$( get_pkg_version zapret2 )
+ZAP_CUR_PKG_VER=$( get_pkg_version $ZAPRET_CFG_NAME )
 echo "Current installed version: $ZAP_CUR_PKG_VER"
 
 if [ "$opt_update" = "" ]; then
@@ -341,8 +371,8 @@ if [ "$opt_update" != "" ]; then
 			return 0
 		fi
 	fi
-	ZAP_PKG_DIR=/tmp/zapret2_pkg
+	ZAP_PKG_DIR=/tmp/$ZAPRET_CFG_NAME-pkg
-	rm -rf $ZAP_PKG_DIR
+	rm -rf $ZAP_PKG_DIR 2>/dev/null
 	ZAP_PKG_HDRS=$( curl -s -I -L --max-time $CURL_TIMEOUT -H "$CURL_HEADER2" "$ZAP_PKG_URL" )
 	ZAP_PKG_SIZE=$( echo "$ZAP_PKG_HDRS" | grep -i 'content-length: ' | tail -n1 | awk '{print $2}' | tr -d '\r' )
 	echo "Downloded ZIP-file size = $ZAP_PKG_SIZE bytes"
@@ -368,34 +398,34 @@ if [ "$opt_update" != "" ]; then
 		return 218
 	fi
 	unzip -q "$ZAP_PKG_FN" -d $ZAP_PKG_DIR
-	rm -f "$ZAP_PKG_FN"
+	rm -f "$ZAP_PKG_FN" 2>/dev/null
 	if [ "$PKG_MGR" = "apk" ]; then
 		if [ ! -d "$ZAP_PKG_DIR/apk" ]; then
 			echo "ERROR: APK-files not founded"
 			return 221
 		fi
-		rm -f "$ZAP_PKG_DIR/*.ipk"
+		rm -f $ZAP_PKG_DIR/*.ipk 2>/dev/null
-		mv "$ZAP_PKG_DIR/apk/*" "$ZAP_PKG_DIR/"
+		mv $ZAP_PKG_DIR/apk/* $ZAP_PKG_DIR/
 	else
-		rm -rf "$ZAP_PKG_DIR/apk"
+		rm -rf $ZAP_PKG_DIR/apk 2>/dev/null
 	fi
 	ZAP_PKG_LIST=$( ls -1 "$ZAP_PKG_DIR" )
 	echo "------ Downloaded packages:"
 	echo "$ZAP_PKG_LIST"
 	echo "------"
 	if [ "$PKG_MGR" != "apk" ]; then
-		ZAP_PKG_BASE_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "zapret2_*.${ZAP_PKG_EXT}" | head -n 1 )
+		ZAP_PKG_BASE_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "${ZAPRET_CFG_NAME}_*.${ZAP_PKG_EXT}" | head -n 1 )
 	else
-		ZAP_PKG_BASE_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "zapret2-[0-9]*.?*.${ZAP_PKG_EXT}" | head -n 1 )
+		ZAP_PKG_BASE_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "${ZAPRET_CFG_NAME}-[0-9]*.?*.${ZAP_PKG_EXT}" | head -n 1 )
 	fi
-	ZAP_PKG_LUCI_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "luci-app-zapret2*.${ZAP_PKG_EXT}" | head -n 1 )
+	ZAP_PKG_LUCI_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "luci-app-${ZAPRET_CFG_NAME}*.${ZAP_PKG_EXT}" | head -n 1 )
 	if [ ! -f "$ZAP_PKG_BASE_FN" ]; then
-		echo "ERROR: File \"zapret2*.${ZAP_PKG_EXT}\" not found!"
+		echo "ERROR: File \"${ZAPRET_CFG_NAME}*.${ZAP_PKG_EXT}\" not found!"
 		return 231
 	fi
 	echo "ZAP_PKG_BASE_FN = $ZAP_PKG_BASE_FN"
 	if [ ! -f "$ZAP_PKG_LUCI_FN" ]; then
-		echo "ERROR: File \"luci-app-zapret2*.${ZAP_PKG_EXT}\" not found!"
+		echo "ERROR: File \"luci-app-${ZAPRET_CFG_NAME}*.${ZAP_PKG_EXT}\" not found!"
 		return 232
 	fi
 	echo "ZAP_PKG_LUCI_FN = $ZAP_PKG_LUCI_FN"