1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00

Add VPN support

This commit is contained in:
Ycarus (Yannick Chabanois) 2019-06-24 19:54:43 +02:00
parent fc2d50366c
commit 11140a8a2d

View file

@ -343,6 +343,18 @@ _set_mptcp_vps() {
fi fi
} }
_set_vpn_vps() {
local settings
[ -z "$vps_config" ] && vps_config=$(_get_json "config")
[ -z "$vps_config" ] && return
vpn_current="$(echo "$vps_config" | jsonfilter -q -e '@.vps.current')"
vpn="$(uci -q get openmptcprouter.settings.vpn)"
if [ "$vpn_current" != "$vpn" ]; then
settings='{"vpn" : "'$vpnd'"}'
_set_json "vpn" "$settings"
fi
}
_set_ss_redir() { _set_ss_redir() {
local option=$2 local option=$2
local value=$3 local value=$3
@ -519,6 +531,12 @@ _set_config_from_vps() {
commit iperf commit iperf
EOF EOF
# Set current VPN
current_vpn="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.current')"
uci -q batch <<-EOF >/dev/null
set openmptcprouter.settings.vpn=${current_vpn}
EOF
# Get available server # Get available server
available_vpn="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.available' | sed -e 's/\[ //' -e 's/ \]//' -e 's/,//g')" available_vpn="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.available' | sed -e 's/\[ //' -e 's/ \]//' -e 's/,//g')"
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
@ -589,6 +607,7 @@ _config_service() {
fi fi
_set_redirect_ports_from_vps $redirect_port _set_redirect_ports_from_vps $redirect_port
_set_mptcp_vps _set_mptcp_vps
_set_vpn_vps
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set openmptcprouter.${servername}.admin_error=0 set openmptcprouter.${servername}.admin_error=0
EOF EOF