diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker index ffd23ddc1..55ac2e8da 100755 --- a/omr-tracker/files/bin/omr-tracker +++ b/omr-tracker/files/bin/omr-tracker @@ -97,17 +97,19 @@ _dns() { local deviceip=$2 ret=$(dig @"${host}" \ -b "${deviceip}" \ - +time="$OTB_TRACKER_TIMEOUT" \ + +time="$OMR_TRACKER_TIMEOUT" \ +tries=1 \ openmptcprouter.com ) && echo "$ret" | grep -sq "94.23.252.192" && { - OTB_TRACKER_LATENCY=$(echo "$ret" | awk '/Query time/{print $4}') - _update_rto "$OTB_TRACKER_LATENCY" + OMR_TRACKER_LATENCY=$(echo "$ret" | awk '/Query time/{print $4}') + _update_rto "$OMR_TRACKER_LATENCY" return } false } +_restart + # main loop while true; do # setup tracker variables @@ -120,14 +122,14 @@ while true; do # retrieve iface ip and gateway OMR_TRACKER_DEVICE_IP=$(ip -4 -br addr ls dev "$OMR_TRACKER_DEVICE" | awk -F'[ /]+' '{print $3}') if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then - OTB_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep -v default | awk '/proto static/ {print $1}' | tr -d "\n") + OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep -v default | awk '/proto static/ {print $1}' | tr -d "\n") fi # execute specific tracker if [ -n "$OMR_TRACKER_DEVICE_IP" ] && [ -n "$OMR_TRACKER_DEVICE_GATEWAY" ]; then _ping "$OMR_TRACKER_DEVICE_GATEWAY" "$OMR_TRACKER_DEVICE_IP" "no" status=$? - if ! $(exit $status); then + if $(exit $status); then # setup loop variable tries="$OMR_TRACKER_TRIES" ip route replace "$OMR_TRACKER_HOST" via "$OMR_TRACKER_DEVICE_GATEWAY" dev "$OMR_TRACKER_DEVICE" src "$OMR_TRACKER_DEVICE_IP" @@ -140,7 +142,7 @@ while true; do _dns "$OMR_TRACKER_HOST" "$OMR_TRACKER_DEVICE_IP" "yes" status=$? fi - if ! $(exit $status); then + if $(exit $status); then OMR_TRACKER_STATUS="OK" break fi