aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorFlorian Eckert <fe@dev.tdt.de>2018-11-08 12:26:08 +0100
committerFlorian Eckert <fe@dev.tdt.de>2018-11-08 12:29:12 +0100
commit85a6d89b8e5ba51115b2ef0815027cff3d3d5808 (patch)
treeaeb6e183f4473f9c981910b91e166509312019a7 /net
parent2d20d82e3e1ef08b4a8494174018ee5a1c9f028b (diff)
mwan3: revert add online_metric for local_source none
This is not necessary. This reverts commit be91e71805116ac1fd852a1ac0480737538d0b04.
Diffstat (limited to 'net')
-rw-r--r--net/mwan3/files/etc/hotplug.d/iface/13-mwan398
-rw-r--r--net/mwan3/files/lib/mwan3/mwan3.sh22
-rwxr-xr-xnet/mwan3/files/usr/sbin/mwan31
3 files changed, 0 insertions, 121 deletions
diff --git a/net/mwan3/files/etc/hotplug.d/iface/13-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/13-mwan3
deleted file mode 100644
index c21e1db98..000000000
--- a/net/mwan3/files/etc/hotplug.d/iface/13-mwan3
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /lib/functions/network.sh
-. /lib/mwan3/mwan3.sh
-
-LOG="logger -t mwan3[$$] -p"
-
-[ "$ACTION" = "connected" -o "$ACTION" = "disconnected" ] || exit 1
-[ -n "$INTERFACE" ] || exit 2
-
-if [ "$ACTION" = "connected" ]; then
- [ -n "$DEVICE" ] || exit 3
-fi
-
-config_load mwan3
-config_get_bool enabled globals 'enabled' '0'
-config_get local_source globals 'local_source' 'none'
-[ ${enabled} = "1" ] || exit 0
-[ ${local_source} = "none" ] || exit 0
-
-config_get enabled $INTERFACE enabled 0
-config_get online_metric $INTERFACE online_metric 0
-[ "$enabled" == "1" ] || exit 0
-
-if [ "$online_metric" = 0 ]; then
- $LOG notice "No online metric for interface "$INTERFACE" found"
- exit 0
-fi
-
-mwan3_add_failover_metric() {
- local iface="$1"
- local device="$2"
- local metric="$3"
-
- local route_args
-
- config_get family $iface family ipv4
-
- if [ "$family" == "ipv4" ]; then
- if ubus call network.interface.${iface}_4 status 1>/dev/null 2>&1; then
- network_get_gateway route_args ${iface}_4
- else
- network_get_gateway route_args $iface
- fi
-
- if [ -n "$route_args" -a "$route_args" != "0.0.0.0" ]; then
- route_args="via $route_args"
- else
- route_args=""
- fi
-
- $IP4 route add default $route_args dev $device proto static metric $metric 1>/dev/null 2>&1
- fi
-
- if [ "$family" == "ipv6" ]; then
- if ubus call network.interface.${iface}_6 status 1>/dev/null 2>&1; then
- network_get_gateway6 route_args ${iface}_6
- else
- network_get_gateway6 route_args $iface
- fi
-
- if [ -n "$route_args" -a "$route_args" != "::" ]; then
- route_args="via $route_args"
- else
- route_args=""
- fi
-
- $IP6 route add default $route_args dev $device proto static metric $metric 1>/dev/null 2>&1
- fi
-}
-
-mwan3_del_failover_metric() {
- local iface="$1"
- local device="$2"
- local metric="$3"
-
- config_get family $iface family ipv4
-
- if [ "$family" == "ipv4" ]; then
- $IP4 route del default dev $device proto static metric $metric 1>/dev/null 2>&1
- fi
-
- if [ "$family" == "ipv6" ]; then
- $IP6 route del default dev $device proto static metric $metric 1>/dev/null 2>&1
- fi
-}
-
-case "$ACTION" in
- connected)
- mwan3_add_failover_metric "$INTERFACE" "$DEVICE" "$online_metric"
- ;;
- disconnected)
- mwan3_del_failover_metric "$INTERFACE" "$DEVICE" "$online_metric"
- ;;
-esac
-
-exit 0
diff --git a/net/mwan3/files/lib/mwan3/mwan3.sh b/net/mwan3/files/lib/mwan3/mwan3.sh
index 42e08beb9..89ef06841 100644
--- a/net/mwan3/files/lib/mwan3/mwan3.sh
+++ b/net/mwan3/files/lib/mwan3/mwan3.sh
@@ -1219,25 +1219,3 @@ mwan3_track_clean()
fi
}
}
-
-mwan3_online_metric_clean() {
- local iface="$1"
-
- local online_metric ifname
-
- config_get family $iface family ipv4
- config_get online_metric $iface online_metric ""
- ifname=$(uci_get_state network $iface ifname)
-
- if [ "$family" == "ipv4" ] \
- && [ "$online_metric" != "" ] \
- && [ "$ifname" != "" ]; then
- $IP4 route del default dev $ifname proto static metric $online_metric 1>/dev/null 2>&1
- fi
-
- if [ "$family" == "ipv6" ] \
- && [ "$online_metric" != "" ] \
- && [ "$ifname" != "" ]; then
- $IP6 route del default dev $ifname proto static metric $online_metric 1>/dev/null 2>&1
- fi
-}
diff --git a/net/mwan3/files/usr/sbin/mwan3 b/net/mwan3/files/usr/sbin/mwan3
index 139da3d25..4ad3bc391 100755
--- a/net/mwan3/files/usr/sbin/mwan3
+++ b/net/mwan3/files/usr/sbin/mwan3
@@ -175,7 +175,6 @@ stop()
config_load mwan3
config_foreach mwan3_track_clean interface
- config_foreach mwan3_online_metric_clean interface
for IP in "$IP4" "$IP6"; do