X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fcontroller%2Fadmin%2Fnetwork.lua;h=98f4395495255f2dc05eba22feb51cfd3b5a2f1b;hp=73efc35b03ec7915a9c59c2ca930bd4919ddc4cf;hb=a654b403660570258b447afc25ae6283936f8821;hpb=b8c1487f6d109f589324c2c40d2b26c6058adffa

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index 73efc35b0..98f439549 100644
--- 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.
@@ -9,134 +10,166 @@ You may obtain a copy of the License at
 
 	http://www.apache.org/licenses/LICENSE-2.0
 
-$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
 
 	page = node("admin", "network")
-	page.target = alias("admin", "network", "network")
-	page.title  = i18n("Network")
+	page.target = firstchild()
+	page.title  = _("Network")
 	page.order  = 50
 	page.index  = true
 
-	if has_switch then
-		page  = node("admin", "network", "vlan")
-		page.target = cbi("admin_network/vlan")
-		page.title  = i18n("Switch")
-		page.order  = 20
-	end
+--	if page.inreq then
+		local has_switch = false
 
-	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
+		uci:foreach("network", "switch",
+			function(s)
+				has_switch = true
+				return false
+			end)
 
-		page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16)
-		page.leaf = true
+		if has_switch then
+			page  = node("admin", "network", "vlan")
+			page.target = cbi("admin_network/vlan")
+			page.title  = _("Switch")
+			page.order  = 20
+
+			page = entry({"admin", "network", "switch_status"}, call("switch_status"), nil)
+			page.leaf = true
+		end
+
+
+		local has_wifi = false
 
-		page = entry({"admin", "network", "wireless_add"}, call("wifi_add"), nil, 16)
+		uci:foreach("wireless", "wifi-device",
+			function(s)
+				has_wifi = true
+				return false
+			end)
+
+		if has_wifi then
+			page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil)
+			page.leaf = true
+
+			page = entry({"admin", "network", "wireless_add"}, call("wifi_add"), nil)
+			page.leaf = true
+
+			page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil)
+			page.leaf = true
+
+			page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil)
+			page.leaf = true
+
+			page = entry({"admin", "network", "wireless_reconnect"}, call("wifi_reconnect"), nil)
+			page.leaf = true
+
+			page = entry({"admin", "network", "wireless_shutdown"}, call("wifi_shutdown"), nil)
+			page.leaf = true
+
+			page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wifi"), 15)
+			page.leaf = true
+			page.subindex = true
+
+			if page.inreq then
+				local wdev
+				local net = require "luci.model.network".init(uci)
+				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
+		end
+
+
+		page = entry({"admin", "network", "iface_add"}, cbi("admin_network/iface_add"), nil)
 		page.leaf = true
 
-		page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil, 16)
+		page = entry({"admin", "network", "iface_delete"}, call("iface_delete"), nil)
 		page.leaf = true
 
-		page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil, 16)
+		page = entry({"admin", "network", "iface_status"}, call("iface_status"), nil)
 		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", "iface_reconnect"}, call("iface_reconnect"), nil)
+		page.leaf = true
 
-	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_shutdown"}, call("iface_shutdown"), nil)
+		page.leaf = true
 
-	page = entry({"admin", "network", "iface_add"}, cbi("admin_network/iface_add"), nil)
-	page.leaf = true
+		page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), _("Interfaces"), 10)
+		page.leaf   = true
+		page.subindex = true
 
-	page = entry({"admin", "network", "iface_delete"}, call("iface_delete"), nil)
-	page.leaf = true
+		if page.inreq then
+			uci:foreach("network", "interface",
+				function (section)
+					local ifc = section[".name"]
+					if ifc ~= "loopback" then
+						entry({"admin", "network", "network", ifc},
+						true, ifc:upper())
+					end
+				end)
+		end
 
-	page = entry({"admin", "network", "iface_status"}, call("iface_status"), nil)
-	page.leaf = true
 
-	page = entry({"admin", "network", "iface_reconnect"}, call("iface_reconnect"), nil)
-	page.leaf = true
+		if nixio.fs.access("/etc/config/dhcp") then
+			page = node("admin", "network", "dhcp")
+			page.target = cbi("admin_network/dhcp")
+			page.title  = _("DHCP and DNS")
+			page.order  = 30
 
-	page = entry({"admin", "network", "iface_shutdown"}, call("iface_shutdown"), nil)
-	page.leaf = true
+			page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
+			page.leaf = true
 
-	uci:foreach("network", "interface",
-		function (section)
-			local ifc = section[".name"]
-			if ifc ~= "loopback" then
-				entry({"admin", "network", "network", ifc},
-				 true,
-				 ifc:upper())
-			end
+			page = node("admin", "network", "hosts")
+			page.target = cbi("admin_network/hosts")
+			page.title  = _("Hostnames")
+			page.order  = 40
 		end
-	)
 
-	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
+		if nixio.fs.access("/etc/config/6relayd") then
+			page = node("admin", "network", "ipv6")
+			page.target = cbi("admin_network/ipv6")
+			page.title  = _("IPv6 RA and DHCPv6")
+			page.order  = 45
+		end
 
-		page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
-		page.leaf = true
+		page  = node("admin", "network", "routes")
+		page.target = cbi("admin_network/routes")
+		page.title  = _("Static Routes")
+		page.order  = 50
 
-		page = node("admin", "network", "hosts")
-		page.target = cbi("admin_network/hosts")
-		page.title  = i18n("Hostnames")
-		page.order  = 40
-	end
+		page = node("admin", "network", "diagnostics")
+		page.target = template("admin_network/diagnostics")
+		page.title  = _("Diagnostics")
+		page.order  = 60
 
-	page  = node("admin", "network", "routes")
-	page.target = cbi("admin_network/routes")
-	page.title  = i18n("Static Routes")
-	page.order  = 50
+		page = entry({"admin", "network", "diag_ping"}, call("diag_ping"), nil)
+		page.leaf = true
 
-	page = node("admin", "network", "diagnostics")
-	page.target = template("admin_network/diagnostics")
-	page.title  = i18n("Diagnostics")
-	page.order  = 60
+		page = entry({"admin", "network", "diag_nslookup"}, call("diag_nslookup"), nil)
+		page.leaf = true
 
-	page = entry({"admin", "network", "diag_ping"}, call("diag_ping"), nil)
-	page.leaf = true
+		page = entry({"admin", "network", "diag_traceroute"}, call("diag_traceroute"), nil)
+		page.leaf = true
 
-	page = entry({"admin", "network", "diag_nslookup"}, call("diag_nslookup"), nil)
-	page.leaf = true
+		page = entry({"admin", "network", "diag_ping6"}, call("diag_ping6"), nil)
+		page.leaf = true
 
-	page = entry({"admin", "network", "diag_traceroute"}, call("diag_traceroute"), nil)
-	page.leaf = true
+		page = entry({"admin", "network", "diag_traceroute6"}, call("diag_traceroute6"), nil)
+		page.leaf = true
+--	end
 end
 
 function wifi_join()
@@ -193,56 +226,97 @@ end
 
 function wifi_delete(network)
 	local ntm = require "luci.model.network".init()
-
-	ntm:del_wifinet(network)
-	ntm:save("wireless")
+	local wnet = ntm:get_wifinet(network)
+	if wnet then
+		local dev = wnet:get_device()
+		local nets = wnet:get_networks()
+		if dev then
+			ntm:del_wifinet(network)
+			ntm:commit("wireless")
+			local _, net
+			for _, net in ipairs(nets) do
+				if net:is_empty() then
+					ntm:del_network(net:name())
+					ntm:commit("network")
+				end
+			end
+			luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>/dev/null")
+		end
+	end
 
 	luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
 end
 
-function iface_status()
-	local path = luci.dispatcher.context.requestpath
+function iface_status(ifaces)
 	local netm = require "luci.model.network".init()
 	local rv   = { }
 
 	local iface
-	for iface in path[#path]:gmatch("[%w%.%-]+") do
+	for iface in ifaces: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() }
-			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
+		local device = net and net:get_interface()
+		if device then
+			local data = {
+				id         = iface,
+				proto      = net:proto(),
+				uptime     = net:uptime(),
+				gwaddr     = net:gwaddr(),
+				dnsaddrs   = net:dnsaddrs(),
+				name       = device:shortname(),
+				type       = device:type(),
+				ifname     = device:name(),
+				macaddr    = device:mac(),
+				is_up      = device:is_up(),
+				rx_bytes   = device:rx_bytes(),
+				tx_bytes   = device:tx_bytes(),
+				rx_packets = device:rx_packets(),
+				tx_packets = device:tx_packets(),
+
+				ipaddrs    = { },
+				ip6addrs   = { },
+				subdevices = { }
+			}
+
+			local _, a
+			for _, a in ipairs(device:ipaddrs()) do
+				data.ipaddrs[#data.ipaddrs+1] = {
+					addr      = a:host():string(),
+					netmask   = a:mask():string(),
+					prefix    = a:prefix()
+				}
+			end
+			for _, a in ipairs(device:ip6addrs()) do
+				if not a:is6linklocal() then
+					data.ip6addrs[#data.ip6addrs+1] = {
+						addr      = a:host():string(),
+						netmask   = a:mask():string(),
+						prefix    = a:prefix()
+					}
 				end
 			end
 
-			if next(data) then
-				rv[#rv+1] = data
+			for _, device in ipairs(net:get_interfaces() or {}) do
+				data.subdevices[#data.subdevices+1] = {
+					name       = device:shortname(),
+					type       = device:type(),
+					ifname     = device:name(),
+					macaddr    = device:mac(),
+					macaddr    = device:mac(),
+					is_up      = device:is_up(),
+					rx_bytes   = device:rx_bytes(),
+					tx_bytes   = device:tx_bytes(),
+					rx_packets = device:rx_packets(),
+					tx_packets = device:tx_packets(),
+				}
 			end
+
+			rv[#rv+1] = data
+		else
+			rv[#rv+1] = {
+				id   = iface,
+				name = iface,
+				type = "ethernet"
+			}
 		end
 	end
 
@@ -255,30 +329,10 @@ function iface_status()
 	luci.http.status(404, "No such device")
 end
 
-function iface_reconnect()
-	local path  = luci.dispatcher.context.requestpath
-	local iface = path[#path]
+function iface_reconnect(iface)
 	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
@@ -287,11 +341,8 @@ function iface_reconnect()
 	luci.http.status(404, "No such interface")
 end
 
-function iface_shutdown()
-	local path  = luci.dispatcher.context.requestpath
-	local iface = path[#path]
+function iface_shutdown(iface)
 	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)
@@ -302,11 +353,8 @@ function iface_shutdown()
 	luci.http.status(404, "No such interface")
 end
 
-function iface_delete()
-	local path  = luci.dispatcher.context.requestpath
-	local iface = path[#path]
+function iface_delete(iface)
 	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)
@@ -319,32 +367,13 @@ function iface_delete()
 	luci.http.status(404, "No such interface")
 end
 
-function wifi_status()
-	local netm  = require "luci.model.network".init()
-	local path = luci.dispatcher.context.requestpath
-	local arp  = luci.sys.net.arptable()
+function wifi_status(devs)
+	local s    = require "luci.tools.status"
 	local rv   = { }
 
 	local dev
-	for dev in path[#path]:gmatch("[%w%.%-]+") do
-		local j = { id = 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", "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
+	for dev in devs:gmatch("[%w%.%-]+") do
+		rv[#rv+1] = s.wifi_network(dev)
 	end
 
 	if #rv > 0 then
@@ -356,50 +385,51 @@ function wifi_status()
 	luci.http.status(404, "No such device")
 end
 
-function lease_status()
-	local rv = { }
-	local leasefile = "/var/dhcp.leases"
+local function wifi_reconnect_shutdown(shutdown, wnet)
+	local netmd = require "luci.model.network".init()
+	local net = netmd:get_wifinet(wnet)
+	local dev = net:get_device()
+	if dev and net then
+		dev:set("disabled", nil)
+		net:set("disabled", shutdown and 1 or nil)
+		netmd:commit("wireless")
 
-	local uci = require "luci.model.uci".cursor()
-	local nfs = require "nixio.fs"
+		luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>/dev/null")
+		luci.http.status(200, shutdown and "Shutdown" or "Reconnected")
 
-	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()
+		return
 	end
 
+	luci.http.status(404, "No such radio")
+end
+
+function wifi_reconnect(wnet)
+	wifi_reconnect_shutdown(false, wnet)
+end
+
+function wifi_shutdown(wnet)
+	wifi_reconnect_shutdown(true, wnet)
+end
+
+function lease_status()
+	local s = require "luci.tools.status"
+
 	luci.http.prepare_content("application/json")
-	luci.http.write_json(rv)
+	luci.http.write('[')
+	luci.http.write_json(s.dhcp_leases())
+	luci.http.write(',')
+	luci.http.write_json(s.dhcp6_leases())
+	luci.http.write(']')
 end
 
-function diag_command(cmd)
-	local path = luci.dispatcher.context.requestpath
-	local addr = path[#path]
+function switch_status(switches)
+	local s = require "luci.tools.status"
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(s.switch_status(switches))
+end
 
+function diag_command(cmd, addr)
 	if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then
 		luci.http.prepare_content("text/plain")
 
@@ -421,14 +451,22 @@ function diag_command(cmd)
 	luci.http.status(500, "Bad address")
 end
 
-function diag_ping()
-	diag_command("ping -c 5 -W 1 %q 2>&1")
+function diag_ping(addr)
+	diag_command("ping -c 5 -W 1 %q 2>&1", addr)
+end
+
+function diag_traceroute(addr)
+	diag_command("traceroute -q 1 -w 1 -n %q 2>&1", addr)
+end
+
+function diag_nslookup(addr)
+	diag_command("nslookup %q 2>&1", addr)
 end
 
-function diag_traceroute()
-	diag_command("traceroute -q 1 -w 1 -n %q 2>&1")
+function diag_ping6(addr)
+	diag_command("ping6 -c 5 %q 2>&1", addr)
 end
 
-function diag_nslookup()
-	diag_command("nslookup %q 2>&1")
+function diag_traceroute6(addr)
+	diag_command("traceroute6 -q 1 -w 2 -n %q 2>&1", addr)
 end