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

Fix ping issue in omr-tracker when it ouput errors

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2025-02-13 16:32:58 +01:00
parent 1b17e9c654
commit e94d8fa775
1 changed files with 13 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -118,7 +118,7 @@ _ping_server() {
statusp=$? statusp=$?
if $(exit $statusp); then if $(exit $statusp); then
serverip_ping=true serverip_ping=true
return return 0
fi fi
fi fi
} }
@ -158,7 +158,7 @@ _httping_server() {
statusp=$? statusp=$?
if $(exit $statusp); then if $(exit $statusp); then
serverip_ping=true serverip_ping=true
return return 0
fi fi
fi fi
} }
@ -199,7 +199,7 @@ _ping() {
-Q 184 \ -Q 184 \
"${host}" 2>&1 "${host}" 2>&1
) )
loss=$(echo "$ret" | awk '/packet loss/ {gsub("%","");print $6}' | tr -d '\n') loss=$(echo "$ret" | awk '/packet loss/ && !/errors/ {gsub("%","");print $6}' | tr -d '\n')
if [ -n "$loss" ] && [ "$loss" != "100" ]; then if [ -n "$loss" ] && [ "$loss" != "100" ]; then
if [ "$localip" = "yes" ]; then if [ "$localip" = "yes" ]; then
@ -210,7 +210,7 @@ _ping() {
} }
OMR_TRACKER_LOSS="$loss" OMR_TRACKER_LOSS="$loss"
fi fi
return return 0
fi fi
else else
ret=$(ping -B -I "${device}" \ ret=$(ping -B -I "${device}" \
@ -223,9 +223,7 @@ _ping() {
) )
bindcheck=$(echo "$ret" | grep "Address not available") bindcheck=$(echo "$ret" | grep "Address not available")
[ -n "$bindcheck" ] && OMR_TRACKER_NO_BIND=1 [ -n "$bindcheck" ] && OMR_TRACKER_NO_BIND=1
#loss=$(echo "$ret" | grep 'packet loss' | sed -ne 's/.*\([0-9]\+\)% packet loss.*/\1/p') loss=$(echo "$ret" | awk '/packet loss/ && !/errors/ {gsub("%","");print $6}' | tr -d '\n')
#loss=$(echo "$ret" | grep 'packet loss' | cut -d " " -f6 | sed 's/%//' | tr -d '\n')
loss=$(echo "$ret" | awk '/packet loss/ {gsub("%","");print $6}' | tr -d '\n')
if [ -n "$loss" ] && [ "$loss" != "100" ]; then if [ -n "$loss" ] && [ "$loss" != "100" ]; then
if [ "$localip" = "yes" ]; then if [ "$localip" = "yes" ]; then
#latency=$(echo "$ret" | grep rtt | cut -d "/" -s -f5 | cut -d "." -f1 | tr -d '\n') #latency=$(echo "$ret" | grep rtt | cut -d "/" -s -f5 | cut -d "." -f1 | tr -d '\n')
@ -236,11 +234,10 @@ _ping() {
} }
OMR_TRACKER_LOSS="$loss" OMR_TRACKER_LOSS="$loss"
fi fi
return return 0
fi fi
#) && echo "$ret" | grep -sq "bytes from" && {
fi fi
false return 1
} }
#' #'
_httping() { _httping() {
@ -266,7 +263,7 @@ _httping() {
} }
OMR_TRACKER_LOSS="$loss" OMR_TRACKER_LOSS="$loss"
fi fi
return return 0
fi fi
else else
ret=$(httping -l "${host}" \ ret=$(httping -l "${host}" \
@ -286,10 +283,10 @@ _httping() {
} }
OMR_TRACKER_LOSS="$loss" OMR_TRACKER_LOSS="$loss"
fi fi
return return 0
fi fi
fi fi
false return 1
} }
_dns() { _dns() {
@ -303,13 +300,13 @@ _dns() {
) && echo "$ret" | grep -sq "1.1.1.1" && { ) && echo "$ret" | grep -sq "1.1.1.1" && {
OMR_TRACKER_LATENCY=$(echo "$ret" | awk '/Query time/{print $4}') OMR_TRACKER_LATENCY=$(echo "$ret" | awk '/Query time/{print $4}')
#_update_rto "$OMR_TRACKER_LATENCY" #_update_rto "$OMR_TRACKER_LATENCY"
return return 0
} }
false return 1
} }
_none() { _none() {
return return 0
} }
_restart _restart
@ -490,9 +487,6 @@ while true; do
fi fi
OMR_TRACKER_STATUS_MSG="check error" OMR_TRACKER_STATUS_MSG="check error"
fi fi
else
#OMR_TRACKER_STATUS_MSG=""
OMR_TRACKER_STATUS="OK"
fi fi
else else
#OMR_TRACKER_STATUS_MSG="" #OMR_TRACKER_STATUS_MSG=""
@ -607,9 +601,6 @@ while true; do
fi fi
OMR_TRACKER_STATUS_MSG="check error" OMR_TRACKER_STATUS_MSG="check error"
fi fi
else
OMR_TRACKER_STATUS_MSG=""
OMR_TRACKER_STATUS="OK"
fi fi
else else
OMR_TRACKER_STATUS_MSG="" OMR_TRACKER_STATUS_MSG=""