Browse Source

mwan3: fix rpcd with for routers with no IPv6 support

Signed-off-by: Aaron Goodman <aaronjg@stanford.edu>
lilik-openwrt-22.03
Aaron Goodman 4 years ago
parent
commit
13d22445e4
3 changed files with 5 additions and 5 deletions
  1. +3
    -0
      net/mwan3/files/lib/mwan3/common.sh
  2. +0
    -3
      net/mwan3/files/lib/mwan3/mwan3.sh
  3. +2
    -2
      net/mwan3/files/usr/libexec/rpcd/mwan3

+ 3
- 0
net/mwan3/files/lib/mwan3/common.sh View File

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


+ 0
- 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
command -v ip6tables > /dev/null
NO_IPV6=$?
mwan3_push_update()
{
# helper function to build an update string to pass on to


+ 2
- 2
net/mwan3/files/usr/libexec/rpcd/mwan3 View File

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


Loading…
Cancel
Save