modules/admin-full: Reworked DHCP configuration

4 files changed, 114 insertions, 21 deletions

diff --git a/modules/admin-core/luasrc/tools/webadmin.lua b/modules/admin-core/luasrc/tools/webadmin.lua
index 57941c966..0f7612ff7 100644
--- a/modules/admin-core/luasrc/tools/webadmin.lua
+++ b/modules/admin-core/luasrc/tools/webadmin.lua
@@ -29,6 +29,33 @@ function byte_format(byte)
 	end
 end
 
+function date_format(secs)
+	local suff = {"min", "h", "d"}
+	local mins = 0
+	local hour = 0
+	local days = 0
+	if secs > 60 then
+		mins = math.floor(secs / 60)
+		secs = secs % 60
+	end
+	
+	if mins > 60 then
+		hour = math.floor(mins / 60)
+		mins = mins % 60
+	end
+	
+	if hour > 24 then
+		days = math.floor(hours / 24)
+		hour = hour % 24
+	end
+	
+	if days > 0 then
+		return string.format("%dd %02dh %02dmin %02ds", days, hour, mins, secs)
+	else
+		return string.format("%02dh %02dmin %02ds", hour, mins, secs)
+	end
+end
+
 function network_get_addresses(net)
 	local addr = {}
 	local ipv4 = luci.model.uci.get_statevalue("network", net, "ipaddr")
diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index 76145294c..a4b070c02 100644
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -20,12 +20,12 @@ function index()
 
 	local page  = node("admin", "network")
 	page.target = template("admin_network/index")
-	page.title  = i18n("network", "Netzwerk")  
+	page.title  = i18n("network")  
 	page.order  = 50
 	
 	local page  = node("admin", "network", "vlan")
 	page.target = cbi("admin_network/vlan")
-	page.title  = i18n("a_n_switch", "Switch")
+	page.title  = i18n("a_n_switch")
 	page.order  = 20
 	
 	local page  = node("admin", "network", "network")
@@ -52,6 +52,12 @@ function index()
 	page.title  = "DHCP"
 	page.order  = 30
 	
+	entry(
+	 {"admin", "network", "dhcp", "leases"},
+	 cbi("admin_network/dhcpleases"),
+	 i18n("dhcp_leases")
+	) 
+	
 	local page  = node("admin", "network", "routes")
 	page.target = cbi("admin_network/routes")
 	page.title  = i18n("a_n_routes")
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
index f2f2e4742..af018eaa8 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -13,7 +13,6 @@ $Id$
 ]]--
 require("luci.tools.webadmin")
 require("luci.model.uci")
-require("luci.sys")
 require("luci.util")
 
 m = Map("dhcp", "DHCP")
@@ -68,21 +67,4 @@ for i, n in ipairs(s.children) do
 	end
 end
 
-
-m2 = Map("luci_ethers", translate("luci_ethers"))
-
-s = m2:section(TypedSection, "static_lease", "")
-s.addremove = true
-s.anonymous = true
-s.template = "cbi/tblsection"
-
-mac = s:option(Value, "macaddr", translate("macaddress"))
-ip = s:option(Value, "ipaddr", translate("ipaddress"))
-for i, dataset in ipairs(luci.sys.net.arptable()) do
-	ip:value(dataset["IP address"])
-	mac:value(dataset["HW address"],
-	 dataset["HW address"] .. " (" .. dataset["IP address"] .. ")")
-end
-
-	
-return m, m2
+return m
\ No newline at end of file
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua
new file mode 100644
index 000000000..8ff1f5293
--- /dev/null
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua
@@ -0,0 +1,78 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+require("luci.sys")
+require("luci.tools.webadmin")
+m2 = Map("luci_ethers", translate("dhcp_leases"))
+
+local leasefn, leasefp, leases
+luci.model.uci.foreach("dhcp", "dnsmasq",
+ function(section)
+ 	leasefn = section.leasefile
+ end
+) 
+local leasefp = leasefn and luci.fs.access(leasefn) and io.lines(leasefn)
+if leasefp then
+	leases = {}
+	for lease in leasefp do
+		table.insert(leases, luci.util.split(lease, " "))
+	end
+end
+
+if leases then
+	v = m2:section(TypedSection, "_virtual", translate("dhcp_leases_active"))
+	v.anonymous = true
+	v.rowcolors = true
+	v.template  = "cbi/tblsection"
+	
+	function v.cfgsections(self)
+		local sections = {}
+		for i=1,#leases do
+			table.insert(sections, i)
+		end
+		return sections
+	end
+	
+	ip = v:option(DummyValue, "ip", translate("ipaddress"))
+	function ip.cfgvalue(self, section)
+		return leases[section][3]
+	end
+	
+	mac  = v:option(DummyValue, "mac", translate("macaddress"))
+	function mac.cfgvalue(self, section)
+		return leases[section][2]
+	end
+	
+	ltime = v:option(DummyValue, "time", translate("dhcp_timeremain"))
+	function ltime.cfgvalue(self, section)
+		return luci.tools.webadmin.date_format(
+		 os.difftime(tonumber(leases[section][1]), os.time())
+		)
+	end
+end
+
+s = m2:section(TypedSection, "static_lease", translate("luci_ethers"))
+s.addremove = true
+s.anonymous = true
+s.template = "cbi/tblsection"
+
+mac = s:option(Value, "macaddr", translate("macaddress"))
+ip = s:option(Value, "ipaddr", translate("ipaddress"))
+for i, dataset in ipairs(luci.sys.net.arptable()) do
+	ip:value(dataset["IP address"])
+	mac:value(dataset["HW address"],
+	 dataset["HW address"] .. " (" .. dataset["IP address"] .. ")")
+end
+
+	
+return m2