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

mwan3: fix rpcd with for routers with no IPv6 support

Browse source 
Signed-off-by: Aaron Goodman <aaronjg@stanford.edu>
This commit is contained in:
Aaron Goodman 2020-10-29 23:06:25 -04:00
parent f1bfda4c37
commit 13d22445e4
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/mwan3/files/lib/mwan3/common.sh
View file

@ -23,6 +23,9 @@ MMX_UNREACHABLE=""
MM_UNREACHABLE="" MM_UNREACHABLE=""
MAX_SLEEP=$(((1<<31)-1)) MAX_SLEEP=$(((1<<31)-1))
command -v ip6tables > /dev/null
NO_IPV6=$?
LOG() LOG()
{ {
local facility=$1; shift local facility=$1; shift

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

@ -24,9 +24,6 @@ IPv4_REGEX="((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[0
DEFAULT_LOWEST_METRIC=256 DEFAULT_LOWEST_METRIC=256
command -v ip6tables > /dev/null
NO_IPV6=$?
mwan3_push_update() mwan3_push_update()
{ {
# helper function to build an update string to pass on to # helper function to build an update string to pass on to

4
net/mwan3/files/usr/libexec/rpcd/mwan3
View file

@ -5,8 +5,6 @@
. /usr/share/libubox/jshn.sh . /usr/share/libubox/jshn.sh
. /lib/mwan3/common.sh . /lib/mwan3/common.sh
MWAN3TRACK_STATUS_DIR="/var/run/mwan3track"
IPS="ipset" IPS="ipset"
IPT4="iptables -t mangle -w" IPT4="iptables -t mangle -w"
IPT6="ip6tables -t mangle -w" IPT6="ip6tables -t mangle -w"
@ -22,6 +20,7 @@ report_connected_v4() {
} }
report_connected_v6() { report_connected_v6() {
[ $NO_IPV6 -ne 0 ] && return
local address local address
if [ -n "$($IPT6 -S mwan3_connected 2> /dev/null)" ]; then if [ -n "$($IPT6 -S mwan3_connected 2> /dev/null)" ]; then
@ -60,6 +59,7 @@ report_policies_v4() {
} }
report_policies_v6() { report_policies_v6() {
[ $NO_IPV6 -ne 0 ] && return
local policy local policy
for policy in $($IPT6 -S | awk '{print $2}' | grep mwan3_policy_ | sort -u); do for policy in $($IPT6 -S | awk '{print $2}' | grep mwan3_policy_ | sort -u); do