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%2Fdhcp.lua;h=d2984804081f8ab0ccaebdf6b52685c2d077f0f3;hp=0c01ceffca24358c9dc7f578740914ec1177e7ea;hb=28d10632a19dd50a3d0b7f7eb670d38fa1fa419c;hpb=37f4a3b90c56fea8d06833092ce6a5e2e2c2d1d1
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
index 0c01ceffc..d29848040 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -2,6 +2,7 @@
-- Licensed to the public under the Apache License 2.0.
local ipc = require "luci.ip"
+local sys = require "luci.sys"
local o
require "luci.util"
@@ -114,7 +115,7 @@ s:taboption("advanced", Flag, "nonegcache",
s:taboption("advanced", Value, "serversfile",
translate("Additional servers file"),
translate("This file may contain lines like 'server=/domain/1.2.3.4' or 'server=1.2.3.4' for"..
- "domain-specific or full upstream DNS servers."))
+ "domain-specific or full upstream DNS servers."))
s:taboption("advanced", Flag, "strictorder",
translate("Strict order"),
@@ -211,6 +212,12 @@ cq.optional = true
cq.datatype = "uinteger"
cq.placeholder = 150
+cs = s:taboption("advanced", Value, "cachesize",
+ translate("Size of DNS query cache"),
+ translate("Maximum number of cached DNS entries"))
+cs.optional = true
+cs.datatype = "uinteger"
+cs.placeholder = 150
s:taboption("tftp", Flag, "enable_tftp",
translate("Enable TFTP server")).optional = true
@@ -263,8 +270,8 @@ s = m:section(TypedSection, "host", translate("Static Leases"),
"DHCP clients. They are also required for non-dynamic interface configurations where " ..
"only hosts with a corresponding lease are served.") .. "
" ..
translate("Use the Add Button to add a new lease entry. The MAC-Address " ..
- "indentifies the host, the IPv4-Address specifies to the fixed address to " ..
- "use and the Hostname is assigned as symbolic name to the requesting host. " ..
+ "indentifies the host, the IPv4-Address specifies the fixed address to " ..
+ "use, and the Hostname is assigned as a symbolic name to the requesting host. " ..
"The optional Lease time can be used to set non-standard host-specific " ..
"lease time, e.g. 12h, 3d or infinite."))
@@ -273,7 +280,7 @@ s.anonymous = true
s.template = "cbi/tblsection"
name = s:option(Value, "name", translate("Hostname"))
-name.datatype = "hostname"
+name.datatype = "hostname('strict')"
name.rmempty = true
function name.write(self, section, value)
@@ -294,10 +301,10 @@ ip = s:option(Value, "ip", translate("DUID"))
-duid.datatype = "and(rangelength(28,36),hexstring)"
+duid.datatype = "and(rangelength(20,36),hexstring)"
fp = io.open("/var/hosts/odhcpd")
if fp then
for line in fp:lines() do
@@ -311,10 +318,10 @@ end
hostid = s:option(Value, "hostid", translate("IPv6-Suffix (hex)"))
-ipc.neighbors({ family = 4 }, function(n)
- if n.mac and n.dest then
- ip:value(n.dest:string())
- mac:value(n.mac, "%s (%s)" %{ n.mac, n.dest:string() })
+sys.net.host_hints(function(m, v4, v6, name)
+ if m and v4 then
+ ip:value(v4)
+ mac:value(m, "%s (%s)" %{ m, name or v4 })
end
end)