From: Florian Eckert <fe@dev.tdt.de>
Date: Mon, 14 Oct 2019 08:44:25 +0000 (+0200)
Subject: luci-app-openvpn: add missing proto param for ipv6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fpull%2F3179%2Fhead;p=oweals%2Fluci.git

luci-app-openvpn: add missing proto param for ipv6

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---

diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
index 86a76d5c8..54f082a1f 100644
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
@@ -47,10 +47,6 @@ local basicParams = {
 		"keepalive",
 		"10 60",
 		translate("Helper directive to simplify the expression of --ping and --ping-restart in server mode configurations") },
-	{ ListValue,
-		"proto",
-		{ "udp", "tcp-client", "tcp-server" },
-		translate("Use protocol") },
 	{ Flag,
 		"client",
 		0,
@@ -93,6 +89,20 @@ local basicParams = {
 		translate("Local private key") },
 }
 
+local has_ipv6 = fs.access("/proc/net/ipv6_route")
+if has_ipv6 then
+	table.insert( basicParams, { ListValue,
+		"proto",
+		{ "udp", "tcp-client", "tcp-server", "udp6", "tcp6-client", "tcp6-server" },
+		translate("Use protocol")
+	})
+else
+	table.insert( basicParams, { ListValue,
+		"proto",
+		{ "udp", "tcp-client", "tcp-server" },
+		translate("Use protocol")
+	})
+end
 
 local m = Map("openvpn")
 m.redirect = luci.dispatcher.build_url("admin", "vpn", "openvpn")