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

Merge pull request #12533 from TDT-AG/pr/20200617-mwan3

Browse source 
mwan3: improvements
This commit is contained in:
Florian Eckert 2020-06-23 13:18:04 +02:00 committed by GitHub
commit 6afcb0d0e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/mwan3/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mwan3 PKG_NAME:=mwan3
PKG_VERSION:=2.8.6 PKG_VERSION:=2.8.7
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de> PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

20
net/mwan3/files/etc/init.d/mwan3
View file

@ -1,20 +1,28 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
START=19 START=19
USE_PROCD=1
reload() {
/usr/sbin/mwan3 restart
}
boot() { boot() {
. /lib/config/uci.sh . /lib/config/uci.sh
uci_toggle_state mwan3 globals enabled "1" uci_toggle_state mwan3 globals enabled "1"
mwan3_boot=1
rc_procd start_service
} }
start() { reload_service() {
/usr/sbin/mwan3 restart
}
start_service() {
[ -n "${mwan3_boot}" ] && return 0
/usr/sbin/mwan3 start /usr/sbin/mwan3 start
} }
stop() { stop_service() {
/usr/sbin/mwan3 stop /usr/sbin/mwan3 stop
} }
service_triggers() {
procd_add_reload_trigger 'mwan3'
}

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

@ -77,7 +77,7 @@ get_mwan3_status() {
local online=0 local online=0
local offline=0 local offline=0
local up="0" local up="0"
local enabled pid device time_p time_n time_u time_d local enabled pid device time_p time_n time_u time_d status
network_get_device device $1 network_get_device device $1
@ -111,6 +111,12 @@ get_mwan3_status() {
network_get_uptime uptime "$iface" network_get_uptime uptime "$iface"
network_is_up "$iface" && up="1" network_is_up "$iface" && up="1"
if [ -f "$MWAN3TRACK_STATUS_DIR/${iface}/STATUS" ]; then
status="$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/STATUS")"
else
status="unknown"
fi
json_add_object "${iface}" json_add_object "${iface}"
json_add_int age "$age" json_add_int age "$age"
json_add_int online "${online}" json_add_int online "${online}"
@ -119,7 +125,7 @@ get_mwan3_status() {
json_add_int "score" "$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/SCORE")" json_add_int "score" "$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/SCORE")"
json_add_int "lost" "$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/LOST")" json_add_int "lost" "$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/LOST")"
json_add_int "turn" "$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/TURN")" json_add_int "turn" "$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/TURN")"
json_add_string "status" "$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/STATUS")" json_add_string "status" "${status}"
json_add_boolean "enabled" "${enabled}" json_add_boolean "enabled" "${enabled}"
json_add_boolean "running" "${running}" json_add_boolean "running" "${running}"
json_add_boolean "up" "${up}" json_add_boolean "up" "${up}"