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

net/mwan3: use uptime for ubus age info

Browse source 
If the date is changed by ntp the age value of mwan3 on ubus could jitter.
Use instead the uptime value from /proc/uptime which will not change during
system run.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert 2017-11-09 09:57:58 +01:00
parent 84e5012e88
commit 267c0eeaed
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/mwan3/files/lib/mwan3/common.sh Normal file
View file

@ -0,0 +1,6 @@
#!/bin/sh
get_uptime() {
local uptime=$(cat /proc/uptime)
echo "${uptime%%.*}"
}

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

@ -3,6 +3,7 @@
. /lib/functions.sh . /lib/functions.sh
. /lib/functions/network.sh . /lib/functions/network.sh
. /usr/share/libubox/jshn.sh . /usr/share/libubox/jshn.sh
. /lib/mwan3/common.sh
MWAN3TRACK_STATUS_DIR="/var/run/mwan3track" MWAN3TRACK_STATUS_DIR="/var/run/mwan3track"
@ -47,7 +48,7 @@ get_mwan3_status() {
time_p="$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/TIME")" time_p="$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/TIME")"
[ -z "${time_p}" ] || { [ -z "${time_p}" ] || {
time_n="$(date +'%s')" time_n="$(get_uptime)"
let age=time_n-time_p let age=time_n-time_p
} }

3
net/mwan3/files/usr/sbin/mwan3track
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
. /lib/functions.sh . /lib/functions.sh
. /lib/mwan3/common.sh
LOG="logger -t $(basename "$0")[$$] -p" LOG="logger -t $(basename "$0")[$$] -p"
INTERFACE="" INTERFACE=""
@ -171,7 +172,7 @@ main() {
echo "${lost}" > /var/run/mwan3track/$1/LOST echo "${lost}" > /var/run/mwan3track/$1/LOST
echo "${score}" > /var/run/mwan3track/$1/SCORE echo "${score}" > /var/run/mwan3track/$1/SCORE
echo "${turn}" > /var/run/mwan3track/$1/TURN echo "${turn}" > /var/run/mwan3track/$1/TURN
echo "$(date +'%s')" > /var/run/mwan3track/$1/TIME echo "$(get_uptime)" > /var/run/mwan3track/$1/TIME
host_up_count=0 host_up_count=0
sleep "${sleep_time}" & sleep "${sleep_time}" &