From f5b2a50a11132d3be409ec4b2887a7d6502edabc Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 13 Dec 2023 21:39:19 +0100
Subject: [PATCH 1/3] Fix token request loop

---
 openmptcprouter/files/etc/init.d/openmptcprouter-vps | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 110b0e87d..9edb82557 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -2124,7 +2124,7 @@ _get_token() {
 	[ "$(uci -q get openmptcprouter.${servername}.disabled)" = "1" ] && return
 	token=""
 	_login
-	[ -z "$token" ] && {
+	if [ -z "$token" ]; then
 		reason=""
 		test_ping() {
 			_ping_server $1
@@ -2163,7 +2163,12 @@ _get_token() {
 		uci -q batch <<-EOF >/dev/null
 			set openmptcprouter.${servername}.admin_error=1
 		EOF
-	}
+	else
+		uci -q batch <<-EOF >/dev/null
+			set openmptcprouter.${servername}.token_error=0
+			commit openmptcprouter
+		EOF
+	fi
 	echo "$server:$serverport:$token"
 }
 

From 59953aff5f26402b7cb57dfee70ea02f0e0ff1de Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 14 Dec 2023 16:22:12 +0100
Subject: [PATCH 2/3] 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

From fd35a9040f3adf4922e272c7dcc27986fe994f18 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 14 Dec 2023 16:22:36 +0100
Subject: [PATCH 3/3] Dirty fix for openmptcprouter config

---
 openmptcprouter/files/etc/init.d/openmptcprouter-vps | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 9edb82557..f11cfe5fa 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -2311,6 +2311,10 @@ token() {
 	config_foreach _get_token server
 }
 
+_fix_server() {
+	uci -q rename openmptcprouter.$1=server
+}
+
 start_service() {
 	serversnb=0
 	wanips=""
@@ -2318,6 +2322,7 @@ start_service() {
 	[ -z "$serial" ] && [ -f "/usr/sbin/dmidecode" ] && serial=$(/usr/sbin/dmidecode -t 1 | egrep 'Serial' | awk '{print $3}')
 	uci -q set openmptcprouter.settings.serial=${serial}
 	config_load openmptcprouter
+	config_foreach _fix_server openmptcprouter
 	config_foreach _count_server server
 	config_foreach _get_local_wan_ip interface
 	config_foreach _config_service server