Merge branch 'master' of https://github.com/openwrt/luci into proto=ipv6+aiccu+fixes

3 files changed, 21 insertions, 1 deletions

diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua
index b76475828..2ed34faf7 100644
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua
@@ -6,8 +6,11 @@ local map, section, net = ...
 local mode = section:taboption("general", ListValue, "mode", translate("Category"))
 mode:value("auto", translate("Automatic"))
 mode:value("external", translate("External"))
+mode:value("internal", translate("Internal"))
+mode:value("leaf", translate("Leaf"))
 mode:value("guest", translate("Guest"))
 mode:value("adhoc", translate("Ad-Hoc"))
+mode:value("hybrid", translate("Hybrid"))
 mode.default = "auto"
 
 
diff --git a/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua
index 4e9816bea..f525061be 100644
--- a/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua
@@ -12,5 +12,5 @@ function proto.is_installed(self)
 end
 
 function proto.opkg_package(self)
-	return "hnetd"
+	return "hnet-full"
 end
diff --git a/protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua b/protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
index e0e63d863..4ed34ae3b 100644
--- a/protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
+++ b/protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
@@ -19,6 +19,23 @@ port = section:taboption("general", Value, "port", translate("VPN Server port"))
 port.placeholder = "443"
 port.datatype    = "port"
 
+ifname = section:taboption("general", Value, "interface", translate("Output Interface"))
+ifname.template = "cbi/network_netlist"
+
+defaultroute = section:taboption("advanced", Flag, "defaultroute",
+	translate("Use default gateway"),
+	translate("If unchecked, no default route is configured"))
+
+defaultroute.default = defaultroute.enabled
+
+
+metric = section:taboption("advanced", Value, "metric",
+	translate("Use gateway metric"))
+
+metric.placeholder = "0"
+metric.datatype    = "uinteger"
+metric:depends("defaultroute", defaultroute.enabled)
+
 section:taboption("general", Value, "serverhash", translate("VPN Server's certificate SHA1 hash"))
 
 section:taboption("general", Value, "authgroup", translate("AuthGroup"))