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 omr-tracker and no error if IPv6 not used

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-04-01 19:39:12 +02:00
parent d0f7180dc5
commit 0fe28bf77a
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -376,18 +376,19 @@ while true; do
OMR_TRACKER_STATUS="OK" OMR_TRACKER_STATUS="OK"
fi fi
fi fi
if [ "$serverip_ping" != false ] && [ "$OMR_TRACKER_STATUS" = "OK" ] && [ "$OMR_TRACKER_TYPE" != "httping" ] && [ "$OMR_TRACKER_SERVER_HTTP_TEST" = "1" ]; then if [ "$serverip_ping" != false ] && ([ "$OMR_TRACKER_STATUS_MSG" = "" ] || [ "$OMR_TRACKER_STATUS" = "OK" ]) && [ "$OMR_TRACKER_TYPE" != "httping" ] && [ "$OMR_TRACKER_SERVER_HTTP_TEST" = "1" ]; then
serverip_ping=false serverip_ping=false
config_load openmptcprouter config_load openmptcprouter
config_foreach _httping_server server $OMR_TRACKER_DEVICE_IP config_foreach _httping_server server $OMR_TRACKER_DEVICE_IP
if [ "$serverip_ping" = false ]; then if [ "$serverip_ping" = false ]; then
OMR_TRACKER_STATUS="ERROR"
OMR_TRACKER_STATUS_MSG="No access to server API" OMR_TRACKER_STATUS_MSG="No access to server API"
else else
OMR_TRACKER_STATUS_MSG="" OMR_TRACKER_STATUS_MSG=""
OMR_TRACKER_STATUS="OK" OMR_TRACKER_STATUS="OK"
break break
fi fi
elif [ "$serverip_ping" != false ]; then elif [ "$serverip_ping" != false ] && ([ "$OMR_TRACKER_STATUS_MSG" = "" ] || [ "$OMR_TRACKER_STATUS" = "OK" ]); then
OMR_TRACKER_STATUS_MSG="" OMR_TRACKER_STATUS_MSG=""
OMR_TRACKER_STATUS="OK" OMR_TRACKER_STATUS="OK"
break break
@ -405,7 +406,7 @@ while true; do
sleep "$OMR_TRACKER_INTERVAL_TRIES" sleep "$OMR_TRACKER_INTERVAL_TRIES"
done done
fi fi
if [ -n "$OMR_TRACKER_DEVICE_IP6" ] && [ -n "$OMR_TRACKER_DEVICE_GATEWAY6" ]; then if [ "$(uci -q get openmptcprouter.settings.disable_ipv6)" = "0" ] && [ -n "$OMR_TRACKER_DEVICE_IP6" ] && [ -n "$OMR_TRACKER_DEVICE_GATEWAY6" ]; then
# setup loop variable # setup loop variable
tries="$OMR_TRACKER_TRIES" tries="$OMR_TRACKER_TRIES"
# loop until tries attempts have been reached # loop until tries attempts have been reached
@ -475,18 +476,19 @@ while true; do
OMR_TRACKER_STATUS="OK" OMR_TRACKER_STATUS="OK"
fi fi
fi fi
if [ "$serverip_ping" != false ] && [ "$OMR_TRACKER_STATUS" = "OK" ] && [ "$OMR_TRACKER_TYPE" != "httping" ] && [ "$OMR_TRACKER_SERVER_HTTP_TEST" = "1" ]; then if [ "$serverip_ping" != false ] && ([ "$OMR_TRACKER_STATUS_MSG" = "" ] || [ "$OMR_TRACKER_STATUS" = "OK" ]) && [ "$OMR_TRACKER_TYPE" != "httping" ] && [ "$OMR_TRACKER_SERVER_HTTP_TEST" = "1" ]; then
serverip_ping=false serverip_ping=false
config_load openmptcprouter config_load openmptcprouter
config_foreach _httping_server server $OMR_TRACKER_DEVICE_IP config_foreach _httping_server server $OMR_TRACKER_DEVICE_IP
if [ "$serverip_ping" = false ]; then if [ "$serverip_ping" = false ]; then
OMR_TRACKER_STATUS_MSG="No access to server API" OMR_TRACKER_STATUS_MSG="No access to server API"
OMR_TRACKER_STATUS="ERROR"
else else
OMR_TRACKER_STATUS_MSG="" OMR_TRACKER_STATUS_MSG=""
OMR_TRACKER_STATUS="OK" OMR_TRACKER_STATUS="OK"
break break
fi fi
elif [ "$serverip_ping" != false ]; then elif [ "$serverip_ping" != false ] && ([ "$OMR_TRACKER_STATUS_MSG" = "" ] || [ "$OMR_TRACKER_STATUS" = "OK" ]); then
OMR_TRACKER_STATUS_MSG="" OMR_TRACKER_STATUS_MSG=""
OMR_TRACKER_STATUS="OK" OMR_TRACKER_STATUS="OK"
break break
@ -504,12 +506,14 @@ while true; do
sleep "$OMR_TRACKER_INTERVAL_TRIES" sleep "$OMR_TRACKER_INTERVAL_TRIES"
done done
fi fi
if [ -z "$OMR_TRACKER_DEVICE_IP" ] || [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ -z "$OMR_TRACKER_DEVICE_IP6" ] || [ -n "$OMR_TRACKER_DEVICE_GATEWAY6" ]; then if [ -z "$OMR_TRACKER_DEVICE_IP" ] || [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ -z "$OMR_TRACKER_DEVICE_IP6" ] || [ -z "$OMR_TRACKER_DEVICE_GATEWAY6" ]; then
[ -z "$OMR_TRACKER_STATUS_MSG" ] && OMR_TRACKER_STATUS_MSG="$OMR_TRACKER_INTERFACE have ip issues" [ -z "$OMR_TRACKER_STATUS_MSG" ] && OMR_TRACKER_STATUS_MSG="$OMR_TRACKER_INTERFACE may have ip issues"
[ -z "$OMR_TRACKER_DEVICE_IP" ] && OMR_TRACKER_STATUS_MSG="$OMR_TRACKER_STATUS_MSG, interface have no IPv4" [ -z "$OMR_TRACKER_DEVICE_IP" ] && OMR_TRACKER_STATUS_MSG="$OMR_TRACKER_STATUS_MSG, interface have no IPv4"
[ -z "$OMR_TRACKER_DEVICE_GATEWAY" ] && OMR_TRACKER_STATUS_MSG="$OMR_TRACKER_STATUS_MSG, interface have no IPv4 gateway" [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ] && OMR_TRACKER_STATUS_MSG="$OMR_TRACKER_STATUS_MSG, interface have no IPv4 gateway"
[ -z "$OMR_TRACKER_DEVICE_IP6" ] && OMR_TRACKER_STATUS_MSG="$OMR_TRACKER_STATUS_MSG, interface have no IPv6" if [ "$(uci -q get openmptcprouter.settings.disable_ipv6)" = "0" ]; then
[ -z "$OMR_TRACKER_DEVICE_GATEWAY6" ] && OMR_TRACKER_STATUS_MSG="$OMR_TRACKER_STATUS_MSG, interface have no IPv6 gateway" [ -z "$OMR_TRACKER_DEVICE_IP6" ] && OMR_TRACKER_STATUS_MSG="$OMR_TRACKER_STATUS_MSG, interface have no IPv6"
[ -z "$OMR_TRACKER_DEVICE_GATEWAY6" ] && OMR_TRACKER_STATUS_MSG="$OMR_TRACKER_STATUS_MSG, interface have no IPv6 gateway"
fi
fi fi
else else
OMR_TRACKER_STATUS_MSG="link down" OMR_TRACKER_STATUS_MSG="link down"