mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

Merge pull request #12810 from TDT-AG/pr/20200714-mwan3 

mwan3: fix some shellcheck warnings
This commit is contained in:
Florian Eckert 2020-07-15 11:07:41 +02:00 committed by GitHub
parent 356fa3486f 2594258c4b
commit 335efed8cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 184 additions and 200 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.8.8 PKG_VERSION:=2.8.9
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de> PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

382
net/mwan3/files/lib/mwan3/mwan3.sh
View File

@ -46,7 +46,7 @@ mwan3_rtmon_ipv4()
idx=$((idx+1)) idx=$((idx+1))
tid=$idx tid=$idx
[ "$(uci get mwan3.@interface[$((idx-1))].family)" = "ipv4" ] && { [ "$(uci get mwan3.@interface[$((idx-1))].family)" = "ipv4" ] && {
tbl=$($IP4 route list table $tid) tbl=$($IP4 route list table $tid 2>/dev/null)
if echo "$tbl" | grep -q ^default; then if echo "$tbl" | grep -q ^default; then
(echo "$tbl" | grep -v "^default\|linkdown" | sort -n; echo empty fixup) >/tmp/mwan3rtmon/ipv4.$tid (echo "$tbl" | grep -v "^default\|linkdown" | sort -n; echo empty fixup) >/tmp/mwan3rtmon/ipv4.$tid
cat /tmp/mwan3rtmon/ipv4.$tid | grep -v -x -F -f /tmp/mwan3rtmon/ipv4.main | while read line; do cat /tmp/mwan3rtmon/ipv4.$tid | grep -v -x -F -f /tmp/mwan3rtmon/ipv4.main | while read line; do
@ -79,7 +79,7 @@ mwan3_rtmon_ipv6()
idx=$((idx+1)) idx=$((idx+1))
tid=$idx tid=$idx
[ "$(uci get mwan3.@interface[$((idx-1))].family)" = "ipv6" ] && { [ "$(uci get mwan3.@interface[$((idx-1))].family)" = "ipv6" ] && {
tbl=$($IP6 route list table $tid) tbl=$($IP6 route list table $tid 2>/dev/null)
if echo "$tbl" | grep -q "^default\|^::/0"; then if echo "$tbl" | grep -q "^default\|^::/0"; then
(echo "$tbl" | grep -v "^default\|^::/0\|^unreachable" | sort -n; echo empty fixup) >/tmp/mwan3rtmon/ipv6.$tid (echo "$tbl" | grep -v "^default\|^::/0\|^unreachable" | sort -n; echo empty fixup) >/tmp/mwan3rtmon/ipv6.$tid
cat /tmp/mwan3rtmon/ipv6.$tid | grep -v -x -F -f /tmp/mwan3rtmon/ipv6.main | while read line; do cat /tmp/mwan3rtmon/ipv6.$tid | grep -v -x -F -f /tmp/mwan3rtmon/ipv6.main | while read line; do
@ -192,7 +192,7 @@ mwan3_get_iface_id()
mwan3_get_id() mwan3_get_id()
{ {
let _iface_count++ let _iface_count++
[ "$1" == "$_iface" ] && _tmp=$_iface_count [ "$1" = "$_iface" ] && _tmp=$_iface_count
} }
config_foreach mwan3_get_id interface config_foreach mwan3_get_id interface
export "$1=$_tmp" export "$1=$_tmp"
@ -204,7 +204,7 @@ mwan3_set_custom_ipset_v4()
for custom_network_v4 in $($IP4 route list table "$1" | awk '{print $1}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do for custom_network_v4 in $($IP4 route list table "$1" | awk '{print $1}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do
$LOG notice "Adding network $custom_network_v4 from table $1 to mwan3_custom_v4 ipset" $LOG notice "Adding network $custom_network_v4 from table $1 to mwan3_custom_v4 ipset"
$IPS -! add mwan3_custom_v4_temp $custom_network_v4 $IPS -! add mwan3_custom_v4_temp "$custom_network_v4"
done done
} }
@ -214,7 +214,7 @@ mwan3_set_custom_ipset_v6()
for custom_network_v6 in $($IP6 route list table "$1" | awk '{print $1}' | egrep "$IPv6_REGEX"); do for custom_network_v6 in $($IP6 route list table "$1" | awk '{print $1}' | egrep "$IPv6_REGEX"); do
$LOG notice "Adding network $custom_network_v6 from table $1 to mwan3_custom_v6 ipset" $LOG notice "Adding network $custom_network_v6 from table $1 to mwan3_custom_v6 ipset"
$IPS -! add mwan3_custom_v6_temp $custom_network_v6 $IPS -! add mwan3_custom_v6_temp "$custom_network_v6"
done done
} }
@ -246,11 +246,11 @@ mwan3_set_connected_iptables()
$IPS create mwan3_connected_v4_temp hash:net $IPS create mwan3_connected_v4_temp hash:net
for connected_network_v4 in $($IP4 route | awk '{print $1}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do for connected_network_v4 in $($IP4 route | awk '{print $1}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do
$IPS -! add mwan3_connected_v4_temp $connected_network_v4 $IPS -! add mwan3_connected_v4_temp "$connected_network_v4"
done done
for connected_network_v4 in $($IP4 route list table 0 | awk '{print $2}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do for connected_network_v4 in $($IP4 route list table 0 | awk '{print $2}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do
$IPS -! add mwan3_connected_v4_temp $connected_network_v4 $IPS -! add mwan3_connected_v4_temp "$connected_network_v4"
done done
$IPS add mwan3_connected_v4_temp 224.0.0.0/3 $IPS add mwan3_connected_v4_temp 224.0.0.0/3
@ -262,7 +262,7 @@ mwan3_set_connected_iptables()
$IPS create mwan3_connected_v6_temp hash:net family inet6 $IPS create mwan3_connected_v6_temp hash:net family inet6
for connected_network_v6 in $($IP6 route | awk '{print $1}' | egrep "$IPv6_REGEX"); do for connected_network_v6 in $($IP6 route | awk '{print $1}' | egrep "$IPv6_REGEX"); do
$IPS -! add mwan3_connected_v6_temp $connected_network_v6 $IPS -! add mwan3_connected_v6_temp "$connected_network_v6"
done done
$IPS swap mwan3_connected_v6_temp mwan3_connected_v6 $IPS swap mwan3_connected_v6_temp mwan3_connected_v6
@ -275,7 +275,7 @@ mwan3_set_connected_iptables()
$IPS -! create mwan3_source_v6 hash:net family inet6 $IPS -! create mwan3_source_v6 hash:net family inet6
$IPS create mwan3_source_v6_temp hash:net family inet6 $IPS create mwan3_source_v6_temp hash:net family inet6
for source_network_v6 in $($IP6 addr ls | sed -ne 's/ *inet6 \([^ \/]*\).* scope global.*/\1/p'); do for source_network_v6 in $($IP6 addr ls | sed -ne 's/ *inet6 \([^ \/]*\).* scope global.*/\1/p'); do
$IPS -! add mwan3_source_v6_temp $source_network_v6 $IPS -! add mwan3_source_v6_temp "$source_network_v6"
done done
$IPS swap mwan3_source_v6_temp mwan3_source_v6 $IPS swap mwan3_source_v6_temp mwan3_source_v6
$IPS destroy mwan3_source_v6_temp $IPS destroy mwan3_source_v6_temp
@ -360,7 +360,7 @@ mwan3_set_general_iptables()
fi fi
$IPT -A mwan3_hook \ $IPT -A mwan3_hook \
-j CONNMARK --restore-mark --nfmask $MMX_MASK --ctmask $MMX_MASK -j CONNMARK --restore-mark --nfmask "$MMX_MASK" --ctmask "$MMX_MASK"
$IPT -A mwan3_hook \ $IPT -A mwan3_hook \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-j mwan3_ifaces_in -j mwan3_ifaces_in
@ -371,7 +371,7 @@ mwan3_set_general_iptables()
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-j mwan3_rules -j mwan3_rules
$IPT -A mwan3_hook \ $IPT -A mwan3_hook \
-j CONNMARK --save-mark --nfmask $MMX_MASK --ctmask $MMX_MASK -j CONNMARK --save-mark --nfmask "$MMX_MASK" --ctmask "$MMX_MASK"
$IPT -A mwan3_hook \ $IPT -A mwan3_hook \
-m mark ! --mark $MMX_DEFAULT/$MMX_MASK \ -m mark ! --mark $MMX_DEFAULT/$MMX_MASK \
-j mwan3_connected -j mwan3_connected
@ -391,148 +391,136 @@ mwan3_create_iface_iptables()
{ {
local id family local id family
config_get family $1 family ipv4 config_get family "$1" family ipv4
mwan3_get_iface_id id $1 mwan3_get_iface_id id "$1"
[ -n "$id" ] || return 0 [ -n "$id" ] || return 0
if [ "$family" == "ipv4" ]; then if [ "$family" = "ipv4" ]; then
$IPS -! create mwan3_connected list:set $IPS -! create mwan3_connected list:set
if ! $IPT4 -S mwan3_ifaces_in &> /dev/null; then if ! $IPT4 -S mwan3_ifaces_in &> /dev/null; then
$IPT4 -N mwan3_ifaces_in $IPT4 -N mwan3_ifaces_in
fi fi
if ! $IPT4 -S mwan3_iface_in_$1 &> /dev/null; then if ! $IPT4 -S "mwan3_iface_in_$1" &> /dev/null; then
$IPT4 -N mwan3_iface_in_$1 $IPT4 -N "mwan3_iface_in_$1"
fi fi
$IPT4 -F mwan3_iface_in_$1 $IPT4 -F "mwan3_iface_in_$1"
$IPT4 -A mwan3_iface_in_$1 \ $IPT4 -A "mwan3_iface_in_$1" \
-i $2 \ -i "$2" \
-m set --match-set mwan3_connected src \ -m set --match-set mwan3_connected src \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-m comment --comment "default" \ -m comment --comment "default" \
-j MARK --set-xmark $MMX_DEFAULT/$MMX_MASK -j MARK --set-xmark $MMX_DEFAULT/$MMX_MASK
$IPT4 -A mwan3_iface_in_$1 \ $IPT4 -A "mwan3_iface_in_$1" \
-i $2 \ -i "$2" \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-m comment --comment "$1" \ -m comment --comment "$1" \
-j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK -j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK
$IPT4 -D mwan3_ifaces_in \ $IPT4 -D mwan3_ifaces_in \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-j mwan3_iface_in_$1 &> /dev/null -j "mwan3_iface_in_$1" &> /dev/null
$IPT4 -A mwan3_ifaces_in \ $IPT4 -A mwan3_ifaces_in \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-j mwan3_iface_in_$1 -j "mwan3_iface_in_$1"
fi fi
if [ "$family" == "ipv6" ]; then if [ "$family" = "ipv6" ]; then
$IPS -! create mwan3_connected_v6 hash:net family inet6 $IPS -! create mwan3_connected_v6 hash:net family inet6
if ! $IPT6 -S mwan3_ifaces_in &> /dev/null; then if ! $IPT6 -S mwan3_ifaces_in &> /dev/null; then
$IPT6 -N mwan3_ifaces_in $IPT6 -N mwan3_ifaces_in
fi fi
if ! $IPT6 -S mwan3_iface_in_$1 &> /dev/null; then if ! $IPT6 -S "mwan3_iface_in_$1" &> /dev/null; then
$IPT6 -N mwan3_iface_in_$1 $IPT6 -N "mwan3_iface_in_$1"
fi fi
$IPT6 -F mwan3_iface_in_$1 $IPT6 -F "mwan3_iface_in_$1"
$IPT6 -A mwan3_iface_in_$1 -i $2 \ $IPT6 -A "mwan3_iface_in_$1" -i "$2" \
-m set --match-set mwan3_connected_v6 src \ -m set --match-set mwan3_connected_v6 src \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-m comment --comment "default" \ -m comment --comment "default" \
-j MARK --set-xmark $MMX_DEFAULT/$MMX_MASK -j MARK --set-xmark $MMX_DEFAULT/$MMX_MASK
$IPT6 -A mwan3_iface_in_$1 -i $2 -m mark --mark 0x0/$MMX_MASK \ $IPT6 -A "mwan3_iface_in_$1" -i "$2" -m mark --mark 0x0/$MMX_MASK \
-m comment --comment "$1" \ -m comment --comment "$1" \
-j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK -j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK
$IPT6 -D mwan3_ifaces_in \ $IPT6 -D mwan3_ifaces_in \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-j mwan3_iface_in_$1 &> /dev/null -j "mwan3_iface_in_$1" &> /dev/null
$IPT6 -A mwan3_ifaces_in \ $IPT6 -A mwan3_ifaces_in \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-j mwan3_iface_in_$1 -j "mwan3_iface_in_$1"
fi fi
} }
mwan3_delete_iface_iptables() mwan3_delete_iface_iptables()
{ {
config_get family $1 family ipv4 config_get family "$1" family ipv4
if [ "$family" == "ipv4" ]; then if [ "$family" = "ipv4" ]; then
$IPT4 -D mwan3_ifaces_in \ $IPT4 -D mwan3_ifaces_in \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-j mwan3_iface_in_$1 &> /dev/null -j "mwan3_iface_in_$1" &> /dev/null
$IPT4 -F mwan3_iface_in_$1 &> /dev/null $IPT4 -F "mwan3_iface_in_$1" &> /dev/null
$IPT4 -X mwan3_iface_in_$1 &> /dev/null $IPT4 -X "mwan3_iface_in_$1" &> /dev/null
fi fi
if [ "$family" == "ipv6" ]; then if [ "$family" = "ipv6" ]; then
$IPT6 -D mwan3_ifaces_in \ $IPT6 -D mwan3_ifaces_in \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-j mwan3_iface_in_$1 &> /dev/null -j "mwan3_iface_in_$1" &> /dev/null
$IPT6 -F mwan3_iface_in_$1 &> /dev/null $IPT6 -F "mwan3_iface_in_$1" &> /dev/null
$IPT6 -X mwan3_iface_in_$1 &> /dev/null $IPT6 -X "mwan3_iface_in_$1" &> /dev/null
fi fi
} }
mwan3_create_iface_route() mwan3_create_iface_route()
{ {
local id route_args metric local id via metric
config_get family $1 family ipv4 config_get family "$1" family ipv4
mwan3_get_iface_id id $1 mwan3_get_iface_id id "$1"
[ -n "$id" ] || return 0 [ -n "$id" ] || return 0
if [ "$family" == "ipv4" ]; then if [ "$family" = "ipv4" ]; then
if ubus call network.interface.${1}_4 status &>/dev/null; then if ubus call "network.interface.${1}_4" status &>/dev/null; then
network_get_gateway route_args ${1}_4 network_get_gateway via "${1}_4"
else else
network_get_gateway route_args $1 network_get_gateway via "$1"
fi fi
if [ -n "$route_args" -a "$route_args" != "0.0.0.0" ]; then network_get_metric metric "$1"
route_args="via $route_args"
else
route_args=""
fi
network_get_metric metric $1 $IP4 route flush table "$id"
if [ -n "$metric" -a "$metric" != "0" ]; then $IP4 route add table "$id" default \
route_args="$route_args metric $metric" ${via:+via} $via \
fi ${metric:+metric} $metric \
dev "$2"
$IP4 route flush table $id
$IP4 route add table $id default $route_args dev $2
mwan3_rtmon_ipv4 mwan3_rtmon_ipv4
fi fi
if [ "$family" == "ipv6" ]; then if [ "$family" = "ipv6" ]; then
if ubus call network.interface.${1}_6 status &>/dev/null; then if ubus call "network.interface.${1}_6" status &>/dev/null; then
network_get_gateway6 route_args ${1}_6 network_get_gateway6 via "${1}_6"
else else
network_get_gateway6 route_args $1 network_get_gateway6 via "$1"
fi fi
if [ -n "$route_args" -a "$route_args" != "::" ]; then network_get_metric metric "$1"
route_args="via $route_args"
else
route_args=""
fi
network_get_metric metric $1 $IP6 route flush table "$id"
if [ -n "$metric" -a "$metric" != "0" ]; then $IP6 route add table "$id" default \
route_args="$route_args metric $metric" ${via:+via} $via \
fi ${metric:+metric} $metric \
dev "$2"
$IP6 route flush table $id
$IP6 route add table $id default $route_args dev $2
mwan3_rtmon_ipv6 mwan3_rtmon_ipv6
fi fi
} }
@ -541,17 +529,17 @@ mwan3_delete_iface_route()
{ {
local id local id
config_get family $1 family ipv4 config_get family "$1" family ipv4
mwan3_get_iface_id id $1 mwan3_get_iface_id id "$1"
[ -n "$id" ] || return 0 [ -n "$id" ] || return 0
if [ "$family" == "ipv4" ]; then if [ "$family" = "ipv4" ]; then
$IP4 route flush table $id $IP4 route flush table "$id"
fi fi
if [ "$family" == "ipv6" ]; then if [ "$family" = "ipv6" ]; then
$IP6 route flush table $id $IP6 route flush table "$id"
fi fi
} }
@ -559,12 +547,12 @@ mwan3_create_iface_rules()
{ {
local id family local id family
config_get family $1 family ipv4 config_get family "$1" family ipv4
mwan3_get_iface_id id $1 mwan3_get_iface_id id "$1"
[ -n "$id" ] || return 0 [ -n "$id" ] || return 0
if [ "$family" == "ipv4" ]; then if [ "$family" = "ipv4" ]; then
while [ -n "$($IP4 rule list | awk '$1 == "'$(($id+1000)):'"')" ]; do while [ -n "$($IP4 rule list | awk '$1 == "'$(($id+1000)):'"')" ]; do
$IP4 rule del pref $(($id+1000)) $IP4 rule del pref $(($id+1000))
@ -574,11 +562,11 @@ mwan3_create_iface_rules()
$IP4 rule del pref $(($id+2000)) $IP4 rule del pref $(($id+2000))
done done
$IP4 rule add pref $(($id+1000)) iif $2 lookup $id $IP4 rule add pref $(($id+1000)) iif "$2" lookup "$id"
$IP4 rule add pref $(($id+2000)) fwmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK lookup $id $IP4 rule add pref $(($id+2000)) fwmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK lookup "$id"
fi fi
if [ "$family" == "ipv6" ]; then if [ "$family" = "ipv6" ]; then
while [ -n "$($IP6 rule list | awk '$1 == "'$(($id+1000)):'"')" ]; do while [ -n "$($IP6 rule list | awk '$1 == "'$(($id+1000)):'"')" ]; do
$IP6 rule del pref $(($id+1000)) $IP6 rule del pref $(($id+1000))
@ -588,8 +576,8 @@ mwan3_create_iface_rules()
$IP6 rule del pref $(($id+2000)) $IP6 rule del pref $(($id+2000))
done done
$IP6 rule add pref $(($id+1000)) iif $2 lookup $id $IP6 rule add pref $(($id+1000)) iif "$2" lookup "$id"
$IP6 rule add pref $(($id+2000)) fwmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK lookup $id $IP6 rule add pref $(($id+2000)) fwmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK lookup "$id"
fi fi
} }
@ -597,12 +585,12 @@ mwan3_delete_iface_rules()
{ {
local id family local id family
config_get family $1 family ipv4 config_get family "$1" family ipv4
mwan3_get_iface_id id $1 mwan3_get_iface_id id "$1"
[ -n "$id" ] || return 0 [ -n "$id" ] || return 0
if [ "$family" == "ipv4" ]; then if [ "$family" = "ipv4" ]; then
while [ -n "$($IP4 rule list | awk '$1 == "'$(($id+1000)):'"')" ]; do while [ -n "$($IP4 rule list | awk '$1 == "'$(($id+1000)):'"')" ]; do
$IP4 rule del pref $(($id+1000)) $IP4 rule del pref $(($id+1000))
@ -613,7 +601,7 @@ mwan3_delete_iface_rules()
done done
fi fi
if [ "$family" == "ipv6" ]; then if [ "$family" = "ipv6" ]; then
while [ -n "$($IP6 rule list | awk '$1 == "'$(($id+1000)):'"')" ]; do while [ -n "$($IP6 rule list | awk '$1 == "'$(($id+1000)):'"')" ]; do
$IP6 rule del pref $(($id+1000)) $IP6 rule del pref $(($id+1000))
@ -629,13 +617,13 @@ mwan3_delete_iface_ipset_entries()
{ {
local id setname entry local id setname entry
mwan3_get_iface_id id $1 mwan3_get_iface_id id "$1"
[ -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_sticky_); do
for entry in $(ipset list $setname | grep "$(echo $(mwan3_id2mask id MMX_MASK) | awk '{ printf "0x%08x", $1; }')" | cut -d ' ' -f 1); do for entry in $(ipset list "$setname" | grep "$(echo $(mwan3_id2mask id MMX_MASK) | awk '{ printf "0x%08x", $1; }')" | cut -d ' ' -f 1); do
$IPS del $setname $entry $IPS del "$setname" $entry
done done
done done
} }
@ -658,7 +646,7 @@ mwan3_track()
{ {
track_ips="$track_ips $1" track_ips="$track_ips $1"
} }
config_list_foreach $1 track_ip mwan3_list_track_ips config_list_foreach "$1" track_ip mwan3_list_track_ips
for pid in $(pgrep -f "mwan3track $1 $2"); do for pid in $(pgrep -f "mwan3track $1 $2"); do
kill -TERM "$pid" > /dev/null 2>&1 kill -TERM "$pid" > /dev/null 2>&1
@ -684,28 +672,28 @@ mwan3_set_policy()
{ {
local iface_count id iface family metric probability weight device local iface_count id iface family metric probability weight device
config_get iface $1 interface config_get iface "$1" interface
config_get metric $1 metric 1 config_get metric "$1" metric 1
config_get weight $1 weight 1 config_get weight "$1" weight 1
[ -n "$iface" ] || return 0 [ -n "$iface" ] || return 0
network_get_device device $iface network_get_device device "$iface"
[ "$metric" -gt $DEFAULT_LOWEST_METRIC ] && $LOG warn "Member interface $iface has >$DEFAULT_LOWEST_METRIC metric. Not appending to policy" && return 0 [ "$metric" -gt $DEFAULT_LOWEST_METRIC ] && $LOG warn "Member interface $iface has >$DEFAULT_LOWEST_METRIC metric. Not appending to policy" && return 0
mwan3_get_iface_id id $iface mwan3_get_iface_id id "$iface"
[ -n "$id" ] || return 0 [ -n "$id" ] || return 0
config_get family $iface family ipv4 config_get family "$iface" family ipv4
if [ "$family" == "ipv4" ]; then if [ "$family" = "ipv4" ]; then
if [ "$(mwan3_get_iface_hotplug_state $iface)" = "online" ]; then if [ "$(mwan3_get_iface_hotplug_state "$iface")" = "online" ]; then
if [ "$metric" -lt "$lowest_metric_v4" ]; then if [ "$metric" -lt "$lowest_metric_v4" ]; then
total_weight_v4=$weight total_weight_v4=$weight
$IPT4 -F mwan3_policy_$policy $IPT4 -F "mwan3_policy_$policy"
$IPT4 -A mwan3_policy_$policy \ $IPT4 -A "mwan3_policy_$policy" \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-m comment --comment "$iface $weight $weight" \ -m comment --comment "$iface $weight $weight" \
-j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK -j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK
@ -729,16 +717,16 @@ mwan3_set_policy()
probability="-m statistic --mode random --probability $probability" probability="-m statistic --mode random --probability $probability"
$IPT4 -I mwan3_policy_$policy \ $IPT4 -I "mwan3_policy_$policy" \
-m mark --mark 0x0/$MMX_MASK $probability \ -m mark --mark 0x0/$MMX_MASK "$probability" \
-m comment --comment "$iface $weight $total_weight_v4" \ -m comment --comment "$iface $weight $total_weight_v4" \
-j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK -j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK
fi fi
else else
[ -n "$device" ] && { [ -n "$device" ] && {
$IPT4 -S mwan3_policy_$policy | grep -q '.*--comment ".* [0-9]* [0-9]*"' || \ $IPT4 -S "mwan3_policy_$policy" | grep -q '.*--comment ".* [0-9]* [0-9]*"' || \
$IPT4 -I mwan3_policy_$policy \ $IPT4 -I "mwan3_policy_$policy" \
-o $device \ -o "$device" \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-m comment --comment "out $iface $device" \ -m comment --comment "out $iface $device" \
-j MARK --set-xmark $MMX_DEFAULT/$MMX_MASK -j MARK --set-xmark $MMX_DEFAULT/$MMX_MASK
@ -746,14 +734,14 @@ mwan3_set_policy()
fi fi
fi fi
if [ "$family" == "ipv6" ]; then if [ "$family" = "ipv6" ]; then
if [ "$(mwan3_get_iface_hotplug_state $iface)" = "online" ]; then if [ "$(mwan3_get_iface_hotplug_state "$iface")" = "online" ]; then
if [ "$metric" -lt "$lowest_metric_v6" ]; then if [ "$metric" -lt "$lowest_metric_v6" ]; then
total_weight_v6=$weight total_weight_v6=$weight
$IPT6 -F mwan3_policy_$policy $IPT6 -F "mwan3_policy_$policy"
$IPT6 -A mwan3_policy_$policy \ $IPT6 -A "mwan3_policy_$policy" \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-m comment --comment "$iface $weight $weight" \ -m comment --comment "$iface $weight $weight" \
-j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK -j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK
@ -777,17 +765,17 @@ mwan3_set_policy()
probability="-m statistic --mode random --probability $probability" probability="-m statistic --mode random --probability $probability"
$IPT6 -I mwan3_policy_$policy \ $IPT6 -I "mwan3_policy_$policy" \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
$probability \ "$probability" \
-m comment --comment "$iface $weight $total_weight_v6" \ -m comment --comment "$iface $weight $total_weight_v6" \
-j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK -j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK
fi fi
else else
[ -n "$device" ] && { [ -n "$device" ] && {
$IPT6 -S mwan3_policy_$policy | grep -q '.*--comment ".* [0-9]* [0-9]*"' || \ $IPT6 -S "mwan3_policy_$policy" | grep -q '.*--comment ".* [0-9]* [0-9]*"' || \
$IPT6 -I mwan3_policy_$policy \ $IPT6 -I "mwan3_policy_$policy" \
-o $device \ -o "$device" \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-m comment --comment "out $iface $device" \ -m comment --comment "out $iface $device" \
-j MARK --set-xmark $MMX_DEFAULT/$MMX_MASK -j MARK --set-xmark $MMX_DEFAULT/$MMX_MASK
@ -802,35 +790,35 @@ mwan3_create_policies_iptables()
policy="$1" policy="$1"
config_get last_resort $1 last_resort unreachable config_get last_resort "$1" last_resort unreachable
if [ "$1" != $(echo "$1" | cut -c1-15) ]; then if [ "$1" != "$(echo "$1" | cut -c1-15)" ]; then
$LOG warn "Policy $1 exceeds max of 15 chars. Not setting policy" && return 0 $LOG warn "Policy $1 exceeds max of 15 chars. Not setting policy" && return 0
fi fi
for IPT in "$IPT4" "$IPT6"; do for IPT in "$IPT4" "$IPT6"; do
if ! $IPT -S mwan3_policy_$1 &> /dev/null; then if ! $IPT -S "mwan3_policy_$1" &> /dev/null; then
$IPT -N mwan3_policy_$1 $IPT -N "mwan3_policy_$1"
fi fi
$IPT -F mwan3_policy_$1 $IPT -F "mwan3_policy_$1"
case "$last_resort" in case "$last_resort" in
blackhole) blackhole)
$IPT -A mwan3_policy_$1 \ $IPT -A "mwan3_policy_$1" \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-m comment --comment "blackhole" \ -m comment --comment "blackhole" \
-j MARK --set-xmark $MMX_BLACKHOLE/$MMX_MASK -j MARK --set-xmark $MMX_BLACKHOLE/$MMX_MASK
;; ;;
default) default)
$IPT -A mwan3_policy_$1 \ $IPT -A "mwan3_policy_$1" \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-m comment --comment "default" \ -m comment --comment "default" \
-j MARK --set-xmark $MMX_DEFAULT/$MMX_MASK -j MARK --set-xmark $MMX_DEFAULT/$MMX_MASK
;; ;;
*) *)
$IPT -A mwan3_policy_$1 \ $IPT -A "mwan3_policy_$1" \
-m mark --mark 0x0/$MMX_MASK \ -m mark --mark 0x0/$MMX_MASK \
-m comment --comment "unreachable" \ -m comment --comment "unreachable" \
-j MARK --set-xmark $MMX_UNREACHABLE/$MMX_MASK -j MARK --set-xmark $MMX_UNREACHABLE/$MMX_MASK
@ -844,7 +832,7 @@ mwan3_create_policies_iptables()
lowest_metric_v6=$DEFAULT_LOWEST_METRIC lowest_metric_v6=$DEFAULT_LOWEST_METRIC
total_weight_v6=0 total_weight_v6=0
config_list_foreach $1 use_member mwan3_set_policy config_list_foreach "$1" use_member mwan3_set_policy
} }
mwan3_set_policies_iptables() mwan3_set_policies_iptables()
@ -856,21 +844,21 @@ mwan3_set_sticky_iptables()
{ {
local id iface local id iface
for iface in $($IPT4 -S $policy | cut -s -d'"' -f2 | awk '{print $1}'); do for iface in $($IPT4 -S "$policy" | cut -s -d'"' -f2 | awk '{print $1}'); do
if [ "$iface" == "$1" ]; then if [ "$iface" = "$1" ]; then
mwan3_get_iface_id id $1 mwan3_get_iface_id id "$1"
[ -n "$id" ] || return 0 [ -n "$id" ] || return 0
for IPT in "$IPT4" "$IPT6"; do for IPT in "$IPT4" "$IPT6"; do
if [ -n "$($IPT -S mwan3_iface_in_$1 2> /dev/null)" ]; then if [ -n "$($IPT -S "mwan3_iface_in_$1" 2> /dev/null)" ]; then
$IPT -I mwan3_rule_$rule \ $IPT -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_$rule src,src \ -m set ! --match-set "mwan3_sticky_$rule" src,src \
-j MARK --set-xmark 0x0/$MMX_MASK -j MARK --set-xmark 0x0/$MMX_MASK
$IPT -I mwan3_rule_$rule \ $IPT -I "mwan3_rule_$rule" \
-m mark --mark 0/$MMX_MASK \ -m mark --mark 0/$MMX_MASK \
-j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK -j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK
fi fi
@ -887,18 +875,18 @@ mwan3_set_user_iptables_rule()
rule="$1" rule="$1"
config_get sticky $1 sticky 0 config_get sticky "$1" sticky 0
config_get timeout $1 timeout 600 config_get timeout "$1" timeout 600
config_get ipset $1 ipset config_get ipset "$1" ipset
config_get proto $1 proto all config_get proto "$1" proto all
config_get src_ip $1 src_ip config_get src_ip "$1" src_ip
config_get src_iface $1 src_iface config_get src_iface "$1" src_iface
network_get_device src_dev $src_iface network_get_device src_dev "$src_iface"
config_get src_port $1 src_port config_get src_port "$1" src_port
config_get dest_ip $1 dest_ip config_get dest_ip "$1" dest_ip
config_get dest_port $1 dest_port config_get dest_port "$1" dest_port
config_get use_policy $1 use_policy config_get use_policy "$1" use_policy
config_get family $1 family any config_get family "$1" family any
[ -z "$dest_ip" ] && unset dest_ip [ -z "$dest_ip" ] && unset dest_ip
[ -z "$src_ip" ] && unset src_ip [ -z "$src_ip" ] && unset src_ip
@ -916,11 +904,11 @@ mwan3_set_user_iptables_rule()
unset dest_port unset dest_port
} }
config_get rule_logging $1 logging 0 config_get rule_logging "$1" logging 0
config_get global_logging globals logging 0 config_get global_logging globals logging 0
config_get loglevel globals loglevel notice config_get loglevel globals loglevel notice
if [ "$1" != $(echo "$1" | cut -c1-15) ]; then if [ "$1" != "$(echo "$1" | cut -c1-15)" ]; then
$LOG warn "Rule $1 exceeds max of 15 chars. Not setting rule" && return 0 $LOG warn "Rule $1 exceeds max of 15 chars. Not setting rule" && return 0
fi fi
@ -929,11 +917,11 @@ mwan3_set_user_iptables_rule()
fi fi
if [ -n "$use_policy" ]; then if [ -n "$use_policy" ]; then
if [ "$use_policy" == "default" ]; then if [ "$use_policy" = "default" ]; then
policy="MARK --set-xmark $MMX_DEFAULT/$MMX_MASK" policy="MARK --set-xmark $MMX_DEFAULT/$MMX_MASK"
elif [ "$use_policy" == "unreachable" ]; then elif [ "$use_policy" = "unreachable" ]; then
policy="MARK --set-xmark $MMX_UNREACHABLE/$MMX_MASK" policy="MARK --set-xmark $MMX_UNREACHABLE/$MMX_MASK"
elif [ "$use_policy" == "blackhole" ]; then elif [ "$use_policy" = "blackhole" ]; then
policy="MARK --set-xmark $MMX_BLACKHOLE/$MMX_MASK" policy="MARK --set-xmark $MMX_BLACKHOLE/$MMX_MASK"
else else
if [ "$sticky" -eq 1 ]; then if [ "$sticky" -eq 1 ]; then
@ -941,39 +929,39 @@ mwan3_set_user_iptables_rule()
policy="mwan3_policy_$use_policy" policy="mwan3_policy_$use_policy"
for IPT in "$IPT4" "$IPT6"; do for IPT in "$IPT4" "$IPT6"; do
if ! $IPT -S $policy &> /dev/null; then if ! $IPT -S "$policy" &> /dev/null; then
$IPT -N $policy $IPT -N "$policy"
fi fi
if ! $IPT -S mwan3_rule_$1 &> /dev/null; then if ! $IPT -S "mwan3_rule_$1" &> /dev/null; then
$IPT -N mwan3_rule_$1 $IPT -N "mwan3_rule_$1"
fi fi
$IPT -F mwan3_rule_$1 $IPT -F "mwan3_rule_$1"
done done
$IPS -! create mwan3_sticky_v4_$rule \ $IPS -! create "mwan3_sticky_v4_$rule" \
hash:ip,mark markmask $MMX_MASK \ hash:ip,mark markmask "$MMX_MASK" \
timeout $timeout timeout "$timeout"
$IPS -! create mwan3_sticky_v6_$rule \ $IPS -! create "mwan3_sticky_v6_$rule" \
hash:ip,mark markmask $MMX_MASK \ hash:ip,mark markmask "$MMX_MASK" \
timeout $timeout family inet6 timeout "$timeout" family inet6
$IPS -! create mwan3_sticky_$rule list:set $IPS -! create "mwan3_sticky_$rule" list:set
$IPS -! add mwan3_sticky_$rule mwan3_sticky_v4_$rule $IPS -! add "mwan3_sticky_$rule" "mwan3_sticky_v4_$rule"
$IPS -! add mwan3_sticky_$rule mwan3_sticky_v6_$rule $IPS -! add "mwan3_sticky_$rule" "mwan3_sticky_v6_$rule"
config_foreach mwan3_set_sticky_iptables interface config_foreach mwan3_set_sticky_iptables interface
for IPT in "$IPT4" "$IPT6"; do for IPT in "$IPT4" "$IPT6"; do
$IPT -A mwan3_rule_$1 \ $IPT -A "mwan3_rule_$1" \
-m mark --mark 0/$MMX_MASK \ -m mark --mark 0/$MMX_MASK \
-j $policy -j "$policy"
$IPT -A mwan3_rule_$1 \ $IPT -A "mwan3_rule_$1" \
-m mark ! --mark 0xfc00/0xfc00 \ -m mark ! --mark 0xfc00/0xfc00 \
-j SET --del-set mwan3_sticky_$rule src,src -j SET --del-set "mwan3_sticky_$rule" src,src
$IPT -A mwan3_rule_$1 \ $IPT -A "mwan3_rule_$1" \
-m mark ! --mark 0xfc00/0xfc00 \ -m mark ! --mark 0xfc00/0xfc00 \
-j SET --add-set mwan3_sticky_$rule src,src -j SET --add-set "mwan3_sticky_$rule" src,src
done done
policy="mwan3_rule_$1" policy="mwan3_rule_$1"
@ -981,22 +969,22 @@ mwan3_set_user_iptables_rule()
policy="mwan3_policy_$use_policy" policy="mwan3_policy_$use_policy"
for IPT in "$IPT4" "$IPT6"; do for IPT in "$IPT4" "$IPT6"; do
if ! $IPT -S $policy &> /dev/null; then if ! $IPT -S "$policy" &> /dev/null; then
$IPT -N $policy $IPT -N "$policy"
fi fi
done done
fi fi
fi fi
for IPT in "$IPT4" "$IPT6"; do for IPT in "$IPT4" "$IPT6"; do
[ "$family" == "ipv4" ] && [ "$IPT" == "$IPT6" ] && continue [ "$family" = "ipv4" ] && [ "$IPT" = "$IPT6" ] && continue
[ "$family" == "ipv6" ] && [ "$IPT" == "$IPT4" ] && continue [ "$family" = "ipv6" ] && [ "$IPT" = "$IPT4" ] && continue
[ "$global_logging" = "1" ] && [ "$rule_logging" = "1" ] && { [ "$global_logging" = "1" ] && [ "$rule_logging" = "1" ] && {
$IPT -A mwan3_rules \ $IPT -A mwan3_rules \
-p $proto \ -p "$proto" \
${src_ip:+-s} $src_ip \ ${src_ip:+-s} $src_ip \
${src_dev:+-i} $src_dev \ ${src_dev:+-i} $src_dev \
${dest_ip:+-d} $dest_ip\ ${dest_ip:+-d} $dest_ip \
$ipset \ $ipset \
${src_port:+-m} ${src_port:+multiport} ${src_port:+--sports} $src_port \ ${src_port:+-m} ${src_port:+multiport} ${src_port:+--sports} $src_port \
${dest_port:+-m} ${dest_port:+multiport} ${dest_port:+--dports} $dest_port \ ${dest_port:+-m} ${dest_port:+multiport} ${dest_port:+--dports} $dest_port \
@ -1006,10 +994,10 @@ mwan3_set_user_iptables_rule()
} }
$IPT -A mwan3_rules \ $IPT -A mwan3_rules \
-p $proto \ -p "$proto" \
${src_ip:+-s} $src_ip \ ${src_ip:+-s} $src_ip \
${src_dev:+-i} $src_dev \ ${src_dev:+-i} $src_dev \
${dest_ip:+-d} $dest_ip\ ${dest_ip:+-d} $dest_ip \
$ipset \ $ipset \
${src_port:+-m} ${src_port:+multiport} ${src_port:+--sports} $src_port \ ${src_port:+-m} ${src_port:+multiport} ${src_port:+--sports} $src_port \
${dest_port:+-m} ${dest_port:+multiport} ${dest_port:+--dports} $dest_port \ ${dest_port:+-m} ${dest_port:+multiport} ${dest_port:+--dports} $dest_port \
@ -1039,35 +1027,35 @@ mwan3_set_iface_hotplug_state() {
local iface=$1 local iface=$1
local state=$2 local state=$2
echo -n $state > $MWAN3_STATUS_DIR/iface_state/$iface echo "$state" > "$MWAN3_STATUS_DIR/iface_state/$iface"
} }
mwan3_get_iface_hotplug_state() { mwan3_get_iface_hotplug_state() {
local iface=$1 local iface=$1
cat $MWAN3_STATUS_DIR/iface_state/$iface 2>/dev/null || echo "offline" cat "$MWAN3_STATUS_DIR/iface_state/$iface" 2>/dev/null || echo "offline"
} }
mwan3_report_iface_status() mwan3_report_iface_status()
{ {
local device result track_ips tracking IP IPT local device result track_ips tracking IP IPT
mwan3_get_iface_id id $1 mwan3_get_iface_id id "$1"
network_get_device device $1 network_get_device device "$1"
config_get enabled "$1" enabled 0 config_get enabled "$1" enabled 0
config_get family "$1" family ipv4 config_get family "$1" family ipv4
if [ "$family" == "ipv4" ]; then if [ "$family" = "ipv4" ]; then
IP="$IP4" IP="$IP4"
IPT="$IPT4" IPT="$IPT4"
fi fi
if [ "$family" == "ipv6" ]; then if [ "$family" = "ipv6" ]; then
IP="$IP6" IP="$IP6"
IPT="$IPT6" IPT="$IPT6"
fi fi
if [ -z "$id" -o -z "$device" ]; then if [ -z "$id" ] || [ -z "$device" ]; then
result="offline" result="offline"
elif [ -n "$($IP rule | awk '$1 == "'$(($id+1000)):'"')" ] && \ elif [ -n "$($IP rule | awk '$1 == "'$(($id+1000)):'"')" ] && \
[ -n "$($IP rule | awk '$1 == "'$(($id+2000)):'"')" ] && \ [ -n "$($IP rule | awk '$1 == "'$(($id+2000)):'"')" ] && \
@ -1079,7 +1067,7 @@ mwan3_report_iface_status()
[ -n "$($IPT -S mwan3_iface_in_$1 2> /dev/null)" ] || \ [ -n "$($IPT -S mwan3_iface_in_$1 2> /dev/null)" ] || \
[ -n "$($IP route list table $id default dev $device 2> /dev/null)" ]; then [ -n "$($IP route list table $id default dev $device 2> /dev/null)" ]; then
result="error" result="error"
elif [ "$enabled" == "1" ]; then elif [ "$enabled" = "1" ]; then
result="offline" result="offline"
else else
result="disabled" result="disabled"
@ -1089,7 +1077,7 @@ mwan3_report_iface_status()
{ {
track_ips="$1 $track_ips" track_ips="$1 $track_ips"
} }
config_list_foreach $1 track_ip mwan3_list_track_ips config_list_foreach "$1" track_ip mwan3_list_track_ips
if [ -n "$track_ips" ]; then if [ -n "$track_ips" ]; then
if [ -n "$(pgrep -f "mwan3track $1 $device")" ]; then if [ -n "$(pgrep -f "mwan3track $1 $device")" ]; then
@ -1111,16 +1099,16 @@ mwan3_report_policies()
local percent total_weight weight iface local percent total_weight weight iface
total_weight=$($ipt -S $policy | grep -v '.*--comment "out .*" .*$' | cut -s -d'"' -f2 | head -1 | awk '{print $3}') total_weight=$($ipt -S "$policy" | grep -v '.*--comment "out .*" .*$' | cut -s -d'"' -f2 | head -1 | awk '{print $3}')
if [ ! -z "${total_weight##*[!0-9]*}" ]; then if [ ! -z "${total_weight##*[!0-9]*}" ]; then
for iface in $($ipt -S $policy | grep -v '.*--comment "out .*" .*$' | cut -s -d'"' -f2 | awk '{print $1}'); do for iface in $($ipt -S "$policy" | grep -v '.*--comment "out .*" .*$' | cut -s -d'"' -f2 | awk '{print $1}'); do
weight=$($ipt -S $policy | grep -v '.*--comment "out .*" .*$' | cut -s -d'"' -f2 | awk '$1 == "'$iface'"' | awk '{print $2}') weight=$($ipt -S "$policy" | grep -v '.*--comment "out .*" .*$' | cut -s -d'"' -f2 | awk '$1 == "'$iface'"' | awk '{print $2}')
percent=$(($weight*100/$total_weight)) percent=$(($weight*100/$total_weight))
echo " $iface ($percent%)" echo " $iface ($percent%)"
done done
else else
echo " $($ipt -S $policy | grep -v '.*--comment "out .*" .*$' | sed '/.*--comment \([^ ]*\) .*$/!d;s//\1/;q')" echo " $($ipt -S "$policy" | grep -v '.*--comment "out .*" .*$' | sed '/.*--comment \([^ ]*\) .*$/!d;s//\1/;q')"
fi fi
} }
@ -1146,8 +1134,6 @@ mwan3_report_policies_v6()
mwan3_report_connected_v4() mwan3_report_connected_v4()
{ {
local address
if [ -n "$($IPT4 -S mwan3_connected 2> /dev/null)" ]; then if [ -n "$($IPT4 -S mwan3_connected 2> /dev/null)" ]; then
$IPS -o save list mwan3_connected_v4 | grep add | cut -d " " -f 3 $IPS -o save list mwan3_connected_v4 | grep add | cut -d " " -f 3
fi fi
@ -1155,8 +1141,6 @@ mwan3_report_connected_v4()
mwan3_report_connected_v6() mwan3_report_connected_v6()
{ {
local address
if [ -n "$($IPT6 -S mwan3_connected 2> /dev/null)" ]; then if [ -n "$($IPT6 -S mwan3_connected 2> /dev/null)" ]; then
$IPS -o save list mwan3_connected_v6 | grep add | cut -d " " -f 3 $IPS -o save list mwan3_connected_v6 | grep add | cut -d " " -f 3
fi fi