X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-mod-admin-full%2Fluasrc%2Fcontroller%2Fadmin%2Fnetwork.lua;h=a26d3d14e1d9ae5ede3379f59bab70f9d0100c1b;hp=879e54b2495376b8d227c6dbef9361f100360f34;hb=37a4a1c0702c64b15a2833ce8935bccc4899443e;hpb=8bb749ecc3b5f7f836f744f0056e90ac78522926

diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
index 879e54b24..a26d3d14e 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
@@ -61,7 +61,7 @@ function index()
 			page = entry({"admin", "network", "wireless_shutdown"}, post("wifi_shutdown"), nil)
 			page.leaf = true
 
-			page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wifi"), 15)
+			page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wireless"), 15)
 			page.leaf = true
 			page.subindex = true
 
@@ -82,7 +82,7 @@ function index()
 		end
 
 
-		page = entry({"admin", "network", "iface_add"}, cbi("admin_network/iface_add"), nil)
+		page = entry({"admin", "network", "iface_add"}, form("admin_network/iface_add"), nil)
 		page.leaf = true
 
 		page = entry({"admin", "network", "iface_delete"}, post("iface_delete"), nil)
@@ -235,7 +235,10 @@ function iface_status(ifaces)
 				proto      = net:proto(),
 				uptime     = net:uptime(),
 				gwaddr     = net:gwaddr(),
+				ipaddrs    = net:ipaddrs(),
+				ip6addrs   = net:ip6addrs(),
 				dnsaddrs   = net:dnsaddrs(),
+				ip6prefix  = net:ip6prefix(),
 				name       = device:shortname(),
 				type       = device:type(),
 				ifname     = device:name(),
@@ -246,36 +249,15 @@ function iface_status(ifaces)
 				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
-
 			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(),
@@ -307,7 +289,8 @@ function iface_reconnect(iface)
 	local netmd = require "luci.model.network".init()
 	local net = netmd:get_network(iface)
 	if net then
-		luci.sys.call("env -i /sbin/ifup %q >/dev/null 2>/dev/null" % iface)
+		luci.sys.call("env -i /sbin/ifup %s >/dev/null 2>/dev/null"
+			% luci.util.shellquote(iface))
 		luci.http.status(200, "Reconnected")
 		return
 	end
@@ -319,7 +302,8 @@ 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)
+		luci.sys.call("env -i /sbin/ifdown %s >/dev/null 2>/dev/null"
+			% luci.util.shellquote(iface))
 		luci.http.status(200, "Shutdown")
 		return
 	end
@@ -331,7 +315,8 @@ 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)
+		luci.sys.call("env -i /sbin/ifdown %s >/dev/null 2>/dev/null"
+			% luci.util.shellquote(iface))
 		luci.http.redirect(luci.dispatcher.build_url("admin/network/network"))
 		netmd:commit("network")
 		netmd:commit("wireless")
@@ -345,9 +330,11 @@ function wifi_status(devs)
 	local s    = require "luci.tools.status"
 	local rv   = { }
 
-	local dev
-	for dev in devs:gmatch("[%w%.%-]+") do
-		rv[#rv+1] = s.wifi_network(dev)
+	if type(devs) == "string" then
+		local dev
+		for dev in devs:gmatch("[%w%.%-]+") do
+			rv[#rv+1] = s.wifi_network(dev)
+		end
 	end
 
 	if #rv > 0 then
@@ -407,7 +394,7 @@ function diag_command(cmd, addr)
 	if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then
 		luci.http.prepare_content("text/plain")
 
-		local util = io.popen(cmd % addr)
+		local util = io.popen(cmd % luci.util.shellquote(addr))
 		if util then
 			while true do
 				local ln = util:read("*l")
@@ -426,21 +413,21 @@ function diag_command(cmd, addr)
 end
 
 function diag_ping(addr)
-	diag_command("ping -c 5 -W 1 %q 2>&1", addr)
+	diag_command("ping -c 5 -W 1 %s 2>&1", addr)
 end
 
 function diag_traceroute(addr)
-	diag_command("traceroute -q 1 -w 1 -n %q 2>&1", addr)
+	diag_command("traceroute -q 1 -w 1 -n %s 2>&1", addr)
 end
 
 function diag_nslookup(addr)
-	diag_command("nslookup %q 2>&1", addr)
+	diag_command("nslookup %s 2>&1", addr)
 end
 
 function diag_ping6(addr)
-	diag_command("ping6 -c 5 %q 2>&1", addr)
+	diag_command("ping6 -c 5 %s 2>&1", addr)
 end
 
 function diag_traceroute6(addr)
-	diag_command("traceroute6 -q 1 -w 2 -n %q 2>&1", addr)
+	diag_command("traceroute6 -q 1 -w 2 -n %s 2>&1", addr)
 end