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

Compare commits

base: drygdryg:5b51716523d2fd7bab57874bf9a28f04bf494ad0
Branches Tags
drygdryg:master
drygdryg:v69.3
drygdryg:v69.2
drygdryg:v69.1
drygdryg:v69
drygdryg:v68
drygdryg:v67
drygdryg:v66
drygdryg:v65
drygdryg:v64
..
compare: drygdryg:9ed07a252d955c8a1ba73420c5c7241f4c1e22ee
Branches Tags
drygdryg:master
drygdryg:v69.3
drygdryg:v69.2
drygdryg:v69.1
drygdryg:v69
drygdryg:v68
drygdryg:v67
drygdryg:v66
drygdryg:v65
drygdryg:v64

No commits in common. "5b51716523d2fd7bab57874bf9a28f04bf494ad0" and "9ed07a252d955c8a1ba73420c5c7241f4c1e22ee" have entirely different histories.
5b51716523 ... 9ed07a252d

10 changed files with 24 additions and 42 deletions
Show Stats Expand all files Collapse all files

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

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

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

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

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

@ -6,20 +6,17 @@ zapret_custom_daemons()
{ {
# stop logic is managed by procd # stop logic is managed by procd
local MODE_OVERRIDE=$OVERRIDE MODE_OVERRIDE=$OVERRIDE start_daemons_procd
start_daemons_procd
} }
zapret_custom_firewall() zapret_custom_firewall()
{ {
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
local MODE_OVERRIDE=$OVERRIDE MODE_OVERRIDE=$OVERRIDE zapret_do_firewall_rules_ipt $1
zapret_do_firewall_rules_ipt $1
} }
zapret_custom_firewall_nft() zapret_custom_firewall_nft()
{ {
# stop logic is not required # stop logic is not required
local MODE_OVERRIDE=$OVERRIDE MODE_OVERRIDE=$OVERRIDE zapret_apply_firewall_rules_nft
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:3" local first_packets_only="$ipt_connbytes 1:1"
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-3" local first_packets_only="$nft_connbytes 1"
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,20 +6,17 @@ zapret_custom_daemons()
{ {
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
local MODE_OVERRIDE=$OVERRIDE MODE_OVERRIDE=$OVERRIDE zapret_do_daemons $1
zapret_do_daemons $1
} }
zapret_custom_firewall() zapret_custom_firewall()
{ {
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
local MODE_OVERRIDE=$OVERRIDE MODE_OVERRIDE=$OVERRIDE zapret_do_firewall_rules_ipt $1
zapret_do_firewall_rules_ipt $1
} }
zapret_custom_firewall_nft() zapret_custom_firewall_nft()
{ {
# stop logic is not required # stop logic is not required
local MODE_OVERRIDE=$OVERRIDE MODE_OVERRIDE=$OVERRIDE zapret_apply_firewall_rules_nft
zapret_apply_firewall_rules_nft
} }

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

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

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

@ -6,20 +6,17 @@ zapret_custom_daemons()
{ {
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
local MODE_OVERRIDE=$OVERRIDE MODE_OVERRIDE=$OVERRIDE zapret_do_daemons $1
zapret_do_daemons $1
} }
zapret_custom_firewall() zapret_custom_firewall()
{ {
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
local MODE_OVERRIDE=$OVERRIDE MODE_OVERRIDE=$OVERRIDE zapret_do_firewall_rules_ipt $1
zapret_do_firewall_rules_ipt $1
} }
zapret_custom_firewall_nft() zapret_custom_firewall_nft()
{ {
# stop logic is not required # stop logic is not required
local MODE_OVERRIDE=$OVERRIDE MODE_OVERRIDE=$OVERRIDE zapret_apply_firewall_rules_nft
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:3" local first_packets_only="$ipt_connbytes 1:1"
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-3" local first_packets_only="$nft_connbytes 1"
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