Changeset 6952

Timestamp:

03/13/11 15:00:45 (2 years ago)

Author:

jow

Message:

modules/admin-full: use luci.tools.status in network controller

Files:

• luci/trunk/modules/admin-full/luasrc/controller/admin/network.lua (modified) (4 diffs)

luci/trunk/modules/admin-full/luasrc/controller/admin/network.lua

@@ -212 +212 @@
             local info
             local dev  = net:ifname()
-            local data = { id = iface, uptime = net:uptime() }
+            local data = {
+                id       = iface,
+                proto    = net:proto(),
+                uptime   = net:uptime(),
+                gwaddr   = net:gwaddr(),
+                dnsaddrs = net:dnsaddrs()
+            }
             for _, info in ipairs(nixio.getifaddrs()) do
                 local name = info.name:match("[^:]+")
@@ -281 +287 @@
 
         luci.sys.call("env -i /sbin/ifup %q >/dev/null 2>/dev/null" % iface)
-
-        require "luci.fs"
-        if luci.fs.access("/etc/config/radvd") then
-            luci.sys.call("/etc/init.d/radvd restart >/dev/null 2>/dev/null")
-        end
-
         luci.http.status(200, "Reconnected")
         return
@@ -329 +329 @@
     local netm  = require "luci.model.network".init()
     local path = luci.dispatcher.context.requestpath
-    local arp  = luci.sys.net.arptable()
     local rv   = { }
 
@@ -364 +363 @@
 
 function lease_status()
-    local rv = { }
-    local leasefile = "/var/dhcp.leases"
-
-    local uci = require "luci.model.uci".cursor()
-    local nfs = require "nixio.fs"
-
-    uci:foreach("dhcp", "dnsmasq",
-        function(s)
-            if s.leasefile and nfs.access(s.leasefile) then
-                leasefile = s.leasefile
-                return false
-            end
-        end)
-
-    local fd = io.open(leasefile, "r")
-    if fd then
-        while true do
-            local ln = fd:read("*l")
-            if not ln then
-                break
-            else
-                local ts, mac, ip, name = ln:match("^(%d+) (%S+) (%S+) (%S+)")
-                if ts and mac and ip and name then
-                    rv[#rv+1] = {
-                        expires  = os.difftime(tonumber(ts) or 0, os.time()),
-                        macaddr  = mac,
-                        ipaddr   = ip,
-                        hostname = (name ~= "*") and name
-                    }
-                end
-            end
-        end
-        fd:close()
-    end
+    local s = require "luci.tools.status"
 
     luci.http.prepare_content("application/json")
-    luci.http.write_json(rv)
+    luci.http.write_json(s.dhcp_leases())
 end