Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #15562 from TDT-AG/pr/20200503-mwan3

Browse source 
mwan3: update ubus status for no tracked interfaces
This commit is contained in:
Florian Eckert 2021-05-06 12:15:34 +02:00 committed by GitHub
commit 7e8260baf2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/mwan3/files/etc/hotplug.d/iface/15-mwan3
View file

@ -66,7 +66,7 @@ case "$ACTION" in
mwan3_set_iface_hotplug_state $INTERFACE "$status" mwan3_set_iface_hotplug_state $INTERFACE "$status"
if [ "$MWAN3_STARTUP" != "init" ]; then if [ "$MWAN3_STARTUP" != "init" ]; then
mwan3_create_iface_route $INTERFACE $DEVICE mwan3_create_iface_route $INTERFACE $DEVICE
mwan3_set_general_rules mwan3_set_general_rules
[ "$status" = "online" ] && mwan3_set_policies_iptables [ "$status" = "online" ] && mwan3_set_policies_iptables
fi fi
[ "$ACTION" = ifup ] && procd_running mwan3 "track_$INTERFACE" && procd_send_signal mwan3 "track_$INTERFACE" USR2 [ "$ACTION" = ifup ] && procd_running mwan3 "track_$INTERFACE" && procd_send_signal mwan3 "track_$INTERFACE" USR2

19
net/mwan3/files/usr/libexec/rpcd/mwan3
View file

@ -96,8 +96,7 @@ get_mwan3_status() {
local age=0 local age=0
local online=0 local online=0
local offline=0 local offline=0
local up="0" local enabled time_p time_n time_u time_d status track_status up uptime
local enabled time_p time_n time_u time_d status track_status
if [ "${iface}" != "${iface_select}" ] && [ "${iface_select}" != "" ]; then if [ "${iface}" != "${iface_select}" ] && [ "${iface_select}" != "" ]; then
return return
@ -109,15 +108,19 @@ get_mwan3_status() {
online=$(get_online_time "$iface") online=$(get_online_time "$iface")
offline=$(get_offline_time "$iface") offline=$(get_offline_time "$iface")
local uptime="0"
config_get enabled "$iface" enabled 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 if [ -d "${MWAN3_STATUS_DIR}" ]; then
status="$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/STATUS")" 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 else
uptime=0
up=0
status="unknown" status="unknown"
fi fi