From dfbba31e1d3a68cab8372187230f64e50678dfcc Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Fri, 22 Jun 2018 10:00:46 +0200
Subject: [PATCH] Little changes in wizard

---
 .../luasrc/controller/openmptcprouter.lua              | 10 +++++++++-
 .../luasrc/view/openmptcprouter/wizard.htm             |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 1f150bb21..b6b6a5a8e 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -23,11 +23,15 @@ function wizard_add()
 	local gostatus = true
 	if add_interface ~= "" then
 		local i = 1
+		local multipath_master = false
 		ucic:foreach("network", "interface", function(s)
 			local sectionname = s[".name"]
 			if sectionname:match("^wan(%d+)$") then
 				i = i + 1
 			end
+			if uci:get("network",sectionname,"multipath") == "master" then
+				multipath_master = true
+			end
 		end)
 		local defif = ucic:get("network","wan1","ifname") or "eth0"
 		ucic:set("network","wan" .. i,"interface")
@@ -35,7 +39,11 @@ function wizard_add()
 		ucic:set("network","wan" .. i,"proto","static")
 		ucic:set("network","wan" .. i,"type","macvlan")
 		ucic:set("network","wan" .. i,"ip4table","wan")
-		ucic:set("network","wan" .. i,"multipath","on")
+		if multipath_master then
+			ucic:set("network","wan" .. i,"multipath","on")
+		else
+			ucic:set("network","wan" .. i,"multipath","master")
+		end
 		ucic:set("network","wan" .. i,"defaultroute","0")
 		ucic:save("network")
 		ucic:commit("network")
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index cecfe55a2..6b3eabff9 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -21,7 +21,7 @@
 		    <br />
 		    <div class="cbi-value-description">
 		        <span class="cbi-value-helpicon"><img src="/luci-static/resources/cbi/help.gif" alt="help" /></span>
-		        <%:Server IP will be set for ShadowSocks, Glorytun and MLVPN%>
+		        <%:Server IP will be set for ShadowSocks, Glorytun, OpenVPN and MLVPN%>
 		    </div>
 		</div>
 	    </div>