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=6f55ff77796162feadb125fc8ccd68a81947d219;hp=87cc040ea7854756738e65f746d3edf3f758d3da;hb=69dbc27ce0517c0bd414bbfb9cdff53fa968a3cd;hpb=f3973132f2f7332894d1e5c92898d20db0d5953f

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index 87cc040ea..6f55ff777 100644
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -10,24 +10,12 @@ 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()
 	local uci = require("luci.model.uci").cursor()
-	local net = require "luci.model.network".init(uci)
-	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")
@@ -36,112 +24,145 @@ function index()
 	page.order  = 50
 	page.index  = true
 
-	if has_switch then
-		page  = node("admin", "network", "vlan")
-		page.target = cbi("admin_network/vlan")
-		page.title  = _("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")), _("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)
-		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", "wireless_add"}, call("wifi_add"), nil)
-		page.leaf = true
+			page = entry({"admin", "network", "switch_status"}, call("switch_status"), nil)
+			page.leaf = true
+		end
 
-		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
+		local has_wifi = false
 
-		page = entry({"admin", "network", "wireless_reconnect"}, call("wifi_reconnect"), nil)
-		page.leaf = true
+		uci:foreach("wireless", "wifi-device",
+			function(s)
+				has_wifi = true
+				return false
+			end)
 
-		page = entry({"admin", "network", "wireless_shutdown"}, call("wifi_reconnect"), nil)
-		page.leaf = true
+		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
 
-		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()
-				)
+			page = entry({"admin", "network", "wireless_reconnect"}, call("wifi_reconnect"), nil)
+			page.leaf = true
+
+			page = entry({"admin", "network", "wireless_shutdown"}, call("wifi_reconnect"), 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
-	end
 
-	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_add"}, cbi("admin_network/iface_add"), nil)
-	page.leaf = true
+		page = entry({"admin", "network", "iface_add"}, cbi("admin_network/iface_add"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "iface_delete"}, call("iface_delete"), nil)
+		page.leaf = true
 
-	page = entry({"admin", "network", "iface_delete"}, call("iface_delete"), nil)
-	page.leaf = true
+		page = entry({"admin", "network", "iface_status"}, call("iface_status"), nil)
+		page.leaf = true
 
-	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
 
-	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
 
-	page = entry({"admin", "network", "iface_shutdown"}, call("iface_shutdown"), 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
 
-	uci:foreach("network", "interface",
-		function (section)
-			local ifc = section[".name"]
-			if ifc ~= "loopback" then
-				entry({"admin", "network", "network", ifc},
-				 true,
-				 ifc:upper())
-			end
+		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
-	)
 
-	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", "dhcplease_status"}, call("lease_status"), 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 = node("admin", "network", "hosts")
-		page.target = cbi("admin_network/hosts")
-		page.title  = _("Hostnames")
-		page.order  = 40
-	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  = _("Hostnames")
+			page.order  = 40
+		end
+
+		page  = node("admin", "network", "routes")
+		page.target = cbi("admin_network/routes")
+		page.title  = _("Static Routes")
+		page.order  = 50
+
+		page = node("admin", "network", "diagnostics")
+		page.target = template("admin_network/diagnostics")
+		page.title  = _("Diagnostics")
+		page.order  = 60
 
-	page = node("admin", "network", "diagnostics")
-	page.target = template("admin_network/diagnostics")
-	page.title  = _("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_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()
@@ -198,15 +219,22 @@ end
 
 function wifi_delete(network)
 	local ntm = require "luci.model.network".init()
-	local net = ntm:get_wifinet(network)
-
-	if net then
-		local dev = net:get_device()
+	local wnet = ntm:get_wifinet(network)
+	if wnet then
+		local dev = wnet:get_device()
+		local nets = wnet:get_networks()
 		if dev then
-			luci.sys.call("env -i /sbin/wifi down %q" % dev:name())
+			luci.sys.call("env -i /sbin/wifi down %q >/dev/null" % dev:name())
 			ntm:del_wifinet(network)
 			ntm:commit("wireless")
-			luci.sys.call("env -i /sbin/wifi up %q" % dev:name())
+			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 /sbin/wifi up %q >/dev/null" % dev:name())
 		end
 	end
 
@@ -223,8 +251,7 @@ function iface_status()
 		local net = netm:get_network(iface)
 		local device = net and net:get_interface()
 		if device then
-			local device = net:get_interface()
-			local data   = {
+			local data = {
 				id         = iface,
 				proto      = net:proto(),
 				uptime     = net:uptime(),
@@ -254,11 +281,13 @@ function iface_status()
 				}
 			end
 			for _, a in ipairs(device:ip6addrs()) do
-				data.ip6addrs[#data.ip6addrs+1] = {
-					addr      = a:host():string(),
-					netmask   = a:mask():string(),
-					prefix    = a:prefix()
-				}
+				if not a:is6linklocal() then
+					data.ip6addrs[#data.ip6addrs+1] = {
+						addr      = a:host():string(),
+						netmask   = a:mask():string(),
+						prefix    = a:prefix()
+					}
+				end
 			end
 
 			for _, device in ipairs(net:get_interfaces() or {}) do
@@ -370,11 +399,13 @@ function wifi_reconnect()
 	local net = netmd:get_wifinet(wnet)
 	local dev = net:get_device()
 	if dev and net then
+		luci.sys.call("env -i /sbin/wifi down >/dev/null 2>/dev/null")
+
 		dev:set("disabled", nil)
 		net:set("disabled", (mode == "wireless_shutdown") and 1 or nil)
 		netmd:commit("wireless")
 
-		luci.sys.call("(env -i /sbin/wifi down; env -i /sbin/wifi up) >/dev/null 2>/dev/null")
+		luci.sys.call("env -i /sbin/wifi up >/dev/null 2>/dev/null")
 		luci.http.status(200, (mode == "wireless_shutdown") and "Shutdown" or "Reconnected")
 
 		return
@@ -387,7 +418,19 @@ function lease_status()
 	local s = require "luci.tools.status"
 
 	luci.http.prepare_content("application/json")
+	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 switch_status()
+	local path = luci.dispatcher.context.requestpath
+	local s = require "luci.tools.status"
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(s.switch_status(path[#path]))
 end
 
 function diag_command(cmd)
@@ -426,3 +469,11 @@ end
 function diag_nslookup()
 	diag_command("nslookup %q 2>&1")
 end
+
+function diag_ping6()
+	diag_command("ping6 -c 5 %q 2>&1")
+end
+
+function diag_traceroute6()
+	diag_command("traceroute6 -q 1 -w 2 -n %q 2>&1")
+end