mwan3: set interface unknown to offline
authorFlorian Eckert <fe@dev.tdt.de>
Fri, 11 Jan 2019 11:47:16 +0000 (12:47 +0100)
committerFlorian Eckert <fe@dev.tdt.de>
Mon, 14 Jan 2019 07:28:53 +0000 (08:28 +0100)
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
net/mwan3/files/etc/hotplug.d/iface/15-mwan3
net/mwan3/files/lib/mwan3/mwan3.sh
net/mwan3/files/usr/sbin/mwan3track

index 1164f953e376edbe3275ec7c026cba4dd4119469..55d0aa20dcbc3916a77ab1172dd4a27903f83932 100644 (file)
@@ -75,7 +75,7 @@ case "$ACTION" in
                else
                        $LOG notice "Starting tracker on interface $INTERFACE (${DEVICE:-unknown})"
                        mwan3_set_iface_hotplug_state $INTERFACE "offline"
-                       mwan3_track $INTERFACE $DEVICE "unknown" "$src_ip"
+                       mwan3_track $INTERFACE $DEVICE "offline" "$src_ip"
                fi
                mwan3_set_policies_iptables
                mwan3_set_user_rules
index b6be1f4893c08c22fc3cf07ee39d293b6324c3ef..d28ab28e2f20b66c2173a06411dc9607e09f1ae3 100644 (file)
@@ -1112,7 +1112,7 @@ mwan3_set_iface_hotplug_state() {
 mwan3_get_iface_hotplug_state() {
        local iface=$1
 
-       cat $MWAN3_STATUS_DIR/iface_state/$iface 2>/dev/null || echo "unknown"
+       cat $MWAN3_STATUS_DIR/iface_state/$iface 2>/dev/null || echo "offline"
 }
 
 mwan3_report_iface_status()
@@ -1135,7 +1135,7 @@ mwan3_report_iface_status()
        fi
 
        if [ -z "$id" -o -z "$device" ]; then
-               result="unknown"
+               result="offline"
        elif [ -n "$($IP rule | awk '$1 == "'$(($id+1000)):'"')" ] && \
                [ -n "$($IP rule | awk '$1 == "'$(($id+2000)):'"')" ] && \
                [ -n "$($IPT -S mwan3_iface_in_$1 2> /dev/null)" ] && \
index f268f90b25bdc07bbeaf7c1147b3ff2d9de56bc5..375e62a0f1073420ca90b26255f823da98ab4285 100755 (executable)
@@ -112,8 +112,8 @@ main() {
        local loss=0
        local latency=0
 
-       if [ "$STATUS" = "unknown" ]; then
-               echo "unknown" > /var/run/mwan3track/$1/STATUS
+       if [ "$STATUS" = "offline" ]; then
+               echo "offline" > /var/run/mwan3track/$1/STATUS
                echo "0" > /var/run/mwan3track/$1/UPTIME
                echo "$(get_uptime)" > /var/run/mwan3track/$1/DOWNTIME
                score=0