drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-11-26 12:10:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bol-van:master' into tpws-minimal

Browse Source
This commit is contained in:
NewUse 2024-10-24 17:43:45 +03:00 committed by GitHub
commit 549e5dddeb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
init.d/openwrt/custom.d.examples/10-inherit-nfqws
View File

@ -6,17 +6,20 @@ zapret_custom_daemons()
{ {
# stop logic is managed by procd # stop logic is managed by procd
MODE_OVERRIDE=$OVERRIDE start_daemons_procd local MODE_OVERRIDE=$OVERRIDE
start_daemons_procd
} }
zapret_custom_firewall() zapret_custom_firewall()
{ {
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
MODE_OVERRIDE=$OVERRIDE zapret_do_firewall_rules_ipt $1 local MODE_OVERRIDE=$OVERRIDE
zapret_do_firewall_rules_ipt $1
} }
zapret_custom_firewall_nft() zapret_custom_firewall_nft()
{ {
# stop logic is not required # stop logic is not required
MODE_OVERRIDE=$OVERRIDE zapret_apply_firewall_rules_nft local MODE_OVERRIDE=$OVERRIDE
zapret_apply_firewall_rules_nft
} }

9
init.d/openwrt/custom.d.examples/10-inherit-tpws
View File

@ -6,17 +6,20 @@ zapret_custom_daemons()
{ {
# stop logic is managed by procd # stop logic is managed by procd
MODE_OVERRIDE=$OVERRIDE start_daemons_procd local MODE_OVERRIDE=$OVERRIDE
start_daemons_procd
} }
zapret_custom_firewall() zapret_custom_firewall()
{ {
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
MODE_OVERRIDE=$OVERRIDE zapret_do_firewall_rules_ipt $1 local MODE_OVERRIDE=$OVERRIDE
zapret_do_firewall_rules_ipt $1
} }
zapret_custom_firewall_nft() zapret_custom_firewall_nft()
{ {
# stop logic is not required # stop logic is not required
MODE_OVERRIDE=$OVERRIDE zapret_apply_firewall_rules_nft local MODE_OVERRIDE=$OVERRIDE
zapret_apply_firewall_rules_nft
} }

9
init.d/openwrt/custom.d.examples/10-inherit-tpws-socks
View File

@ -6,17 +6,20 @@ zapret_custom_daemons()
{ {
# stop logic is managed by procd # stop logic is managed by procd
MODE_OVERRIDE=$OVERRIDE start_daemons_procd local MODE_OVERRIDE=$OVERRIDE
start_daemons_procd
} }
zapret_custom_firewall() zapret_custom_firewall()
{ {
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
MODE_OVERRIDE=$OVERRIDE zapret_do_firewall_rules_ipt $1 local MODE_OVERRIDE=$OVERRIDE
zapret_do_firewall_rules_ipt $1
} }
zapret_custom_firewall_nft() zapret_custom_firewall_nft()
{ {
# stop logic is not required # stop logic is not required
MODE_OVERRIDE=$OVERRIDE zapret_apply_firewall_rules_nft local MODE_OVERRIDE=$OVERRIDE
zapret_apply_firewall_rules_nft
} }

2
init.d/openwrt/custom.d.examples/10-inherit-tpws4http-nfqws4https
View File

@ -5,7 +5,7 @@ nfqws_tpws_inheritor()
{ {
# $1 - inherited function # $1 - inherited function
# $2 - 1 - run, 0 - stop # $2 - 1 - run, 0 - stop
local MODE_OVERRIDE
[ "$MODE_HTTP" = "1" ] && { [ "$MODE_HTTP" = "1" ] && {
MODE_OVERRIDE=tpws MODE_HTTPS=0 MODE_QUIC=0 $1 $2 MODE_OVERRIDE=tpws MODE_HTTPS=0 MODE_QUIC=0 $1 $2
} }

4
init.d/openwrt/custom.d.examples/50-discord
View File

@ -23,7 +23,7 @@ zapret_custom_firewall()
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
local f local f
local first_packets_only="$ipt_connbytes 1:1" local first_packets_only="$ipt_connbytes 1:3"
local desync="-m mark ! --mark $DESYNC_MARK/$DESYNC_MARK" local desync="-m mark ! --mark $DESYNC_MARK/$DESYNC_MARK"
local DISCORD_PORTS_IPT=$(replace_char - : $DISCORD_PORTS) local DISCORD_PORTS_IPT=$(replace_char - : $DISCORD_PORTS)
local dest_set="-m set --match-set $DISCORD_SET_NAME dst" local dest_set="-m set --match-set $DISCORD_SET_NAME dst"
@ -52,7 +52,7 @@ zapret_custom_firewall_nft()
# stop logic is not required # stop logic is not required
local f local f
local first_packets_only="$nft_connbytes 1" local first_packets_only="$nft_connbytes 1-3"
local desync="mark and $DESYNC_MARK == 0" local desync="mark and $DESYNC_MARK == 0"
local dest_set="ip daddr @$DISCORD_SET_NAME" local dest_set="ip daddr @$DISCORD_SET_NAME"
local subnets local subnets

9
init.d/sysv/custom.d.examples/10-inherit-nfqws
View File

@ -6,17 +6,20 @@ zapret_custom_daemons()
{ {
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
MODE_OVERRIDE=$OVERRIDE zapret_do_daemons $1 local MODE_OVERRIDE=$OVERRIDE
zapret_do_daemons $1
} }
zapret_custom_firewall() zapret_custom_firewall()
{ {
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
MODE_OVERRIDE=$OVERRIDE zapret_do_firewall_rules_ipt $1 local MODE_OVERRIDE=$OVERRIDE
zapret_do_firewall_rules_ipt $1
} }
zapret_custom_firewall_nft() zapret_custom_firewall_nft()
{ {
# stop logic is not required # stop logic is not required
MODE_OVERRIDE=$OVERRIDE zapret_apply_firewall_rules_nft local MODE_OVERRIDE=$OVERRIDE
zapret_apply_firewall_rules_nft
} }

9
init.d/sysv/custom.d.examples/10-inherit-tpws
View File

@ -6,17 +6,20 @@ zapret_custom_daemons()
{ {
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
MODE_OVERRIDE=$OVERRIDE zapret_do_daemons $1 local MODE_OVERRIDE=$OVERRIDE
zapret_do_daemons $1
} }
zapret_custom_firewall() zapret_custom_firewall()
{ {
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
MODE_OVERRIDE=$OVERRIDE zapret_do_firewall_rules_ipt $1 local MODE_OVERRIDE=$OVERRIDE
zapret_do_firewall_rules_ipt $1
} }
zapret_custom_firewall_nft() zapret_custom_firewall_nft()
{ {
# stop logic is not required # stop logic is not required
MODE_OVERRIDE=$OVERRIDE zapret_apply_firewall_rules_nft local MODE_OVERRIDE=$OVERRIDE
zapret_apply_firewall_rules_nft
} }

9
init.d/sysv/custom.d.examples/10-inherit-tpws-socks
View File

@ -6,17 +6,20 @@ zapret_custom_daemons()
{ {
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
MODE_OVERRIDE=$OVERRIDE zapret_do_daemons $1 local MODE_OVERRIDE=$OVERRIDE
zapret_do_daemons $1
} }
zapret_custom_firewall() zapret_custom_firewall()
{ {
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
MODE_OVERRIDE=$OVERRIDE zapret_do_firewall_rules_ipt $1 local MODE_OVERRIDE=$OVERRIDE
zapret_do_firewall_rules_ipt $1
} }
zapret_custom_firewall_nft() zapret_custom_firewall_nft()
{ {
# stop logic is not required # stop logic is not required
MODE_OVERRIDE=$OVERRIDE zapret_apply_firewall_rules_nft local MODE_OVERRIDE=$OVERRIDE
zapret_apply_firewall_rules_nft
} }

2
init.d/sysv/custom.d.examples/10-inherit-tpws4http-nfqws4https
View File

@ -5,7 +5,7 @@ nfqws_tpws_inheritor()
{ {
# $1 - inherited function # $1 - inherited function
# $2 - 1 - run, 0 - stop # $2 - 1 - run, 0 - stop
local MODE_OVERRIDE
[ "$MODE_HTTP" = "1" ] && { [ "$MODE_HTTP" = "1" ] && {
MODE_OVERRIDE=tpws MODE_HTTPS=0 MODE_QUIC=0 $1 $2 MODE_OVERRIDE=tpws MODE_HTTPS=0 MODE_QUIC=0 $1 $2
} }

4
init.d/sysv/custom.d.examples/50-discord
View File

@ -23,7 +23,7 @@ zapret_custom_firewall()
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
local f local f
local first_packets_only="$ipt_connbytes 1:1" local first_packets_only="$ipt_connbytes 1:3"
local desync="-m mark ! --mark $DESYNC_MARK/$DESYNC_MARK" local desync="-m mark ! --mark $DESYNC_MARK/$DESYNC_MARK"
local DISCORD_PORTS_IPT=$(replace_char - : $DISCORD_PORTS) local DISCORD_PORTS_IPT=$(replace_char - : $DISCORD_PORTS)
local dest_set="-m set --match-set $DISCORD_SET_NAME dst" local dest_set="-m set --match-set $DISCORD_SET_NAME dst"
@ -52,7 +52,7 @@ zapret_custom_firewall_nft()
# stop logic is not required # stop logic is not required
local f local f
local first_packets_only="$nft_connbytes 1" local first_packets_only="$nft_connbytes 1-3"
local desync="mark and $DESYNC_MARK == 0" local desync="mark and $DESYNC_MARK == 0"
local dest_set="ip daddr @$DISCORD_SET_NAME" local dest_set="ip daddr @$DISCORD_SET_NAME"
local subnets local subnets