From 997c0842ca8b05de83a1ecd3160ecd18fa3d8aee Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 8 Sep 2021 11:33:55 +0200 Subject: mwan3: only send disconnected event if interface was connected before Up to now on every interface down event a mwan3 disconnected event was send. This is wrong because if the interface was never connected, then a disconnected event should not get generated. This commit fixes this bug. Signed-off-by: Florian Eckert --- net/mwan3/files/usr/sbin/mwan3track | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'net/mwan3/files') diff --git a/net/mwan3/files/usr/sbin/mwan3track b/net/mwan3/files/usr/sbin/mwan3track index 2c535d59f..89654f86b 100755 --- a/net/mwan3/files/usr/sbin/mwan3track +++ b/net/mwan3/files/usr/sbin/mwan3track @@ -105,14 +105,22 @@ validate_wrap() { } disconnected() { + local status="$(cat ${MWAN3TRACK_STATUS_DIR}/${INTERFACE}/STATUS)" + STATUS='offline' echo "offline" > $MWAN3TRACK_STATUS_DIR/$INTERFACE/STATUS get_uptime > $MWAN3TRACK_STATUS_DIR/$INTERFACE/OFFLINE echo "0" > $MWAN3TRACK_STATUS_DIR/$INTERFACE/ONLINE score=0 [ "$1" = 1 ] && return - LOG notice "Interface $INTERFACE ($DEVICE) is offline" - env -i ACTION="disconnected" INTERFACE="$INTERFACE" DEVICE="$DEVICE" /sbin/hotplug-call iface + + # Only execute disconnectd action if status was online or disconnecting + if [ "$status" = "online" ] || [ "$status" = "disconnecting" ]; then + LOG notice "Interface $INTERFACE ($DEVICE) is offline" + env -i ACTION="disconnected" INTERFACE="$INTERFACE" DEVICE="$DEVICE" /sbin/hotplug-call iface + else + LOG notice "Skip disconnected event for $INTERFACE ($DEVICE)" + fi } connected() { @@ -391,8 +399,8 @@ main() { if [ "${IFDOWN_EVENT}" -eq 1 ]; then LOG debug "Register ifdown event on interface ${INTERFACE} (${DEVICE})" - disabled disconnected + disabled IFDOWN_EVENT=0 fi if [ "${IFUP_EVENT}" -eq 1 ]; then -- cgit v1.2.3