modules/admin-full: merge services/dnsmasq and network/dhcpleases into network/dhcp

[project/luci.git] / modules / admin-full / luasrc / controller / admin / network.lua

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index ebe8af8..76d4320 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -2,6 +2,7 @@
 LuCI - Lua Configuration Interface
 
 Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,6 +18,7 @@ module("luci.controller.admin.network", package.seeall)
 function index()
        require("luci.i18n")
        local uci = require("luci.model.uci").cursor()
+       local net = require "luci.model.network".init(uci)
        local i18n = luci.i18n.translate
        local has_wifi = nixio.fs.stat("/etc/config/wireless")
        local has_switch = false
@@ -59,6 +61,18 @@ function index()
 
                page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil, 16)
                page.leaf = true
+
+               local wdev
+               for _, wdev in ipairs(net:get_wifidevs()) do
+                       local wnet
+                       for _, wnet in ipairs(wdev:get_wifinets()) do
+                               entry(
+                                       {"admin", "network", "wireless", wnet:id()},
+                                       alias("admin", "network", "wireless"),
+                                       wdev:name() .. ": " .. wnet:shortname()
+                               )
+                       end
+               end
        end
 
        page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10)
@@ -92,9 +106,9 @@ function index()
        )
 
        if nixio.fs.access("/etc/config/dhcp") then
-               page = node("admin", "network", "dhcpleases")
-               page.target = cbi("admin_network/dhcpleases")
-               page.title  = i18n("DHCP Leases")
+               page = node("admin", "network", "dhcp")
+               page.target = cbi("admin_network/dhcp")
+               page.title  = i18n("DHCP and DNS")
                page.order  = 30
 
                page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
@@ -193,12 +207,18 @@ function iface_status()
        local rv   = { }
 
        local iface
-       for iface in path[#path]:gmatch("[%w%.%-]+") do
+       for iface in path[#path]:gmatch("[%w%.%-_]+") do
                local net = netm:get_network(iface)
                if net then
                        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("[^:]+")
                                if name == dev then
@@ -308,24 +328,12 @@ end
 
 function wifi_status()
        local path = luci.dispatcher.context.requestpath
-       local arp  = luci.sys.net.arptable()
+       local s    = require "luci.tools.status"
        local rv   = { }
 
        local dev
        for dev in path[#path]:gmatch("[%w%.%-]+") do
-               local j = { id = dev }
-               local iw = luci.sys.wifi.getiwinfo(dev)
-               if iw then
-                       local f
-                       for _, f in ipairs({
-                               "channel", "frequency", "txpower", "bitrate", "signal", "noise",
-                               "quality", "quality_max", "mode", "ssid", "bssid", "country",
-                               "encryption", "ifname", "assoclist"
-                       }) do
-                               j[f] = iw[f]
-                       end
-               end
-               rv[#rv+1] = j
+               rv[#rv+1] = s.wifi_network(dev)
        end
 
        if #rv > 0 then
@@ -338,43 +346,10 @@ function wifi_status()
 end
 
 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
 
 function diag_command(cmd)