From 1103ba54b6af0b48f24bbdaba1b760fc32ef6338 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 3 May 2021 10:52:26 +0200 Subject: [PATCH] mwan3: update ubus status for not tracked interfaces Signed-off-by: Florian Eckert (cherry picked from commit f1da872cd47b1602dc3014d6b4ee40cd5f9fe855) --- net/mwan3/files/usr/libexec/rpcd/mwan3 | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/net/mwan3/files/usr/libexec/rpcd/mwan3 b/net/mwan3/files/usr/libexec/rpcd/mwan3 index d4e7adb6f2..4c71fa18f4 100755 --- a/net/mwan3/files/usr/libexec/rpcd/mwan3 +++ b/net/mwan3/files/usr/libexec/rpcd/mwan3 @@ -96,8 +96,7 @@ get_mwan3_status() { local age=0 local online=0 local offline=0 - local up="0" - local enabled time_p time_n time_u time_d status track_status + local enabled time_p time_n time_u time_d status track_status up uptime if [ "${iface}" != "${iface_select}" ] && [ "${iface_select}" != "" ]; then return @@ -109,15 +108,19 @@ get_mwan3_status() { online=$(get_online_time "$iface") offline=$(get_offline_time "$iface") - local uptime="0" - config_get enabled "$iface" enabled 0 - network_get_uptime uptime "$iface" - network_is_up "$iface" && up="1" - if [ -f "$MWAN3TRACK_STATUS_DIR/${iface}/STATUS" ]; then - status="$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/STATUS")" + if [ -d "${MWAN3_STATUS_DIR}" ]; then + network_get_uptime uptime "$iface" + network_is_up "$iface" && up="1" + if [ -f "$MWAN3TRACK_STATUS_DIR/${iface}/STATUS" ]; then + status="$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/STATUS")" + else + status="notracking" + fi else + uptime=0 + up=0 status="unknown" fi -- 2.30.2