From 950d30fdfda755e2f0d2ec8746a322997f06ea8b Mon Sep 17 00:00:00 2001 From: gSpot Date: Mon, 23 Feb 2026 20:29:35 +0300 Subject: [PATCH] Minor fixes. --- autoinstall/2.x/apk/autoinstall.sh | 2 +- autoinstall/2.x/autoinstall.sh | 2 +- ruantiblock/Makefile | 2 +- ruantiblock/files/etc/hotplug.d/iface/40-ruantiblock | 2 +- ruantiblock/files/usr/bin/ruantiblock | 6 ++++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/autoinstall/2.x/apk/autoinstall.sh b/autoinstall/2.x/apk/autoinstall.sh index 4f43e0a..4b4d902 100755 --- a/autoinstall/2.x/apk/autoinstall.sh +++ b/autoinstall/2.x/apk/autoinstall.sh @@ -10,7 +10,7 @@ LUCI_APP=1 HTTPS_DNS_PROXY=1 OWRT_VERSION="25.12" -RUAB_VERSION="2.1.12-r1" +RUAB_VERSION="2.1.12-r2" RUAB_MOD_LUA_VERSION="2.1.12-r1" RUAB_LUCI_APP_VERSION="2.1.12-r1" BASE_URL="https://raw.githubusercontent.com/gSpotx2f/packages-openwrt/master" diff --git a/autoinstall/2.x/autoinstall.sh b/autoinstall/2.x/autoinstall.sh index ec00162..4c2c2e0 100755 --- a/autoinstall/2.x/autoinstall.sh +++ b/autoinstall/2.x/autoinstall.sh @@ -10,7 +10,7 @@ LUCI_APP=1 HTTPS_DNS_PROXY=1 OWRT_VERSION="24.10" -RUAB_VERSION="2.1.12-r1" +RUAB_VERSION="2.1.12-r2" RUAB_MOD_LUA_VERSION="2.1.12-r1" RUAB_LUCI_APP_VERSION="2.1.12-r1" BASE_URL="https://raw.githubusercontent.com/gSpotx2f/packages-openwrt/master" diff --git a/ruantiblock/Makefile b/ruantiblock/Makefile index f4bb23d..c9541dc 100644 --- a/ruantiblock/Makefile +++ b/ruantiblock/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruantiblock PKG_VERSION:=2.1.12 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=gSpot include $(INCLUDE_DIR)/package.mk diff --git a/ruantiblock/files/etc/hotplug.d/iface/40-ruantiblock b/ruantiblock/files/etc/hotplug.d/iface/40-ruantiblock index 6ac1371..774e37d 100755 --- a/ruantiblock/files/etc/hotplug.d/iface/40-ruantiblock +++ b/ruantiblock/files/etc/hotplug.d/iface/40-ruantiblock @@ -8,7 +8,7 @@ if [ "$ACTION" = "ifup" ]; then CONFIG_SCRIPT_USER_INSTANCES="/usr/share/ruantiblock/config_script_user_instances" USER_INSTANCES_DIR="/etc/ruantiblock/user_instances" USER_INSTANCE_VARS="U_ENABLED U_NAME U_PROXY_MODE U_TOR_TRANS_PORT U_ONION_DNS_ADDR U_IF_VPN U_VPN_GW_IP U_T_PROXY_TYPE U_T_PROXY_PORT_TCP U_T_PROXY_PORT_UDP U_T_PROXY_ALLOW_UDP U_USER_ENTRIES_DNS U_USER_ENTRIES_REMOTE U_ENABLE_ENTRIES_REMOTE_PROXY U_ENABLE_FPROXY U_FPROXY_LIST" - USER_INSTANCES_MAX=10 + USER_INSTANCES_MAX=5 DEBUG=0 IF_VPN_CURRENT="" diff --git a/ruantiblock/files/usr/bin/ruantiblock b/ruantiblock/files/usr/bin/ruantiblock index d3d6ab6..0b1a609 100755 --- a/ruantiblock/files/usr/bin/ruantiblock +++ b/ruantiblock/files/usr/bin/ruantiblock @@ -625,12 +625,14 @@ DeleteUserInstancesNftRules() { } AddNftRules() { - local _chain_prio_first _chain_prio_local _chain_prio_fproxy _chain_prio_action _route_table_id + local _chain_prio_first _chain_prio_local _chain_prio_fproxy _chain_prio_action _route_table_id=$VPN_ROUTE_TABLE_ID_START _chain_prio_first=$NFT_PRIO _chain_prio_local=$NFT_PRIO_LOCAL _chain_prio_fproxy=$(($NFT_PRIO + 1)) _chain_prio_action=$(($NFT_PRIO + 2)) - _route_table_id=$VPN_ROUTE_TABLE_ID_START + if [ "$PROXY_MODE" = "3" -a "$T_PROXY_TYPE" = "1" ]; then + _route_table_id=$TPROXY_ROUTE_TABLE_ID_START + fi NftAddBaseChains $_chain_prio_first $_chain_prio_local $_chain_prio_fproxy NftAddActionChains $_chain_prio_action AddUserInstancesNftRules