Mirror/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-12-20 06:28:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

init: reuse builtin mode in custom scripts

Browse Source
This commit is contained in:
bol-van
2022-02-23 22:39:49 +03:00
parent 09416dee64
commit 3a4bf75ce6
5 changed files with 138 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
common/nft.sh
View File

@@ -437,22 +437,10 @@ zapret_list_table()
return 0
}
zapret_apply_firewall_nft()
zapret_apply_firewall_rules_nft()
{
echo Applying nftables
local mode="${MODE_OVERRIDE:-$MODE}"
[ "$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
nft_create_firewall
nft_fill_ifsets_overload
case "$mode" in
tpws)
if [ ! "$MODE_HTTP" = "1" ] && [ ! "$MODE_HTTPS" = "1" ]; then
@@ -508,6 +496,25 @@ zapret_apply_firewall_nft()
existf zapret_custom_firewall_nft && zapret_custom_firewall_nft
;;
esac
}
zapret_apply_firewall_nft()
{
echo Applying nftables
local mode="${MODE_OVERRIDE:-$MODE}"
[ "$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
nft_create_firewall
nft_fill_ifsets_overload
zapret_apply_firewall_rules_nft
[ "$FLOWOFFLOAD" = 'software' -o "$FLOWOFFLOAD" = 'hardware' ] && nft_apply_flow_offloading