mirror of
https://github.com/gSpotx2f/ruantiblock_openwrt.git
synced 2026-05-14 06:30:59 +00:00
Minor fixes.
This commit is contained in:
@@ -588,17 +588,15 @@ 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
|
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
|
||||||
for _inst in $USER_INSTANCES_ALL_FNAMES
|
for _inst in $USER_INSTANCES_ALL_FNAMES
|
||||||
do
|
do
|
||||||
IncludeUserInstanceVars "$_inst"
|
IncludeUserInstanceVars "$_inst"
|
||||||
if [ "$U_PROXY_MODE" = "2" ]; then
|
if [ "$U_PROXY_MODE" = "2" ]; then
|
||||||
_vpn_route_table_id=$(($_vpn_route_table_id + 1))
|
_vpn_route_table_id=$(($_vpn_route_table_id + 1))
|
||||||
_route_table_id=$_vpn_route_table_id
|
_route_table_id=$_vpn_route_table_id
|
||||||
else
|
elif [ "$U_PROXY_MODE" = "3" -a "$U_T_PROXY_TYPE" = "1" ]; then
|
||||||
if [ "$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))
|
|
||||||
fi
|
|
||||||
_route_table_id=$_tproxy_route_table_id
|
_route_table_id=$_tproxy_route_table_id
|
||||||
fi
|
fi
|
||||||
_pkts_mark=$(($_pkts_mark + 1))
|
_pkts_mark=$(($_pkts_mark + 1))
|
||||||
@@ -625,12 +623,14 @@ DeleteUserInstancesNftRules() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AddNftRules() {
|
AddNftRules() {
|
||||||
local _chain_prio_first _chain_prio_local _chain_prio_fproxy _chain_prio_action _route_table_id=$VPN_ROUTE_TABLE_ID_START
|
local _chain_prio_first _chain_prio_local _chain_prio_fproxy _chain_prio_action _route_table_id=0
|
||||||
_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))
|
||||||
_chain_prio_action=$(($NFT_PRIO + 2))
|
_chain_prio_action=$(($NFT_PRIO + 2))
|
||||||
if [ "$PROXY_MODE" = "3" -a "$T_PROXY_TYPE" = "1" ]; then
|
if [ "$PROXY_MODE" = "2" ]; then
|
||||||
|
_route_table_id=$VPN_ROUTE_TABLE_ID_START
|
||||||
|
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
|
||||||
fi
|
fi
|
||||||
NftAddBaseChains $_chain_prio_first $_chain_prio_local $_chain_prio_fproxy
|
NftAddBaseChains $_chain_prio_first $_chain_prio_local $_chain_prio_fproxy
|
||||||
|
|||||||
Reference in New Issue
Block a user