From: Paul Oranje <p.oranje@xs4all.nl>
Date: Fri, 6 Feb 2015 11:04:58 +0000 (+0100)
Subject: luci-proto-ipv6: aiccu improvements
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=c8fe297dc97d5e830fb20ade49b686950c1dd315

luci-proto-ipv6: aiccu improvements

- option heartbeat as tunnel type (heartbeat or AYIYA) (inspired by
idea of openwrt forum user thefRont)
- another typo fix in the mtu option
---

diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_aiccu.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_aiccu.lua
index 567663981..c7629cd67 100644
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_aiccu.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_aiccu.lua
@@ -57,18 +57,12 @@ ip6prefix.datatype = "ip6prefix"
 ip6prefix.optional = true
 
 
-requiretls = section:taboption("general", Flag, "requiretls",
-	translate("Require TLS"),
-	translate("Connection to server fails when TLS cannot be used"))
-requiretls.optional = true
-requiretls.default = requiretls.enabled
-
-
-heartbeat = section:taboption("general", Flag, "heartbeat",
-	translate("Make heartbeats"),
-	translate("Use when IPv4 address of local WAN may change dynamically, does not apply to static tunnels"))
-heartbeat.optional = true
-heartbeat.default = heartbeat.enabled
+heartbeat = s:taboption("general", ListValue, "heartbeat",
+        translate("Tunnel type"),
+	translate("Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison\">Tunneling Comparison</a> on SIXXS"))
+heartbeat:value("0", translate("AYIYA"))
+heartbeat:value("1", translate("Heartbeat"))
+heartbeat.default = "0"
 
 
 nat = section:taboption("general", Flag, "nat",
@@ -78,6 +72,13 @@ nat.optional = true
 nat.default = disabled
 
 
+requiretls = section:taboption("general", Flag, "requiretls",
+	translate("Require TLS"),
+	translate("Connection to server fails when TLS cannot be used"))
+requiretls.optional = true
+requiretls.default = requiretls.enabled
+
+
 verbose = section:taboption("advanced", Flag, "verbose",
 	translate("Verbose"),
 	translate("Verbose logging by aiccu daemon"))
@@ -128,7 +129,7 @@ ttl.placeholder = "64"
 
 
 mtu = section:taboption("advanced", Value, "mtu",
-	translate("Use MTU on tunnel interface"))
+	translate("Use MTU on tunnel interface"),
         translate("minimum 1280, maximum 1480"))
 mtu.datatype = "range(1280,1480)"
 mtu.placeholder = "1280"