modules/admin-full: merge services/dnsmasq and network/dhcpleases into network/dhcp
[project/luci.git] / modules / admin-full / luasrc / controller / admin / network.lua
index bb88068..76d4320 100644 (file)
@@ -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.
@@ -11,51 +12,86 @@ 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 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
+
+       uci:foreach("network", "switch",
+               function(s)
+                       has_switch = true
+                       return false
+               end
+       )
+
+       local page
 
-       local page  = node("admin", "network")
+       page = node("admin", "network")
        page.target = alias("admin", "network", "network")
-       page.title  = i18n("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("a_n_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
+
+       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"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), i18n("wifi"), 15)
-       page.i18n   = "wifi"
-       page.leaf = true
-       page.subindex = true
+               page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16)
+               page.leaf = true
 
-       uci:foreach("wireless", "wifi-device",
-               function (section)
-                       local ifc = section[".name"]
-                               entry({"admin", "network", "wireless", ifc},
-                                true,
-                                ifc:upper()).i18n = "wifi"
+               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
+
+               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
 
-       local page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16)
-       page.i18n = "wifi"
+       page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10)
+       page.leaf   = true
+       page.subindex = true
+
+       page = entry({"admin", "network", "iface_add"}, cbi("admin_network/iface_add"), nil)
        page.leaf = true
 
-       local page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil, 16)
-       page.i18n = "wifi"
+       page = entry({"admin", "network", "iface_delete"}, call("iface_delete"), nil)
        page.leaf = true
 
-       local page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("interfaces", "Schnittstellen"), 10)
-       page.leaf   = true
-       page.subindex = true
+       page = entry({"admin", "network", "iface_status"}, call("iface_status"), nil)
+       page.leaf = true
 
-       local page = entry({"admin", "network", "add"}, cbi("admin_network/iface_add"), nil)
+       page = entry({"admin", "network", "iface_reconnect"}, call("iface_reconnect"), nil)
+       page.leaf = true
+
+       page = entry({"admin", "network", "iface_shutdown"}, call("iface_shutdown"), nil)
        page.leaf = true
 
        uci:foreach("network", "interface",
@@ -69,28 +105,39 @@ function index()
                end
        )
 
-       local page  = node("admin", "network", "dhcp")
-       page.target = cbi("admin_network/dhcp")
-       page.title  = "DHCP"
-       page.order  = 30
-       page.subindex = true
+       if nixio.fs.access("/etc/config/dhcp") then
+               page = node("admin", "network", "dhcp")
+               page.target = cbi("admin_network/dhcp")
+               page.title  = i18n("DHCP and DNS")
+               page.order  = 30
 
-       entry(
-        {"admin", "network", "dhcp", "leases"},
-        cbi("admin_network/dhcpleases"),
-        i18n("dhcp_leases")
-       )
+               page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
+               page.leaf = true
 
-       local page  = node("admin", "network", "hosts")
-       page.target = cbi("admin_network/hosts")
-       page.title  = i18n("hostnames", "Hostnames")
-       page.order  = 40
+               page = node("admin", "network", "hosts")
+               page.target = cbi("admin_network/hosts")
+               page.title  = i18n("Hostnames")
+               page.order  = 40
+       end
 
-       local page  = node("admin", "network", "routes")
+       page  = node("admin", "network", "routes")
        page.target = cbi("admin_network/routes")
-       page.title  = i18n("a_n_routes_static")
+       page.title  = i18n("Static Routes")
        page.order  = 50
 
+       page = node("admin", "network", "diagnostics")
+       page.target = template("admin_network/diagnostics")
+       page.title  = i18n("Diagnostics")
+       page.order  = 60
+
+       page = entry({"admin", "network", "diag_ping"}, call("diag_ping"), nil)
+       page.leaf = true
+
+       page = entry({"admin", "network", "diag_nslookup"}, call("diag_nslookup"), nil)
+       page.leaf = true
+
+       page = entry({"admin", "network", "diag_traceroute"}, call("diag_traceroute"), nil)
+       page.leaf = true
 end
 
 function wifi_join()
@@ -107,87 +154,237 @@ function wifi_join()
        local ssid = param("join")
 
        if dev and ssid then
-               local wep     = (tonumber(param("wep")) == 1)
-               local wpa     = tonumber(param("wpa_version")) or 0
-               local channel = tonumber(param("channel"))
-               local mode    = param("mode")
-               local bssid   = param("bssid")
+               local cancel  = (param("cancel") or param("cbi.cancel")) and true or false
 
-               local confirm = (param("confirm") == "1")
-               local cancel  = param("cancel") and true or false
+               if cancel then
+                       luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless_join?device=" .. dev))
+               else
+                       local cbi = require "luci.cbi"
+                       local tpl = require "luci.template"
+                       local map = luci.cbi.load("admin_network/wifi_add")[1]
+
+                       if map:parse() ~= cbi.FORM_DONE then
+                               tpl.render("header")
+                               map:render()
+                               tpl.render("footer")
+                       end
+               end
+       else
+               luci.template.render("admin_network/wifi_join")
+       end
+end
 
-               if confirm and not cancel then
-                       local fixed_bssid = (param("fixed_bssid") == "1")
-                       local replace_net = (param("replace_net") == "1")
-                       local autoconnect = (param("autoconnect") == "1")
-                       local attach_intf = param("attach_intf")
+function wifi_add()
+       local dev = luci.http.formvalue("device")
+       local ntm = require "luci.model.network".init()
 
-                       local uci = require "luci.model.uci".cursor()
+       dev = dev and ntm:get_wifidev(dev)
 
-                       if replace_net then
-                               uci:delete_all("wireless", "wifi-iface")
-                       end
+       if dev then
+               local net = dev:add_wifinet({
+                       mode       = "ap",
+                       ssid       = "OpenWrt",
+                       encryption = "none"
+               })
 
-                       local wificonf = {
-                               device  = dev,
-                               mode    = (mode == "Ad-Hoc" and "adhoc" or "sta"),
-                               ssid    = ssid
-                       }
+               ntm:save("wireless")
+               luci.http.redirect(net:adminlink())
+       end
+end
 
-                       if attach_intf and uci:get("network", attach_intf) == "interface" then
-                               -- target network already has a interface, make it a bridge
-                               uci:set("network", attach_intf, "type", "bridge")
-                               uci:save("network")
-                               uci:commit("network")
+function wifi_delete(network)
+       local ntm = require "luci.model.network".init()
+
+       ntm:del_wifinet(network)
+       ntm:save("wireless")
 
-                               wificonf.network = attach_intf
+       luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
+end
 
-                               if autoconnect then
-                                       require "luci.sys".call("/sbin/ifup " .. attach_intf)
+function iface_status()
+       local path = luci.dispatcher.context.requestpath
+       local netm = require "luci.model.network".init()
+       local rv   = { }
+
+       local iface
+       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,
+                               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
+                                       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 fixed_bssid then
-                               wificonf.bssid = bssid
+                       if next(data) then
+                               rv[#rv+1] = data
                        end
+               end
+       end
+
+       if #rv > 0 then
+               luci.http.prepare_content("application/json")
+               luci.http.write_json(rv)
+               return
+       end
 
-                       if wep then
-                               wificonf.encryption = "wep"
-                               wificonf.key = param("key")
-                       elseif wpa > 0 then
-                               wificonf.encryption = param("wpa_suite")
-                               wificonf.key = param("key")
+       luci.http.status(404, "No such device")
+end
+
+function iface_reconnect()
+       local path  = luci.dispatcher.context.requestpath
+       local iface = path[#path]
+       local netmd = require "luci.model.network".init()
+
+       local net = netmd:get_network(iface)
+       if net then
+               local ifn
+               for _, ifn in ipairs(net:get_interfaces()) do
+                       local wnet = ifn:get_wifinet()
+                       if wnet then
+                               local wdev = wnet:get_device()
+                               if wdev then
+                                       luci.sys.call(
+                                               "env -i /sbin/wifi up %q >/dev/null 2>/dev/null"
+                                                       % wdev:name()
+                                       )
+
+                                       luci.http.status(200, "Reconnected")
+                                       return
+                               end
                        end
+               end
+
+               luci.sys.call("env -i /sbin/ifup %q >/dev/null 2>/dev/null" % iface)
+               luci.http.status(200, "Reconnected")
+               return
+       end
+
+       luci.http.status(404, "No such interface")
+end
+
+function iface_shutdown()
+       local path  = luci.dispatcher.context.requestpath
+       local iface = path[#path]
+       local netmd = require "luci.model.network".init()
+
+       local net = netmd:get_network(iface)
+       if net then
+               luci.sys.call("env -i /sbin/ifdown %q >/dev/null 2>/dev/null" % iface)
+               luci.http.status(200, "Shutdown")
+               return
+       end
+
+       luci.http.status(404, "No such interface")
+end
+
+function iface_delete()
+       local path  = luci.dispatcher.context.requestpath
+       local iface = path[#path]
+       local netmd = require "luci.model.network".init()
+
+       local net = netmd:del_network(iface)
+       if net then
+               luci.sys.call("env -i /sbin/ifdown %q >/dev/null 2>/dev/null" % iface)
+               luci.http.redirect(luci.dispatcher.build_url("admin/network/network"))
+               netmd:commit("network")
+               netmd:commit("wireless")
+               return
+       end
+
+       luci.http.status(404, "No such interface")
+end
+
+function wifi_status()
+       local path = luci.dispatcher.context.requestpath
+       local s    = require "luci.tools.status"
+       local rv   = { }
+
+       local dev
+       for dev in path[#path]:gmatch("[%w%.%-]+") do
+               rv[#rv+1] = s.wifi_network(dev)
+       end
 
-                       local s = uci:section("wireless", "wifi-iface", nil, wificonf)
-                       uci:delete("wireless", dev, "disabled")
-                       uci:set("wireless", dev, "channel", channel)
+       if #rv > 0 then
+               luci.http.prepare_content("application/json")
+               luci.http.write_json(rv)
+               return
+       end
+
+       luci.http.status(404, "No such device")
+end
+
+function lease_status()
+       local s = require "luci.tools.status"
+
+       luci.http.prepare_content("application/json")
+       luci.http.write_json(s.dhcp_leases())
+end
 
-                       uci:save("wireless")
-                       uci:commit("wireless")
+function diag_command(cmd)
+       local path = luci.dispatcher.context.requestpath
+       local addr = path[#path]
 
-                       if autoconnect then
-                               require "luci.sys".call("/sbin/wifi")
+       if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then
+               luci.http.prepare_content("text/plain")
+
+               local util = io.popen(cmd % addr)
+               if util then
+                       while true do
+                               local ln = util:read("*l")
+                               if not ln then break end
+                               luci.http.write(ln)
+                               luci.http.write("\n")
                        end
 
-                       luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
-               elseif cancel then
-                       luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless_join?device=" .. dev))
-               else
-                       luci.template.render("admin_network/wifi_join_settings")
+                       util:close()
                end
-       else
-               luci.template.render("admin_network/wifi_join")
+
+               return
        end
+
+       luci.http.status(500, "Bad address")
 end
 
-function wifi_delete(network)
-       local uci = require "luci.model.uci".cursor()
-       local wlm = require "luci.model.wireless"
+function diag_ping()
+       diag_command("ping -c 5 -W 1 %q 2>&1")
+end
 
-       wlm.init(uci)
-       wlm:del_network(network)
+function diag_traceroute()
+       diag_command("traceroute -q 1 -w 1 -n %q 2>&1")
+end
 
-       uci:save("wireless")
-       luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
+function diag_nslookup()
+       diag_command("nslookup %q 2>&1")
 end