modules/admin-full: rework fstab pages, include extroot options

[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 a657ad6..f2f629b 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -61,7 +61,7 @@ function index()
                page.leaf = true
        end
 
-       page = entry({"admin", "network", "network"}, arcombine(template("admin_network/iface_overview"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10)
+       page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10)
        page.leaf   = true
        page.subindex = true
 
@@ -92,25 +92,38 @@ function index()
        )
 
        if nixio.fs.access("/etc/config/dhcp") then
-               page  = node("admin", "network", "dhcpleases")
+               page = node("admin", "network", "dhcpleases")
                page.target = cbi("admin_network/dhcpleases")
                page.title  = i18n("DHCP Leases")
                page.order  = 30
 
                page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
                page.leaf = true
-       end
 
-       page  = node("admin", "network", "hosts")
-       page.target = cbi("admin_network/hosts")
-       page.title  = i18n("Hostnames")
-       page.order  = 40
+               page = node("admin", "network", "hosts")
+               page.target = cbi("admin_network/hosts")
+               page.title  = i18n("Hostnames")
+               page.order  = 40
+       end
 
        page  = node("admin", "network", "routes")
        page.target = cbi("admin_network/routes")
        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()
@@ -371,3 +384,40 @@ function lease_status()
        luci.http.prepare_content("application/json")
        luci.http.write_json(rv)
 end
+
+function diag_command(cmd)
+       local path = luci.dispatcher.context.requestpath
+       local addr = path[#path]
+
+       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
+
+                       util:close()
+               end
+
+               return
+       end
+
+       luci.http.status(500, "Bad address")
+end
+
+function diag_ping()
+       diag_command("ping -c 5 -W 1 %q 2>&1")
+end
+
+function diag_traceroute()
+       diag_command("traceroute -q 1 -w 1 -n %q 2>&1")
+end
+
+function diag_nslookup()
+       diag_command("nslookup %q 2>&1")
+end