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

Fix get VPN port

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2020-01-10 20:26:29 +01:00
parent 09f59a13f6
commit 40b321bbc6
1 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -178,6 +178,13 @@ _get_vps_config() {
uci -q set glorytun.vpn.proto='tcp' uci -q set glorytun.vpn.proto='tcp'
client_ip="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.tcp.client_ip')" client_ip="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.tcp.client_ip')"
host_ip="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.tcp.host_ip')" host_ip="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.tcp.host_ip')"
port="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.tcp.port')"
if [ "$(uci -q get glorytun.vpn.port)" != "$port" ]; then
uci -q batch <<-EOF >/dev/null
set glorytun.vpn.port=$port
EOF
glorytun_change=1
fi
if [ "$client_ip" != "dhcp" ] && [ -n "$client_ip" ]; then if [ "$client_ip" != "dhcp" ] && [ -n "$client_ip" ]; then
if [ "$host_ip" != "$(uci -q get glorytun.vpn.remoteip)" ] || [ "$client_ip" != "$(uci -q get glorytun.vpn.localip)" ]; then if [ "$host_ip" != "$(uci -q get glorytun.vpn.remoteip)" ] || [ "$client_ip" != "$(uci -q get glorytun.vpn.localip)" ]; then
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
@ -215,6 +222,12 @@ _get_vps_config() {
uci -q set glorytun.vpn.proto='udp' uci -q set glorytun.vpn.proto='udp'
client_ip="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.udp.client_ip')" client_ip="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.udp.client_ip')"
host_ip="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.udp.host_ip')" host_ip="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.udp.host_ip')"
port="$(echo "$vps_config" | jsonfilter -q -e '@.glorytun.tcp.port')"
if [ "$(uci -q get glorytun.vpn.port)" != "$port" ]; then
uci -q batch <<-EOF >/dev/null
set glorytun.vpn.port=$port
EOF
fi
if [ "$client_ip" != "dhcp" ] && [ -n "$client_ip" ]; then if [ "$client_ip" != "dhcp" ] && [ -n "$client_ip" ]; then
if [ "$host_ip" != "$(uci -q get glorytun.vpn.remoteip)" ] || [ "$client_ip" != "$(uci -q get glorytun.vpn.localip)" ]; then if [ "$host_ip" != "$(uci -q get glorytun.vpn.remoteip)" ] || [ "$client_ip" != "$(uci -q get glorytun.vpn.localip)" ]; then
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
@ -264,6 +277,14 @@ _get_vps_config() {
logger -t "OMR-VPS" "Restart OpenVPN..." logger -t "OMR-VPS" "Restart OpenVPN..."
/etc/init.d/openvpn restart /etc/init.d/openvpn restart
fi fi
port="$(echo "$vps_config" | jsonfilter -q -e '@.dsvpn.port')"
if [ "$(uci -q get dsvpn.vpn.port)" != "$port" ]; then
uci -q batch <<-EOF >/dev/null
set dsvpn.vpn.port=$port
commit dsvpn
EOF
fi
if [ "$(uci -q get dsvpn.vpn.host)" != "127.0.0.1" ] && [ "$(uci -q get dsvpn.vpn.host)" != "$vpsip" ]; then if [ "$(uci -q get dsvpn.vpn.host)" != "127.0.0.1" ] && [ "$(uci -q get dsvpn.vpn.host)" != "$vpsip" ]; then
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set dsvpn.vpn.host="$vpsip" set dsvpn.vpn.host="$vpsip"