From a99c7a3b618f637beb2160deb6329108f8231211 Mon Sep 17 00:00:00 2001 From: Kai Fabian Date: Sat, 19 Nov 2022 01:28:44 +0100 Subject: [PATCH] net/mwan3: add support for src ipsets in mwan3 rules --- net/mwan3/files/lib/mwan3/mwan3.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/mwan3/files/lib/mwan3/mwan3.sh b/net/mwan3/files/lib/mwan3/mwan3.sh index 1bfb767e86..7aae392f46 100644 --- a/net/mwan3/files/lib/mwan3/mwan3.sh +++ b/net/mwan3/files/lib/mwan3/mwan3.sh @@ -829,6 +829,7 @@ mwan3_set_user_iptables_rule() [ -z "$dest_ip" ] && unset dest_ip [ -z "$src_ip" ] && unset src_ip [ -z "$ipset" ] && unset ipset + [ -z "$ipset_src" ] && unset ipset_src [ -z "$src_port" ] && unset src_port [ -z "$dest_port" ] && unset dest_port if [ "$proto" != 'tcp' ] && [ "$proto" != 'udp' ]; then @@ -851,6 +852,10 @@ mwan3_set_user_iptables_rule() ipset="-m set --match-set $ipset dst" fi + if [ -n "$ipset_src" ]; then + ipset_src="-m set --match-set $ipset_src src" + fi + if [ -z "$use_policy" ]; then return fi @@ -899,7 +904,7 @@ mwan3_set_user_iptables_rule() ${src_ip:+-s} $src_ip \ ${src_dev:+-i} $src_dev \ ${dest_ip:+-d} $dest_ip \ - $ipset \ + $ipset $ipset_src \ ${src_port:+-m} ${src_port:+multiport} ${src_port:+--sports} $src_port \ ${dest_port:+-m} ${dest_port:+multiport} ${dest_port:+--dports} $dest_port \ -m mark --mark 0/$MMX_MASK \ @@ -912,7 +917,7 @@ mwan3_set_user_iptables_rule() ${src_ip:+-s} $src_ip \ ${src_dev:+-i} $src_dev \ ${dest_ip:+-d} $dest_ip \ - $ipset \ + $ipset $ipset_src \ ${src_port:+-m} ${src_port:+multiport} ${src_port:+--sports} $src_port \ ${dest_port:+-m} ${dest_port:+multiport} ${dest_port:+--dports} $dest_port \ -m mark --mark 0/$MMX_MASK \