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

sync (#391)

Browse source
This commit is contained in:
suyuan 2023-12-15 08:59:48 +08:00 • committed by GitHub
commit ad36ae9494
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,9 +48,22 @@ if [ -n "$HOST" ] && [ -n "$PORT" ] && [ -n "$USERNAME" ] && [ -n "$PASSWORD" ];
# /etc/init.d/omr-tracker stop 2>&1 >/dev/null # /etc/init.d/omr-tracker stop 2>&1 >/dev/null
# multipath ${INTERFACE} off # multipath ${INTERFACE} off
#fi #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 "$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 @/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" 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) 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 fi
else else
if [ -n "$UPLOAD" ]; then 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 else
curl -k -o /dev/null --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest || echo curl -k -o /dev/null --interface $INTERFACE -H "Authorization: Bearer ${KEY}" https://${HOST}:${PORT}/speedtest || echo
fi fi

14
openmptcprouter/files/etc/init.d/openmptcprouter-vps
View file

@ -2124,7 +2124,7 @@ _get_token() {
[ "$(uci -q get openmptcprouter.${servername}.disabled)" = "1" ] && return [ "$(uci -q get openmptcprouter.${servername}.disabled)" = "1" ] && return
token="" token=""
_login _login
[ -z "$token" ] && { if [ -z "$token" ]; then
reason="" reason=""
test_ping() { test_ping() {
_ping_server $1 _ping_server $1
@ -2163,7 +2163,12 @@ _get_token() {
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set openmptcprouter.${servername}.admin_error=1 set openmptcprouter.${servername}.admin_error=1
EOF EOF
} else
uci -q batch <<-EOF >/dev/null
set openmptcprouter.${servername}.token_error=0
commit openmptcprouter
EOF
fi
echo "$server:$serverport:$token" echo "$server:$serverport:$token"
} }
@ -2306,6 +2311,10 @@ token() {
config_foreach _get_token server config_foreach _get_token server
} }
_fix_server() {
uci -q rename openmptcprouter.$1=server
}
start_service() { start_service() {
serversnb=0 serversnb=0
wanips="" wanips=""
@ -2313,6 +2322,7 @@ start_service() {
[ -z "$serial" ] && [ -f "/usr/sbin/dmidecode" ] && serial=$(/usr/sbin/dmidecode -t 1 | egrep 'Serial' | awk '{print $3}') [ -z "$serial" ] && [ -f "/usr/sbin/dmidecode" ] && serial=$(/usr/sbin/dmidecode -t 1 | egrep 'Serial' | awk '{print $3}')
uci -q set openmptcprouter.settings.serial=${serial} uci -q set openmptcprouter.settings.serial=${serial}
config_load openmptcprouter config_load openmptcprouter
config_foreach _fix_server openmptcprouter
config_foreach _count_server server config_foreach _count_server server
config_foreach _get_local_wan_ip interface config_foreach _get_local_wan_ip interface
config_foreach _config_service server config_foreach _config_service server