From 12eb96e01e3d559d1e9b267fd8b94e70946e4969 Mon Sep 17 00:00:00 2001 From: Ycarus Date: Tue, 25 Dec 2018 09:44:31 +0100 Subject: [PATCH] Fix https://github.com/Ysurac/openmptcprouter/issues/274 --- openmptcprouter/files/etc/init.d/openmptcprouter-vps | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index a327362ab..e8290b357 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -17,9 +17,9 @@ _login() { [ -z "$server" ] && server="$(uci -q get shadowsocks-libev.sss0.server)" username="$(uci -q get openmptcprouter.${servername}.username)" password="$(uci -q get openmptcprouter.${servername}.password)" - port="$(uci -q get openmptcprouter.${servername}.port)" + serverport="$(uci -q get openmptcprouter.${servername}.port)" if [ -z "$token" ]; then - auth=`curl --max-time 10 -s -k -H "Content-Type: application/json" -X POST -d '{"username":"'$username'","password":"'$password'"}' https://$server:$port/login` + auth=`curl --max-time 10 -s -k -H "Content-Type: application/json" -X POST -d '{"username":"'$username'","password":"'$password'"}' https://$server:$serverport/login` [ -z "$auth" ] && return token="$(echo "$auth" | jsonfilter -q -e '@.token')" uci -q set openmptcprouter.${servername}.token="$token" @@ -31,7 +31,7 @@ _get_json() { route=$1 [ -z "$token" ] && _login [ -n "$token" ] && { - result=`curl --max-time 10 -s -k -H "Authorization: Bearer $token" https://$server:$port/$route` + result=`curl --max-time 10 -s -k -H "Authorization: Bearer $token" https://$server:$serverport/$route` echo $result } || { echo '' @@ -44,7 +44,7 @@ _set_json() { settings="$2" [ -z "$token" ] && _login [ -n "$token" ] && { - result=`curl --max-time 10 -s -k -H "Authorization: Bearer $token" -H "Content-Type: application/json" -X POST -d "$settings" https://$server:$port/$route` + result=`curl --max-time 10 -s -k -H "Authorization: Bearer $token" -H "Content-Type: application/json" -X POST -d "$settings" https://$server:$serverport/$route` echo $result } || { echo ''