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-test-speed-server

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

34
openmptcprouter/files/bin/omr-test-speed-server
View file

@ -27,8 +27,8 @@ if [ -n "$HOST" ] && [ -n "$PORT" ] && [ -n "$USERNAME" ] && [ -n "$PASSWORD" ];
[ -z "$FASTTEST" ] && echo "No answer to API request..." [ -z "$FASTTEST" ] && echo "No answer to API request..."
exit 1 exit 1
} }
KEY="$(echo '$auth' | jsonfilter -q -e '@.access_token')" KEY=$(echo "$auth" | jsonfilter -q -e '@.access_token')
[ -n "$KEY" ] && { [ -z "$KEY" ] && {
[ -z "$FASTTEST" ] && echo "No token..." [ -z "$FASTTEST" ] && echo "No token..."
exit 1 exit 1
} }
@ -63,17 +63,33 @@ if [ -n "$HOST" ] && [ -n "$PORT" ] && [ -n "$USERNAME" ] && [ -n "$PASSWORD" ];
fi fi
if [ -n "$FASTTEST" ]; then if [ -n "$FASTTEST" ]; then
if [ -n "$UPLOAD" ]; then if [ -n "$UPLOAD" ]; then
avg_speed=$(curl -k --max-time 30 -o /dev/null -qfsS -w '%{speed_upload}' -X POST -d @${upload_file} -d @${upload_file} --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest 2>/dev/null) if [ "$resolve" != "${HOST}" ] || [ "$valid_ip6" != "ok" ]; then
avg_speed=$(curl -k --max-time 30 -o /dev/null -qfsS -w '%{speed_upload}' -X POST -d @${upload_file} -d @${upload_file} --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest 2>/dev/null)
else
avg_speed=$(curl -k --max-time 30 -o /dev/null -qfsS -w '%{speed_upload}' -X POST -d @${upload_file} -d @${upload_file} --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://[${HOST}]:${PORT}/speedtest 2>/dev/null)
fi
echo -n "$avg_speed" echo -n "$avg_speed"
else else
avg_speed=$(curl -k --max-time 30 -o /dev/null -qfsS -w '%{speed_download}' --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest 2>/dev/null) if [ "$resolve" != "${HOST}" ] || [ "$valid_ip6" != "ok" ]; then
avg_speed=$(curl -k --max-time 30 -o /dev/null -qfsS -w '%{speed_download}' --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest 2>/dev/null)
else
avg_speed=$(curl -k --max-time 30 -o /dev/null -qfsS -w '%{speed_download}' --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://[${HOST}]:${PORT}/speedtest 2>/dev/null)
fi
echo -n "$avg_speed" echo -n "$avg_speed"
fi fi
else else
if [ -n "$UPLOAD" ]; then if [ -n "$UPLOAD" ]; then
curl -k -o /dev/null -X POST -d @${upload_file} -d @${upload_file} --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest || echo if [ "$resolve" != "${HOST}" ] || [ "$valid_ip6" != "ok" ]; then
curl -k -o /dev/null -X POST -d @${upload_file} -d @${upload_file} --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest || echo
else
curl -k -o /dev/null -X POST -d @${upload_file} -d @${upload_file} --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://[${HOST}]:${PORT}/speedtest || echo
fi
else else
curl -k -o /dev/null --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest || echo if [ "$resolve" != "${HOST}" ] || [ "$valid_ip6" != "ok" ]; then
curl -k -o /dev/null --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest || echo
else
curl -k -o /dev/null --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://[${HOST}]:${PORT}/speedtest || echo
fi
fi fi
fi fi
#if [ $MP ]; then #if [ $MP ]; then
@ -83,6 +99,10 @@ if [ -n "$HOST" ] && [ -n "$PORT" ] && [ -n "$USERNAME" ] && [ -n "$PASSWORD" ];
[ -z "$FASTTEST" ] && echo "Restart SQM on $INTERFACE" [ -z "$FASTTEST" ] && echo "Restart SQM on $INTERFACE"
/etc/init.d/sqm start $INTERFACE 2>&1 >/dev/null /etc/init.d/sqm start $INTERFACE 2>&1 >/dev/null
else else
curl -k -o /dev/null -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest || echo if [ "$resolve" != "${HOST}" ] || [ "$valid_ip6" != "ok" ]; then
curl -k -o /dev/null -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest || echo
else
curl -k -o /dev/null -H "Authorization: Bearer ${KEY}" https://[${HOST}]:${PORT}/speedtest || echo
fi
fi fi
fi fi