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

mwan3: fix sticky chain length

Browse source 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert 2022-03-28 14:02:18 +02:00
parent 33927a51c8
commit 87c611abf8
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/mwan3/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mwan3 PKG_NAME:=mwan3
PKG_VERSION:=2.11.0 PKG_VERSION:=2.11.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>, \ PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>, \
Aaron Goodman <aaronjg@alumni.stanford.edu> Aaron Goodman <aaronjg@alumni.stanford.edu>

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

@ -562,7 +562,7 @@ mwan3_delete_iface_ipset_entries()
[ -n "$id" ] || return 0 [ -n "$id" ] || return 0
for setname in $(ipset -n list | grep ^mwan3_sticky_); do for setname in $(ipset -n list | grep ^mwan3_rule_); do
for entry in $(ipset list "$setname" | grep "$(mwan3_id2mask id MMX_MASK | awk '{ printf "0x%08x", $1; }')" | cut -d ' ' -f 1); do for entry in $(ipset list "$setname" | grep "$(mwan3_id2mask id MMX_MASK | awk '{ printf "0x%08x", $1; }')" | cut -d ' ' -f 1); do
$IPS del "$setname" $entry || $IPS del "$setname" $entry ||
LOG notice "failed to delete $entry from $setname" LOG notice "failed to delete $entry from $setname"
@ -750,7 +750,7 @@ mwan3_set_sticky_iptables()
if [ -z "${current##*-N mwan3_iface_in_${iface}$'\n'*}" ]; then if [ -z "${current##*-N mwan3_iface_in_${iface}$'\n'*}" ]; then
mwan3_push_update -I "mwan3_rule_$rule" \ mwan3_push_update -I "mwan3_rule_$rule" \
-m mark --mark "$(mwan3_id2mask id MMX_MASK)/$MMX_MASK" \ -m mark --mark "$(mwan3_id2mask id MMX_MASK)/$MMX_MASK" \
-m set ! --match-set "mwan3_sticky_${ipv}_${rule}" src,src \ -m set ! --match-set "mwan3_rule_${ipv}_${rule}" src,src \
-j MARK --set-xmark "0x0/$MMX_MASK" -j MARK --set-xmark "0x0/$MMX_MASK"
mwan3_push_update -I "mwan3_rule_$rule" \ mwan3_push_update -I "mwan3_rule_$rule" \
-m mark --mark "0/$MMX_MASK" \ -m mark --mark "0/$MMX_MASK" \
@ -769,12 +769,12 @@ mwan3_set_sticky_ipset()
local error local error
local update="" local update=""
mwan3_push_update -! create "mwan3_sticky_ipv4_$rule" \ mwan3_push_update -! create "mwan3_rule_ipv4_$rule" \
hash:ip,mark markmask "$mmx" \ hash:ip,mark markmask "$mmx" \
timeout "$timeout" timeout "$timeout"
[ $NO_IPV6 -eq 0 ] && [ $NO_IPV6 -eq 0 ] &&
mwan3_push_update -! create "mwan3_sticky_ipv6_$rule" \ mwan3_push_update -! create "mwan3_rule_ipv6_$rule" \
hash:ip,mark markmask "$mmx" \ hash:ip,mark markmask "$mmx" \
timeout "$timeout" family inet6 timeout "$timeout" family inet6
@ -887,10 +887,10 @@ mwan3_set_user_iptables_rule()
-j "$policy" -j "$policy"
mwan3_push_update -A "mwan3_rule_$1" \ mwan3_push_update -A "mwan3_rule_$1" \
-m mark ! --mark 0xfc00/0xfc00 \ -m mark ! --mark 0xfc00/0xfc00 \
-j SET --del-set "mwan3_sticky_${ipv}_${rule}" src,src -j SET --del-set "mwan3_rule_${ipv}_${rule}" src,src
mwan3_push_update -A "mwan3_rule_$1" \ mwan3_push_update -A "mwan3_rule_$1" \
-m mark ! --mark 0xfc00/0xfc00 \ -m mark ! --mark 0xfc00/0xfc00 \
-j SET --add-set "mwan3_sticky_${ipv}_${rule}" src,src -j SET --add-set "mwan3_rule_${ipv}_${rule}" src,src
policy="mwan3_rule_$1" policy="mwan3_rule_$1"
fi fi
if [ "$global_logging" = "1" ] && [ "$rule_logging" = "1" ]; then if [ "$global_logging" = "1" ] && [ "$rule_logging" = "1" ]; then