From 223ce87a729574acda43c418f0982fadfed99b86 Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Mon, 4 Feb 2019 20:08:49 +0100
Subject: [PATCH] Set DHCP by default for all VPNs

---
 .../luasrc/controller/openmptcprouter.lua     |  2 +-
 .../files/etc/init.d/openmptcprouter-vps      | 32 ++++++++++++++++---
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 0fef0464d..59fdc431d 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -239,7 +239,7 @@ function wizard_add()
 	if default_vpn:match("^glorytun.*") then
 		vpn_port = 65001
 		vpn_intf = "tun0"
-		ucic:set("network","omrvpn","proto","none")
+		ucic:set("network","omrvpn","proto","dhcp")
 	elseif default_vpn == "mlvpn" then
 		vpn_port = 65201
 		vpn_intf = "mlvpn0"
diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index db370db7d..12bd50622 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -173,14 +173,26 @@ _get_vps_config() {
 				EOF
 				glorytun_change=1
 			fi
+			if [ "$(uci -q get network.omrvpn.proto)" = "" ]; then
+				uci -q batch <<-EOF >/dev/null
+					set network.omrvpn.proto='none'
+					commit network
+				EOF
+			fi
 		else
 			if [ "$(uci -q get glorytun.vpn.remoteip)" != "" ] || [ "$(uci -q get glorytun.vpn.localip)" != "" ]; then
 				uci -q batch <<-EOF >/dev/null
-					del glorytun.vpn.localip
-					del glorytun.vpn.remoteip
+					delete glorytun.vpn.localip
+					delete glorytun.vpn.remoteip
 				EOF
 				glorytun_change=1
 			fi
+			if [ "$(uci -q get network.omrvpn.proto)" != "" ]; then
+				uci -q batch <<-EOF >/dev/null
+					set network.omrvpn.proto='dhcp'
+					commit network
+				EOF
+			fi
 		fi
 	fi
 	if [ "$vpn" = "glorytun_udp" ]; then
@@ -195,14 +207,26 @@ _get_vps_config() {
 				EOF
 				glorytun_change=1
 			fi
+			if [ "$(uci -q get network.omrvpn.proto)" = "" ]; then
+				uci -q batch <<-EOF >/dev/null
+					set network.omrvpn.proto='none'
+					commit network
+				EOF
+			fi
 		else
 			if [ "$(uci -q get glorytun.vpn.remoteip)" != "" ] || [ "$(uci -q get glorytun.vpn.localip)" != "" ]; then
 				uci -q batch <<-EOF >/dev/null
-					del glorytun.vpn.localip
-					del glorytun.vpn.remoteip
+					delete glorytun.vpn.localip
+					delete glorytun.vpn.remoteip
 				EOF
 				glorytun_change=1
 			fi
+			if [ "$(uci -q get network.omrvpn.proto)" != "" ]; then
+				uci -q batch <<-EOF >/dev/null
+					set network.omrvpn.proto='dhcp'
+					commit network
+				EOF
+			fi
 		fi
 	fi
 	if [ "$glorytun_change" != "0" ]; then