modules/admin-full: fix usage of network model in network controller
[project/luci.git] / modules / admin-full / luasrc / controller / admin / network.lua
index df2a4c4..950285d 100644 (file)
@@ -11,39 +11,64 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+
 module("luci.controller.admin.network", package.seeall)
 
 function index()
        require("luci.i18n")
        local uci = require("luci.model.uci").cursor()
        local i18n = luci.i18n.translate
+       local has_wifi = nixio.fs.stat("/etc/config/wireless")
+       local has_switch = false
+
+       uci:foreach("network", "switch",
+               function(s)
+                       has_switch = true
+                       return false
+               end
+       )
 
-       local page  = node("admin", "network")
+       local page
+
+       page = node("admin", "network")
        page.target = alias("admin", "network", "network")
        page.title  = i18n("Network")
        page.order  = 50
        page.index  = true
 
-       local page  = node("admin", "network", "vlan")
-       page.target = cbi("admin_network/vlan")
-       page.title  = i18n("Switch")
-       page.order  = 20
+       if has_switch then
+               page  = node("admin", "network", "vlan")
+               page.target = cbi("admin_network/vlan")
+               page.title  = i18n("Switch")
+               page.order  = 20
+       end
 
-       local page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), i18n("Wifi"), 15)
-       page.leaf = true
-       page.subindex = true
+       if has_wifi and has_wifi.size > 0 then
+               page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), i18n("Wifi"), 15)
+               page.leaf = true
+               page.subindex = true
 
-       local page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16)
-       page.leaf = true
+               page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16)
+               page.leaf = true
 
-       local page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil, 16)
-       page.leaf = true
+               page = entry({"admin", "network", "wireless_add"}, call("wifi_add"), nil, 16)
+               page.leaf = true
+
+               page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil, 16)
+               page.leaf = true
 
-       local page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10)
+               page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil, 16)
+               page.leaf = true
+       end
+
+       page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10)
        page.leaf   = true
        page.subindex = true
 
-       local page = entry({"admin", "network", "add"}, cbi("admin_network/iface_add"), nil)
+       page = entry({"admin", "network", "add"}, cbi("admin_network/iface_add"), nil)
+       page.leaf = true
+
+       page = entry({"admin", "network", "iface_status"}, call("iface_status"), nil)
        page.leaf = true
 
        uci:foreach("network", "interface",
@@ -57,17 +82,19 @@ function index()
                end
        )
 
-       local page  = node("admin", "network", "dhcpleases")
-       page.target = cbi("admin_network/dhcpleases")
-       page.title  = i18n("DHCP Leases")
-       page.order  = 30
+       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.order  = 30
+       end
 
-       local page  = node("admin", "network", "hosts")
+       page  = node("admin", "network", "hosts")
        page.target = cbi("admin_network/hosts")
        page.title  = i18n("Hostnames")
        page.order  = 40
 
-       local page  = node("admin", "network", "routes")
+       page  = node("admin", "network", "routes")
        page.target = cbi("admin_network/routes")
        page.title  = i18n("Static Routes")
        page.order  = 50
@@ -108,13 +135,150 @@ function wifi_join()
        end
 end
 
+function wifi_add()
+       local dev = luci.http.formvalue("device")
+       local ntm = require "luci.model.network".init()
+
+       dev = dev and ntm:get_wifidev(dev)
+
+       if dev then
+               local net = dev:add_wifinet({
+                       mode       = "ap",
+                       ssid       = "OpenWrt",
+                       encryption = "none"
+               })
+
+               ntm:save("wireless")
+               luci.http.redirect(net:adminlink())
+       end
+end
+
 function wifi_delete(network)
-       local uci = require "luci.model.uci".cursor()
-       local wlm = require "luci.model.wireless"
+       local ntm = require "luci.model.network".init()
 
-       wlm.init(uci)
-       wlm:del_network(network)
+       ntm:del_wifinet(network)
+       ntm:save("wireless")
 
-       uci:save("wireless")
        luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
 end
+
+function jsondump(x)
+       if x == nil then
+               luci.http.write("null")
+       elseif type(x) == "table" then
+               local k, v
+               if type(next(x)) == "number" then
+                       luci.http.write("[ ")
+                       for k, v in ipairs(x) do
+                               jsondump(v)
+                               if next(x, k) then
+                                       luci.http.write(", ")
+                               end
+                       end
+                       luci.http.write(" ]")
+               else
+                       luci.http.write("{ ")
+                       for k, v in pairs(x) do
+                       luci.http.write("%q: " % k)
+                               jsondump(v)
+                               if next(x, k) then
+                                       luci.http.write(", ")
+                               end
+                       end
+                       luci.http.write(" }")
+               end
+       elseif type(x) == "number" or type(x) == "boolean" then
+               luci.http.write(tostring(x))
+       elseif type(x) == "string" then
+               luci.http.write("%q" % tostring(x))
+       end
+end
+
+
+function iface_status()
+       local path = luci.dispatcher.context.requestpath
+       local x    = luci.model.uci.cursor_state()
+       local rv   = { }
+
+       local iface
+       for iface in path[#path]:gmatch("[%w%.%-]+") do
+               local dev = x:get("network", iface, "device") or ""
+               if #dev == 0 or dev:match("^%d") or dev:match("%W") then
+                       dev = x:get("network", iface, "ifname") or ""
+                       dev = dev:match("%S+")
+               end
+
+               local info
+               local data = { }
+               for _, info in ipairs(nixio.getifaddrs()) do
+                       local name = info.name:match("[^:]+")
+                       if name == dev then
+                               if info.family == "packet" then
+                                       data.flags   = info.flags
+                                       data.stats   = info.data
+                                       data.macaddr = info.addr
+                                       data.ifname  = name
+                               elseif info.family == "inet" then
+                                       data.ipaddrs = data.ipaddrs or { }
+                                       data.ipaddrs[#data.ipaddrs+1] = {
+                                               addr      = info.addr,
+                                               broadaddr = info.broadaddr,
+                                               dstaddr   = info.dstaddr,
+                                               netmask   = info.netmask,
+                                               prefix    = info.prefix
+                                       }
+                               elseif info.family == "inet6" then
+                                       data.ip6addrs = data.ip6addrs or { }
+                                       data.ip6addrs[#data.ip6addrs+1] = {
+                                               addr    = info.addr,
+                                               netmask = info.netmask,
+                                               prefix  = info.prefix
+                                       }
+                               end
+                       end
+               end
+
+               if next(data) then
+                       rv[#rv+1] = data
+               end
+       end
+
+       if #rv > 0 then
+               luci.http.prepare_content("application/json")
+               jsondump(rv)
+               return
+       end
+
+       luci.http.status(404, "No such device")
+end
+
+function wifi_status()
+       local path = luci.dispatcher.context.requestpath
+       local rv   = { }
+
+       local dev
+       for dev in path[#path]:gmatch("[%w%.%-]+") do
+               local iw = luci.sys.wifi.getiwinfo(dev)
+               if iw then
+                       local f
+                       local j = { }
+                       for _, f in ipairs({
+                               "channel", "frequency", "txpower", "bitrate", "signal", "noise",
+                               "quality", "quality_max", "mode", "ssid", "bssid", "country",
+                               "encryption", "ifname"
+                       }) do
+                               j[f] = iw[f]
+                       end
+
+                       rv[#rv+1] = j
+               end
+       end
+
+       if #rv > 0 then
+               luci.http.prepare_content("application/json")
+               jsondump(rv)
+               return
+       end
+
+       luci.http.status(404, "No such device")
+end