From 388c131f968aa4cae5c4632df865fd638b0729f2 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 9 Mar 2020 21:59:36 +0100
Subject: [PATCH] Fix on label

---
 .../luasrc/controller/openmptcprouter.lua                 | 8 ++++++++
 .../root/usr/libexec/rpcd/openmptcprouter                 | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 43bdefb2b..0a396f5e7 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -196,6 +196,12 @@ function wizard_add()
 			ucic:delete("qos",intf)
 			ucic:save("qos")
 			ucic:commit("qos")
+			ucic:delete("openmptcprouter",intf)
+			ucic:save("openmptcprouter")
+			ucic:commit("openmptcprouter")
+			ucic:delete("macvlan",intf)
+			ucic:save("macvlan")
+			ucic:commit("macvlan")
 			if defif ~= nil and defif ~= "" then
 				luci.sys.call("uci -q del_list vnstat.@vnstat[-1].interface=" .. defif)
 			end
@@ -209,6 +215,7 @@ function wizard_add()
 	-- Set interfaces settings
 	local interfaces = luci.http.formvaluetable("intf")
 	for intf, _ in pairs(interfaces) do
+		local label = luci.http.formvalue("cbid.network.%s.label" % intf) or ""
 		local proto = luci.http.formvalue("cbid.network.%s.proto" % intf) or "static"
 		local ipaddr = luci.http.formvalue("cbid.network.%s.ipaddr" % intf) or ""
 		local netmask = luci.http.formvalue("cbid.network.%s.netmask" % intf) or ""
@@ -217,6 +224,7 @@ function wizard_add()
 		if proto ~= "other" then
 			ucic:set("network",intf,"proto",proto)
 		end
+		ucic:set("network",intf,"label",label)
 		ucic:set("network",intf,"ipaddr",ipaddr)
 		ucic:set("network",intf,"netmask",netmask)
 		ucic:set("network",intf,"gateway",gateway)
diff --git a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
index c380e2c40..33a05b497 100755
--- a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
+++ b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
@@ -1374,7 +1374,7 @@ local methods = {
 		end
 	},
 	defaultvpn = {
-		args = { vpn = "glorytun-tcp" },
+		args = { vpn = "glorytun_tcp" },
 		call = function(args)
 			default_vpn(args.vpn)
 		end