X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fcontroller%2Fadmin%2Fnetwork.lua;h=f7c94f2cdff92cc193f02cf45bc14948aa86f998;hp=a657ad6354c9a0b908d88bd4ed565cb91ebff8b4;hb=18677e216b26acc148387c5414756a5b94c8a17c;hpb=b6ee173c5903eaac6ee79368bfbdbded5f4f87e7

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index a657ad635..f7c94f2cd 100644
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -17,6 +17,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,9 +60,21 @@ 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.netid},
+					alias("admin", "network", "wireless"),
+					wdev:name() .. ": " .. wnet:shortname()
+				)
+			end
+		end
 	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 +105,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()
@@ -176,55 +202,53 @@ end
 
 function iface_status()
 	local path = luci.dispatcher.context.requestpath
-	local x    = luci.model.uci.cursor_state()
+	local netm = require "luci.model.network".init()
 	local rv   = { }
 
 	local iface
 	for iface in path[#path]:gmatch("[%w%.%-]+") do
-		local dev
-		if x:get("network", iface, "type") == "bridge" then
-			dev = "br-" .. iface
-		else
-			dev = x:get("network", iface, "device") or ""
-		end
-
-		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 = { id = iface }
-		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
-					}
+		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
-		end
 
-		if next(data) then
-			rv[#rv+1] = data
+			if next(data) then
+				rv[#rv+1] = data
+			end
 		end
 	end
 
@@ -302,24 +326,29 @@ function iface_delete()
 end
 
 function wifi_status()
+	local netm  = require "luci.model.network".init()
 	local path = luci.dispatcher.context.requestpath
-	local arp  = luci.sys.net.arptable()
 	local rv   = { }
 
 	local dev
 	for dev in path[#path]:gmatch("[%w%.%-]+") do
 		local j = { id = dev }
-		local iw = luci.sys.wifi.getiwinfo(dev)
+		local wn = netm:get_wifinet(dev)
+		local iw = wn and wn.iwinfo
 		if iw then
 			local f
 			for _, f in ipairs({
 				"channel", "frequency", "txpower", "bitrate", "signal", "noise",
-				"quality", "quality_max", "mode", "ssid", "bssid", "country",
+				"quality", "quality_max", "bssid", "country",
 				"encryption", "ifname", "assoclist"
 			}) do
 				j[f] = iw[f]
 			end
 		end
+
+		j.mode = wn and wn:active_mode() or "?"
+		j.ssid = wn and wn:active_ssid() or "?"
+
 		rv[#rv+1] = j
 	end
 
@@ -333,41 +362,45 @@ function wifi_status()
 end
 
 function lease_status()
-	local rv = { }
-	local leasefile = "/var/dhcp.leases"
+	local s = require "luci.tools.status"
 
-	local uci = require "luci.model.uci".cursor()
-	local nfs = require "nixio.fs"
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(s.dhcp_leases())
+end
 
-	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
+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
-		fd:close()
+
+		return
 	end
 
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(rv)
+	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