From ac5895cd7f9ab6e4e7b63b86b9faf3f6fa9d8917 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 8 Nov 2018 09:32:29 +0100 Subject: [PATCH] mwan3: remove deprecated local_source config option This feature is not needed anymore. This feature is replaced by the change 46ed09408e554f182a688e0a7c47cdf85fc6c15d Signed-off-by: Florian Eckert --- net/mwan3/files/etc/config/mwan3 | 1 - net/mwan3/files/etc/hotplug.d/iface/14-mwan3 | 48 -------------------- 2 files changed, 49 deletions(-) delete mode 100644 net/mwan3/files/etc/hotplug.d/iface/14-mwan3 diff --git a/net/mwan3/files/etc/config/mwan3 b/net/mwan3/files/etc/config/mwan3 index 966601eee..3f64b99d4 100644 --- a/net/mwan3/files/etc/config/mwan3 +++ b/net/mwan3/files/etc/config/mwan3 @@ -1,7 +1,6 @@ config globals 'globals' option mmx_mask '0x3F00' - option local_source 'none' option rtmon_interval '5' config interface 'wan' diff --git a/net/mwan3/files/etc/hotplug.d/iface/14-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/14-mwan3 deleted file mode 100644 index 4f8e0be16..000000000 --- a/net/mwan3/files/etc/hotplug.d/iface/14-mwan3 +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -. /lib/functions.sh -. /lib/mwan3/mwan3.sh -. /lib/functions/network.sh - -[ "$ACTION" = "ifup" -o "$ACTION" = "ifdown" ] || exit 1 -[ -n "$INTERFACE" ] || exit 2 - -if [ "$ACTION" = "ifup" ]; then - [ -n "$DEVICE" ] || exit 3 -fi - -config_load mwan3 -config_get_bool enabled globals 'enabled' '0' -[ ${enabled} -gt 0 ] || exit 0 - -config_get local_source globals local_source 'none' -[ "${local_source}" = "none" ] && { - exit 0 -} - -[ "${local_source}" = "$INTERFACE" ] || { - exit 0 -} - -mwan3_lock -src_ip=$(uci_get_state mwan3 globals src_ip) -[ "${src_ip}" != "" ] && { - ip route del default via "${src_ip}" dev lo 1>/dev/null 2>&1 - ip addr del "${src_ip}/32" dev lo 1>/dev/null 2>&1 -} - -sleep 1 - -[ "$ACTION" = "ifup" ] && { - network_get_ipaddr src_ip "${local_source}" - if [ "${src_ip}" = "" ]; then - $LOG warn "Unable to set source ip for own initiated traffic (${local_source})" - else - ip addr add "${src_ip}/32" dev lo - ip route add default via "${src_ip}" dev lo - uci_toggle_state mwan3 globals src_ip "${src_ip}" - fi -} -mwan3_unlock - -exit 0