From 59953aff5f26402b7cb57dfee70ea02f0e0ff1de Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 14 Dec 2023 16:22:12 +0100 Subject: [PATCH] Fix test upload speed to server --- openmptcprouter/files/bin/omr-test-speed-server | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/openmptcprouter/files/bin/omr-test-speed-server b/openmptcprouter/files/bin/omr-test-speed-server index 74d110d1e..92f9334b5 100755 --- a/openmptcprouter/files/bin/omr-test-speed-server +++ b/openmptcprouter/files/bin/omr-test-speed-server @@ -48,9 +48,22 @@ if [ -n "$HOST" ] && [ -n "$PORT" ] && [ -n "$USERNAME" ] && [ -n "$PASSWORD" ]; # /etc/init.d/omr-tracker stop 2>&1 >/dev/null # multipath ${INTERFACE} off #fi + if [ -n "$UPLOAD" ]; then + if [ -f /usr/bin/v2ray ]; then + upload_file="/usr/bin/v2ray" + elif [ -f /usr/bin/xray ]; then + upload_file="/usr/bin/xray" + elif [ -f /boot/vmlinuz ]; then + upload_file="/boot/vmlinuz" + elif [ -f /bin/bash ]; then + upload_file="/bin/bash" + else + upload_file="/bin/busybox" + fi + fi if [ -n "$FASTTEST" ]; then if [ -n "$UPLOAD" ]; then - avg_speed=$(curl -k --max-time 30 -o /dev/null -qfsS -w '%{speed_upload}' -X POST -d @/boot/vmlinuz -d @/boot/vmlinuz --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest 2>/dev/null) + 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) echo -n "$avg_speed" 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) @@ -58,7 +71,7 @@ if [ -n "$HOST" ] && [ -n "$PORT" ] && [ -n "$USERNAME" ] && [ -n "$PASSWORD" ]; fi else if [ -n "$UPLOAD" ]; then - curl -k -o /dev/null -X POST -d @/boot/vmlinuz -d @/boot/vmlinuz --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest || echo + 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 --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest || echo fi