net/mwan3: fix ping issue if last interface recovers from failure
authorFlorian Eckert <fe@dev.tdt.de>
Mon, 31 Jul 2017 10:04:18 +0000 (12:04 +0200)
committerFlorian Eckert <fe@dev.tdt.de>
Thu, 10 Aug 2017 08:48:40 +0000 (10:48 +0200)
Even though error was fixed the interface checks still fails, if last_resort
was set to blackhole or unreachable.

To fix this issue do not remove failure interface from iptables change on
down event.

Reported-by: Colby Whitney <colby.whitney@luxul.com>
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
net/mwan3/files/etc/hotplug.d/iface/15-mwan3
net/mwan3/files/usr/sbin/mwan3

index ec0b27289d2688f3ddbe2612b4d60b8d3fe13e4f..b09d80c21284a477f09e08a924861dad8b73dfef 100644 (file)
@@ -59,7 +59,6 @@ case "$ACTION" in
        ;;
        ifdown)
                mwan3_delete_iface_rules $INTERFACE
-               mwan3_delete_iface_iptables $INTERFACE
                mwan3_delete_iface_route $INTERFACE
                mwan3_delete_iface_ipset_entries $INTERFACE
                mwan3_track_signal $INTERFACE $DEVICE
index 41d78a3f2d8a6cb7d13dc00b4e62563e64d615dc..1168ba37c0c1eb7df5af1f286a13fac2518e0fc4 100755 (executable)
@@ -37,6 +37,7 @@ ifdown()
        ACTION=ifdown INTERFACE=$1 /sbin/hotplug-call iface
 
        kill $(pgrep -f "mwan3track $1 $2") &> /dev/null
+       mwan3_delete_iface_iptables $1
        mwan3_track_clean $1
 }