X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-mod-admin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Froutes.lua;h=1970f36a28f0abbf82317eb764104ffa631f9f2f;hp=01580f1016ad607026155cf6753d1787637fbcb0;hb=6c5bfff53c7736c50238576a2c3a746b887c7a10;hpb=7a3493b1f7d75a3945279115324cf2ff4da26b7b

diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/routes.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/routes.lua
index 01580f101..1970f36a2 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/routes.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/routes.lua
@@ -1,14 +1,14 @@
 -- Copyright 2008 Steven Barth <steven@midlink.org>
 -- Licensed to the public under the Apache License 2.0.
 
-require("luci.tools.webadmin")
+local wa = require "luci.tools.webadmin"
+local fs = require "nixio.fs"
+
 m = Map("network",
 	translate("Routes"),
 	translate("Routes specify over which interface and gateway a certain host or network " ..
 		"can be reached."))
 
-local routes6 = luci.sys.net.routes6()
-
 s = m:section(TypedSection, "route", translate("Static IPv4 Routes"))
 s.addremove = true
 s.anonymous = true
@@ -16,7 +16,7 @@ s.anonymous = true
 s.template  = "cbi/tblsection"
 
 iface = s:option(ListValue, "interface", translate("Interface"))
-luci.tools.webadmin.cbi_add_networks(iface)
+wa.cbi_add_networks(iface)
 
 t = s:option(Value, "target", translate("Target"), translate("Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"))
 t.datatype = "ip4addr"
@@ -34,14 +34,28 @@ g.rmempty = true
 metric = s:option(Value, "metric", translate("Metric"))
 metric.placeholder = 0
 metric.datatype = "range(0,255)"
+metric.size = 5
 metric.rmempty = true
 
 mtu = s:option(Value, "mtu", translate("MTU"))
 mtu.placeholder = 1500
 mtu.datatype = "range(64,9000)"
+mtu.size = 5
 mtu.rmempty = true
 
-if routes6 then
+routetype = s:option(Value, "type", translate("Route type"))
+routetype:value("", "unicast")
+routetype:value("local", "local")
+routetype:value("broadcast", "broadcast")
+routetype:value("multicast", "multicast")
+routetype:value("unreachable", "unreachable")
+routetype:value("prohibit", "prohibit")
+routetype:value("blackhole", "blackhole")
+routetype:value("anycast", "anycast")
+routetype.default = ""
+routetype.rmempty = true
+
+if fs.access("/proc/net/ipv6_route") then
 	s = m:section(TypedSection, "route6", translate("Static IPv6 Routes"))
 	s.addremove = true
 	s.anonymous = true
@@ -49,7 +63,7 @@ if routes6 then
 	s.template  = "cbi/tblsection"
 
 	iface = s:option(ListValue, "interface", translate("Interface"))
-	luci.tools.webadmin.cbi_add_networks(iface)
+	wa.cbi_add_networks(iface)
 
 	t = s:option(Value, "target", translate("Target"), translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"))
 	t.datatype = "ip6addr"
@@ -62,12 +76,26 @@ if routes6 then
 	metric = s:option(Value, "metric", translate("Metric"))
 	metric.placeholder = 0
 	metric.datatype = "range(0,65535)" -- XXX: not sure
+	metric.size = 5
 	metric.rmempty = true
 
 	mtu = s:option(Value, "mtu", translate("MTU"))
 	mtu.placeholder = 1500
 	mtu.datatype = "range(64,9000)"
+	mtu.size = 5
 	mtu.rmempty = true
+
+	routetype = s:option(Value, "type", translate("Route type"))
+	routetype:value("", "unicast")
+	routetype:value("local", "local")
+	routetype:value("broadcast", "broadcast")
+	routetype:value("multicast", "multicast")
+	routetype:value("unreachable", "unreachable")
+	routetype:value("prohibit", "prohibit")
+	routetype:value("blackhole", "blackhole")
+	routetype:value("anycast", "anycast")
+	routetype.default = ""
+	routetype.rmempty = true
 end