Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mwan3: use sticky ipset generation mwan3_push_update pattern

Browse source 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert 2022-02-25 16:02:49 +01:00
parent e985f0dcd1
commit 9c2abb19e2
1 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
net/mwan3/files/lib/mwan3/mwan3.sh
View file

@ -707,6 +707,33 @@ mwan3_set_sticky_iptables()
done done
} }
mwan3_set_sticky_ipset()
{
local rule="$1"
local mmx="$2"
local timeout="$3"
local error
local update=""
mwan3_push_update -! create "mwan3_sticky_v4_$rule" \
hash:ip,mark markmask "$mmx" \
timeout "$timeout"
[ $NO_IPV6 -eq 0 ] &&
mwan3_push_update -! create "mwan3_sticky_v6_$rule" \
hash:ip,mark markmask "$mmx" \
timeout "$timeout" family inet6
mwan3_push_update -! create "mwan3_sticky_$rule" list:set
mwan3_push_update -! add "mwan3_sticky_$rule" "mwan3_sticky_v4_$rule"
[ $NO_IPV6 -eq 0 ] &&
mwan3_push_update -! add "mwan3_sticky_$rule" "mwan3_sticky_v6_$rule"
error=$(echo "$update" | $IPS restore 2>&1) || LOG error "set_sticky_ipset_${rule}: $error"
}
mwan3_set_user_iptables_rule() mwan3_set_user_iptables_rule()
{ {
local ipset family proto policy src_ip src_port src_iface src_dev local ipset family proto policy src_ip src_port src_iface src_dev
@ -790,17 +817,7 @@ mwan3_set_user_iptables_rule()
rule_policy=1 rule_policy=1
policy="mwan3_policy_$use_policy" policy="mwan3_policy_$use_policy"
if [ "$sticky" -eq 1 ]; then if [ "$sticky" -eq 1 ]; then
$IPS -! create "mwan3_sticky_v4_$rule" \ mwan3_set_sticky_ipset "$rule" "$MMX_MASK" "$timeout"
hash:ip,mark markmask "$MMX_MASK" \
timeout "$timeout"
[ $NO_IPV6 -eq 0 ] &&
$IPS -! create "mwan3_sticky_v6_$rule" \
hash:ip,mark markmask "$MMX_MASK" \
timeout "$timeout" family inet6
$IPS -! create "mwan3_sticky_$rule" list:set
$IPS -! add "mwan3_sticky_$rule" "mwan3_sticky_v4_$rule"
[ $NO_IPV6 -eq 0 ] &&
$IPS -! add "mwan3_sticky_$rule" "mwan3_sticky_v6_$rule"
fi fi
fi fi