From 8926cb070f1809e818c2475fbf7613b561322a77 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 12 Aug 2019 21:48:51 +0200
Subject: [PATCH] Small changes for VPN

---
 .../root/usr/libexec/rpcd/openmptcprouter        |  2 +-
 .../files/etc/init.d/openmptcprouter-vps         | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
index bd29777e9..33c644cda 100755
--- a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
+++ b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
@@ -760,7 +760,7 @@ function interfaces_status()
 	mArray.openmptcprouter["tun_service"] = false
 	mArray.openmptcprouter["tun_state"] = ""
 	mArray.openmptcprouter["tun6_state"] = ""
-	if string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?glorytun(-udp)?$'"), "%d+") or string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?mlvpn?$'"), "%d+") or string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?openvpn?$'"), "%d+") then
+	if string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?glorytun(-udp)?$'"), "%d+") or string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?dsvpn?$'"), "%d+") or string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?mlvpn?$'"), "%d+") or string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?openvpn?$'"), "%d+") then
 		mArray.openmptcprouter["tun_service"] = true
 		mArray.openmptcprouter["tun_ip"] = get_ip("omrvpn")
 		local tun_dev = uci:get("network","omrvpn","ifname")
diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 77daae70b..b30f2fd26 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -424,14 +424,16 @@ _set_config_from_vps() {
 	[ -z "$vps_config" ] && return
 
 	# Set current VPN
-	current_vpn="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.current')"
-	if [ -n "$current_vpn" ]; then
-		uci -q batch <<-EOF >/dev/null
-			set openmptcprouter.settings.vpn=${current_vpn}
-		EOF
-	fi
 	current_vpn="$(uci -q get openmptcprouter.settings.vpn)"
-
+	if [ -z "$current_vpn" ] || [ -n "$vps_lastchange" ]; then
+		current_vpn="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.current')"
+		if [ -n "$current_vpn" ]; then
+			uci -q batch <<-EOF >/dev/null
+			set openmptcprouter.settings.vpn=${current_vpn}
+			commit openmptcprouter
+			EOF
+		fi
+	fi
 
 	# Shadowsocks settings
 	shadowsocks_disabled="$(uci -q get openmptcprouter.settings.shadowsocks_disable)"