drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-12-02 14:40:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

ipset: post-apply hook

Browse Source
This commit is contained in:
bol-van 2022-03-16 19:35:07 +03:00
parent 3bc41d62be
commit 9be1551f5d
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config
View File

@ -13,6 +13,8 @@ SET_MAXELEM=262144
# too low hashsize can cause memory allocation errors on low RAM systems , even if RAM is enough # too low hashsize can cause memory allocation errors on low RAM systems , even if RAM is enough
# too large hashsize will waste lots of RAM # too large hashsize will waste lots of RAM
IPSET_OPT="hashsize 262144 maxelem $SET_MAXELEM" IPSET_OPT="hashsize 262144 maxelem $SET_MAXELEM"
# create_ipset hook
#IPSET_POST_HOOK="/etc/zapret.ipset.hook"
# options for ip2net. "-4" or "-6" auto added by ipset create script # options for ip2net. "-4" or "-6" auto added by ipset create script
IP2NET_OPT4="--prefix-length=22-30 --v4-threshold=3/4" IP2NET_OPT4="--prefix-length=22-30 --v4-threshold=3/4"

17
ipset/create_ipset.sh
View File

@ -90,13 +90,14 @@ create_ipset()
FAMILY=inet FAMILY=inet
fi fi
ipset create $2 $3 $4 family $FAMILY 2>/dev/null || { ipset create $2 $3 $4 family $FAMILY 2>/dev/null || {
[ "$NO_UPDATE" = "1" ] && return [ "$NO_UPDATE" = "1" ] && return 0
} }
ipset flush $2 ipset flush $2
[ "$DO_CLEAR" = "1" ] || { [ "$DO_CLEAR" = "1" ] || {
for f in "$5" "$6" ; do for f in "$5" "$6" ; do
ipset_restore "$2" "$f" ipset_restore "$2" "$f"
done done
ipset_post_hook "$2"
} }
return 0 return 0
} }
@ -150,12 +151,12 @@ create_nfset()
local policy local policy
[ $SAVERAM = "1" ] && policy="policy memory;" [ $SAVERAM = "1" ] && policy="policy memory;"
nft_create_set $2 "type ipv${1}_addr; size $3; flags interval; auto-merge; $policy" || { nft_create_set $2 "type ipv${1}_addr; size $3; flags interval; auto-merge; $policy" || {
[ "$NO_UPDATE" = "1" ] && return [ "$NO_UPDATE" = "1" ] && return 0
nft flush set inet $ZAPRET_NFT_TABLE $2 nft flush set inet $ZAPRET_NFT_TABLE $2
} }
[ "$DO_CLEAR" = "1" ] || { [ "$DO_CLEAR" = "1" ] || {
nfset_restore $2 $4 $5 nfset_restore $2 $4 $5
return ipset_post_hook "$2"
} }
return 0 return 0
} }
@ -180,7 +181,7 @@ create_ipfw_table()
local name=$1 local name=$1
ipfw table "$name" create $2 2>/dev/null || { ipfw table "$name" create $2 2>/dev/null || {
[ "$NO_UPDATE" = "1" ] && return [ "$NO_UPDATE" = "1" ] && return 0
} }
ipfw -q table $1 flush ipfw -q table $1 flush
shift shift
@ -191,7 +192,9 @@ create_ipfw_table()
populate_ipfw_table $name "$1" populate_ipfw_table $name "$1"
shift shift
done done
ipset_post_hook $name
} }
return 0
} }
print_reloading_backend() print_reloading_backend()
@ -208,6 +211,11 @@ print_reloading_backend()
echo $s echo $s
} }
ipset_post_hook()
{
[ -n "$IPSET_POST_HOOK" ] && $IPSET_POST_HOOK "$1"
}
oom_adjust_high oom_adjust_high
get_fwtype get_fwtype
@ -219,6 +227,7 @@ if [ -n "$LISTS_RELOAD" ] ; then
else else
echo executing custom ip list reload command : $LISTS_RELOAD echo executing custom ip list reload command : $LISTS_RELOAD
$LISTS_RELOAD $LISTS_RELOAD
ipset_post_hook
fi fi
else else
case "$FWTYPE" in case "$FWTYPE" in