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

Get and set Glorytun chacha20 status

Browse source
This commit is contained in:
Ycarus 2019-05-23 21:57:07 +02:00
parent c172b096e3
commit f5b1b641c7
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,15 +57,22 @@ _set_glorytun_vps() {
[ "$enabled" != "1" ] && return [ "$enabled" != "1" ] && return
port="$(uci -q get glorytun.vpn.port)" port="$(uci -q get glorytun.vpn.port)"
key="$(uci -q get glorytun.vpn.key)" key="$(uci -q get glorytun.vpn.key)"
chacha="$(uci -q get glorytun.vpn.chacha20)"
if [ "$chacha" = "1" ]; then
chacha = "true"
else
chacha = "false"
fi
[ -z "$key" ] && return [ -z "$key" ] && return
local current_port current_key local current_port current_key current_chacha
[ -z "$vps_config" ] && vps_config=$(_get_json "config") [ -z "$vps_config" ] && vps_config=$(_get_json "config")
[ -z "$vps_config" ] && return [ -z "$vps_config" ] && return
current_port="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.port')" current_port="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.port')"
current_key="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.key')" current_key="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.key')"
if [ "$current_port" != "$port" ] || [ "$current_key" != "$key" ]; then current_chacha="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.chacha')"
if [ "$current_port" != "$port" ] || [ "$current_key" != "$key" ] || [ "$current_chacha" != "$chacha" ]; then
local settings local settings
settings='{"port": '$port',"key":"'$key'"}' settings='{"port": '$port',"key":"'$key'", "chacha": "'$chacha'"}'
_set_json "glorytun" "$settings" _set_json "glorytun" "$settings"
fi fi
} }
@ -403,10 +410,14 @@ _set_config_from_vps() {
fi fi
glorytun_port="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.port')" glorytun_port="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.port')"
[ -z "$glorytun_port" ] && glorytun_port="65001" [ -z "$glorytun_port" ] && glorytun_port="65001"
glorytun_chacha="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.chacha')"
[ -z "$glorytun_chacha" ] || [ "$glorytun_chacha" = "true" ] && glorytun_chacha=1
[ "$glorytun_chacha" = "false" ] && glorytun_chacha=0
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set glorytun.vpn.port=$glorytun_port set glorytun.vpn.port=$glorytun_port
set glorytun.vpn.key=$glorytun_key set glorytun.vpn.key=$glorytun_key
set glorytun.vpn.enable=$glorytun_state set glorytun.vpn.enable=$glorytun_state
set glorytun.vpn.chacha20=$glorytun_chacha
commit glorytun commit glorytun
EOF EOF
/etc/init.d/glorytun restart >/dev/null 2>&1 /etc/init.d/glorytun restart >/dev/null 2>&1