mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Add test count as setting for OMR-Tracker

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2023-12-15 19:30:31 +01:00
parent e374f7cb2e
commit ced4a76faa
5 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
omr-tracker/files/bin/omr-tracker
View file

@ -148,10 +148,10 @@ _ping() {
if [ -n "$OMR_TRACKER_INTERFACE" ] && ([ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "3g" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "qmi" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "ncm" ]); then
ret=$(ping -I "${device}" \
-w "$OMR_TRACKER_TIMEOUT" \
-c 2 \
-c "$OMR_TRACKER_COUNT" \
-Q 184 \
"${host}" 2>&1
) && echo "$ret" | grep -sq "bytes from" && {
) && echo "$ret" | grep -sq " 0% packet loss" && {
if [ "$localip" = "yes" ]; then
OMR_TRACKER_LATENCY=$(echo "$ret" | cut -d "/" -s -f5 | cut -d "." -f1 | tr -d '\n')
_update_rto "$OMR_TRACKER_LATENCY"
@ -161,16 +161,17 @@ _ping() {
else
ret=$(ping -B -I "${device}" \
-w "$OMR_TRACKER_TIMEOUT" \
-c 2 \
-c "$OMR_TRACKER_COUNT" \
-Q 184 \
"${host}" 2>&1
) && echo "$ret" | grep -sq "bytes from" && {
) && echo "$ret" | grep -sq " 0% packet loss" && {
if [ "$localip" = "yes" ]; then
OMR_TRACKER_LATENCY=$(echo "$ret" | cut -d "/" -s -f5 | cut -d "." -f1 | tr -d '\n')
_update_rto "$OMR_TRACKER_LATENCY"
fi
return
}
#) && echo "$ret" | grep -sq "bytes from" && {
fi
false
}
@ -184,7 +185,7 @@ _httping() {
ret=$(httping "${host}" \
-y "${deviceip}" \
-t "$OMR_TRACKER_TIMEOUT" \
-c 1 2>&1
-c "$OMR_TRACKER_COUNT" 2>&1
) && echo "$ret" | grep -sq "1 ok" && {
if [ "$localip" = "yes" ]; then
OMR_TRACKER_LATENCY=$(echo "$ret" | cut -d "/" -s -f5 | cut -d "." -f1 | tr -d '\n')
@ -196,7 +197,7 @@ _httping() {
ret=$(httping -l "${host}" \
-y "${deviceip}" \
-t "$OMR_TRACKER_TIMEOUT" \
-c 1 2>&1
-c "$OMR_TRACKER_COUNT" 2>&1
) && echo "$ret" | grep -sq "1 ok" && {
if [ "$localip" = "yes" ]; then
OMR_TRACKER_LATENCY=$(echo "$ret" | cut -d "/" -s -f5 | cut -d "." -f1 | tr -d '\n')
@ -214,7 +215,7 @@ _dns() {
ret=$(dig @"${host}" \
-b "${deviceip}" \
+time="$OMR_TRACKER_TIMEOUT" \
+tries=1 \
+tries="$OMR_TRACKER_COUNT" \
one.one.one.one
) && echo "$ret" | grep -sq "1.1.1.1" && {
OMR_TRACKER_LATENCY=$(echo "$ret" | awk '/Query time/{print $4}')