ForkMaster/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-01-06 08:20:34 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

move local var definitions

Browse Source
This commit is contained in:
bol-van 2022-03-04 19:06:26 +03:00
parent 7f5731c5d0
commit e484808b3f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/ipt.sh
View File

@ -248,6 +248,10 @@ zapret_do_firewall_rules_ipt()
{ {
local mode="${MODE_OVERRIDE:-$MODE}" local mode="${MODE_OVERRIDE:-$MODE}"
local first_packet_only="-m connbytes --connbytes-dir=original --connbytes-mode=packets --connbytes 1:4"
local desync="-m mark ! --mark $DESYNC_MARK/$DESYNC_MARK"
local f4 f6 qn qns qn6 qns6
case "$mode" in case "$mode" in
tpws) tpws)
if [ ! "$MODE_HTTP" = "1" ] && [ ! "$MODE_HTTPS" = "1" ]; then if [ ! "$MODE_HTTP" = "1" ] && [ ! "$MODE_HTTPS" = "1" ]; then
@ -320,10 +324,6 @@ zapret_do_firewall_ipt()
[ "$mode" = "tpws-socks" ] && return 0 [ "$mode" = "tpws-socks" ] && return 0
local first_packet_only="-m connbytes --connbytes-dir=original --connbytes-mode=packets --connbytes 1:4"
local desync="-m mark ! --mark $DESYNC_MARK/$DESYNC_MARK"
local f4 f6 qn qns qn6 qns6
# always create ipsets. ip_exclude ipset is required # always create ipsets. ip_exclude ipset is required
[ "$1" = 1 ] && create_ipset no-update [ "$1" = 1 ] && create_ipset no-update

10
common/nft.sh
View File

@ -441,6 +441,10 @@ zapret_apply_firewall_rules_nft()
{ {
local mode="${MODE_OVERRIDE:-$MODE}" local mode="${MODE_OVERRIDE:-$MODE}"
local first_packet_only="ct original packets 1-4"
local desync="mark and $DESYNC_MARK == 0"
local f4 f6 qn qns qn6 qns6
case "$mode" in case "$mode" in
tpws) tpws)
if [ ! "$MODE_HTTP" = "1" ] && [ ! "$MODE_HTTPS" = "1" ]; then if [ ! "$MODE_HTTP" = "1" ] && [ ! "$MODE_HTTPS" = "1" ]; then
@ -506,10 +510,6 @@ zapret_apply_firewall_nft()
[ "$mode" = "tpws-socks" ] && return 0 [ "$mode" = "tpws-socks" ] && return 0
local first_packet_only="ct original packets 1-4"
local desync="mark and $DESYNC_MARK == 0"
local f4 f6 qn qns qn6 qns6
create_ipset no-update create_ipset no-update
nft_create_firewall nft_create_firewall
nft_fill_ifsets_overload nft_fill_ifsets_overload
@ -537,6 +537,6 @@ zapret_do_firewall_nft()
else else
zapret_apply_firewall_nft zapret_apply_firewall_nft
fi fi
return 0 return 0
} }