i11th/ruantiblock_openwrt
1
0
Fork 0
mirror of https://github.com/gSpotx2f/ruantiblock_openwrt.git synced 2026-05-14 14:40:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes.

Browse Source
This commit is contained in:
gSpot
2026-02-23 22:00:04 +03:00
parent 145eb5a6b9
commit 5b1ba82dd0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruantiblock/files/usr/bin/ruantiblock
+6 -2
View File
@@ -588,7 +588,7 @@ UpdateBllistSets() {
} }
AddUserInstancesNftRules() { AddUserInstancesNftRules() {
local _pkts_mark=$PKTS_MARK_START _inst _vpn_route_table_id=$VPN_ROUTE_TABLE_ID_START _tproxy_route_table_id=$TPROXY_ROUTE_TABLE_ID_START _route_table_id=0 local _pkts_mark=$PKTS_MARK_START _inst _vpn_route_table_id=$VPN_ROUTE_TABLE_ID_START _tproxy_route_table_id=$TPROXY_ROUTE_TABLE_ID_START _route_table_id
for _inst in $USER_INSTANCES_ALL_FNAMES for _inst in $USER_INSTANCES_ALL_FNAMES
do do
IncludeUserInstanceVars "$_inst" IncludeUserInstanceVars "$_inst"
@@ -598,6 +598,8 @@ AddUserInstancesNftRules() {
elif [ "$U_PROXY_MODE" = "3" -a "$U_T_PROXY_TYPE" = "1" ]; then elif [ "$U_PROXY_MODE" = "3" -a "$U_T_PROXY_TYPE" = "1" ]; then
_tproxy_route_table_id=$(($_tproxy_route_table_id + 1)) _tproxy_route_table_id=$(($_tproxy_route_table_id + 1))
_route_table_id=$_tproxy_route_table_id _route_table_id=$_tproxy_route_table_id
else
_route_table_id=0
fi fi
_pkts_mark=$(($_pkts_mark + 1)) _pkts_mark=$(($_pkts_mark + 1))
NftInstanceAdd "\"$U_NAME\"" $_pkts_mark ${U_PROXY_MODE:=$INSTANCES_DEF_PROXY_MODE} ${U_TOR_TRANS_PORT:=$INSTANCES_DEF_TOR_TRANS_PORT} $_route_table_id "\"${U_IF_VPN:=$INSTANCES_DEF_IF_VPN}\"" ${U_T_PROXY_TYPE:=$INSTANCES_DEF_T_PROXY_TYPE} ${U_T_PROXY_PORT_TCP:=$INSTANCES_DEF_T_PROXY_PORT_TCP} ${U_T_PROXY_PORT_UDP:=$INSTANCES_DEF_T_PROXY_PORT_UDP} ${U_T_PROXY_ALLOW_UDP:=$INSTANCES_DEF_T_PROXY_ALLOW_UDP} ${U_ENABLE_ENTRIES_REMOTE_PROXY:=$INSTANCES_DEF_ENABLE_BLLIST_PROXY} ${U_ENABLE_FPROXY:=$INSTANCES_DEF_ENABLE_FPROXY} "\"$U_VPN_GW_IP\"" NftInstanceAdd "\"$U_NAME\"" $_pkts_mark ${U_PROXY_MODE:=$INSTANCES_DEF_PROXY_MODE} ${U_TOR_TRANS_PORT:=$INSTANCES_DEF_TOR_TRANS_PORT} $_route_table_id "\"${U_IF_VPN:=$INSTANCES_DEF_IF_VPN}\"" ${U_T_PROXY_TYPE:=$INSTANCES_DEF_T_PROXY_TYPE} ${U_T_PROXY_PORT_TCP:=$INSTANCES_DEF_T_PROXY_PORT_TCP} ${U_T_PROXY_PORT_UDP:=$INSTANCES_DEF_T_PROXY_PORT_UDP} ${U_T_PROXY_ALLOW_UDP:=$INSTANCES_DEF_T_PROXY_ALLOW_UDP} ${U_ENABLE_ENTRIES_REMOTE_PROXY:=$INSTANCES_DEF_ENABLE_BLLIST_PROXY} ${U_ENABLE_FPROXY:=$INSTANCES_DEF_ENABLE_FPROXY} "\"$U_VPN_GW_IP\""
@@ -623,7 +625,7 @@ DeleteUserInstancesNftRules() {
} }
AddNftRules() { AddNftRules() {
local _chain_prio_first _chain_prio_local _chain_prio_fproxy _chain_prio_action _route_table_id=0 local _chain_prio_first _chain_prio_local _chain_prio_fproxy _chain_prio_action _route_table_id
_chain_prio_first=$NFT_PRIO _chain_prio_first=$NFT_PRIO
_chain_prio_local=$NFT_PRIO_LOCAL _chain_prio_local=$NFT_PRIO_LOCAL
_chain_prio_fproxy=$(($NFT_PRIO + 1)) _chain_prio_fproxy=$(($NFT_PRIO + 1))
@@ -632,6 +634,8 @@ AddNftRules() {
_route_table_id=$VPN_ROUTE_TABLE_ID_START _route_table_id=$VPN_ROUTE_TABLE_ID_START
elif [ "$PROXY_MODE" = "3" -a "$T_PROXY_TYPE" = "1" ]; then elif [ "$PROXY_MODE" = "3" -a "$T_PROXY_TYPE" = "1" ]; then
_route_table_id=$TPROXY_ROUTE_TABLE_ID_START _route_table_id=$TPROXY_ROUTE_TABLE_ID_START
else
_route_table_id=0
fi fi
NftAddBaseChains $_chain_prio_first $_chain_prio_local $_chain_prio_fproxy NftAddBaseChains $_chain_prio_first $_chain_prio_local $_chain_prio_fproxy
NftAddActionChains $_chain_prio_action NftAddActionChains $_chain_prio_action