mirror of
https://github.com/gSpotx2f/ruantiblock_openwrt.git
synced 2026-05-13 14:10:59 +00:00
Minor fixes.
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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 <https://github.com/gSpotx2f/ruantiblock_openwrt>
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
@@ -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=""
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user