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=950285d5888b65cd2815afe78b3955ad5d90e5b1;hp=12dd559bc77c840e8866f6b8e65854ce9705c6b2;hb=87fd9de5b6e5cc2d319c896f4ab7b3ad0c56ae7e;hpb=4d3ddb03a308629abc4f9c37686c5d2351ce5950

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index 12dd559bc..950285d58 100644
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -11,46 +11,66 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+
 module("luci.controller.admin.network", package.seeall)
 
 function index()
 	require("luci.i18n")
 	local uci = require("luci.model.uci").cursor()
 	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  = node("admin", "network")
+	local page
+
+	page = node("admin", "network")
 	page.target = alias("admin", "network", "network")
-	page.title  = i18n("network")
+	page.title  = i18n("Network")
 	page.order  = 50
 	page.index  = true
 
-	local page  = node("admin", "network", "vlan")
-	page.target = cbi("admin_network/vlan")
-	page.title  = i18n("a_n_switch")
-	page.order  = 20
+	if has_switch then
+		page  = node("admin", "network", "vlan")
+		page.target = cbi("admin_network/vlan")
+		page.title  = i18n("Switch")
+		page.order  = 20
+	end
 
-	local page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), i18n("wifi"), 15)
-	page.i18n   = "wifi"
-	page.leaf = true
-	page.subindex = true
+	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("wireless", "wifi-device",
-		function (section)
-			local ifc = section[".name"]
-				entry({"admin", "network", "wireless", ifc},
-				 true,
-				 ifc:upper()).i18n = "wifi"
-		end
-	)
+		page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16)
+		page.leaf = true
 
-	local page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16)
-	page.i18n = "wifi"
-	page.leaf = true
+		page = entry({"admin", "network", "wireless_add"}, call("wifi_add"), nil, 16)
+		page.leaf = true
+
+		page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil, 16)
+		page.leaf = true
+
+		page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil, 16)
+		page.leaf = true
+	end
 
-	local page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("interfaces", "Schnittstellen"), 10)
+	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", "add"}, cbi("admin_network/iface_add"), nil)
+	page.leaf = true
+
+	page = entry({"admin", "network", "iface_status"}, call("iface_status"), nil)
+	page.leaf = true
+
 	uci:foreach("network", "interface",
 		function (section)
 			local ifc = section[".name"]
@@ -62,26 +82,21 @@ function index()
 		end
 	)
 
-	local page  = node("admin", "network", "dhcp")
-	page.target = cbi("admin_network/dhcp")
-	page.title  = "DHCP"
-	page.order  = 30
-	page.subindex = true
-
-	entry(
-	 {"admin", "network", "dhcp", "leases"},
-	 cbi("admin_network/dhcpleases"),
-	 i18n("dhcp_leases")
-	)
+	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
+	end
 
-	local page  = node("admin", "network", "hosts")
+	page  = node("admin", "network", "hosts")
 	page.target = cbi("admin_network/hosts")
-	page.title  = i18n("hostnames", "Hostnames")
+	page.title  = i18n("Hostnames")
 	page.order  = 40
 
-	local page  = node("admin", "network", "routes")
+	page  = node("admin", "network", "routes")
 	page.target = cbi("admin_network/routes")
-	page.title  = i18n("a_n_routes_static")
+	page.title  = i18n("Static Routes")
 	page.order  = 50
 
 end
@@ -100,74 +115,170 @@ function wifi_join()
 	local ssid = param("join")
 
 	if dev and ssid then
-		local wep     = (tonumber(param("wep")) == 1)
-		local wpa     = tonumber(param("wpa_version")) or 0
-		local channel = tonumber(param("channel"))
-		local mode    = param("mode")
-		local bssid   = param("bssid")
+		local cancel  = (param("cancel") or param("cbi.cancel")) and true or false
 
-		local confirm = (param("confirm") == "1")
-		local cancel  = param("cancel") and true or false
+		if cancel then
+			luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless_join?device=" .. dev))
+		else
+			local cbi = require "luci.cbi"
+			local tpl = require "luci.template"
+			local map = luci.cbi.load("admin_network/wifi_add")[1]
+
+			if map:parse() ~= cbi.FORM_DONE then
+				tpl.render("header")
+				map:render()
+				tpl.render("footer")
+			end
+		end
+	else
+		luci.template.render("admin_network/wifi_join")
+	end
+end
 
-		if confirm and not cancel then
-			local fixed_bssid = (param("fixed_bssid") == "1")
-			local replace_net = (param("replace_net") == "1")
-			local autoconnect = (param("autoconnect") == "1")
-			local attach_intf = param("attach_intf")
+function wifi_add()
+	local dev = luci.http.formvalue("device")
+	local ntm = require "luci.model.network".init()
 
-			local uci = require "luci.model.uci".cursor()
+	dev = dev and ntm:get_wifidev(dev)
 
-			if replace_net then
-				uci:delete_all("wireless", "wifi-iface")
-			end
+	if dev then
+		local net = dev:add_wifinet({
+			mode       = "ap",
+			ssid       = "OpenWrt",
+			encryption = "none"
+		})
+
+		ntm:save("wireless")
+		luci.http.redirect(net:adminlink())
+	end
+end
+
+function wifi_delete(network)
+	local ntm = require "luci.model.network".init()
 
-			local wificonf = {
-				device  = dev,
-				mode    = (mode == "Ad-Hoc" and "adhoc" or "sta"),
-				ssid    = ssid
-			}
+	ntm:del_wifinet(network)
+	ntm:save("wireless")
 
-			if attach_intf and uci:get("network", attach_intf, "ifname") then
-				-- target network already has a interface, make it a bridge
-				uci:set("network", attach_intf, "type", "bridge")
-				uci:save("network")
-				uci:commit("network")
+	luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
+end
 
-				if autoconnect then
-					require "luci.sys".call("/sbin/ifup " .. attach_intf)
+function jsondump(x)
+	if x == nil then
+		luci.http.write("null")
+	elseif type(x) == "table" then
+		local k, v
+		if type(next(x)) == "number" then
+			luci.http.write("[ ")
+			for k, v in ipairs(x) do
+				jsondump(v)
+				if next(x, k) then
+					luci.http.write(", ")
 				end
 			end
-
-			if fixed_bssid then
-				wificonf.bssid = bssid
+			luci.http.write(" ]")
+		else
+			luci.http.write("{ ")
+			for k, v in pairs(x) do
+			luci.http.write("%q: " % k)
+				jsondump(v)
+				if next(x, k) then
+					luci.http.write(", ")
+				end
 			end
+			luci.http.write(" }")
+		end
+	elseif type(x) == "number" or type(x) == "boolean" then
+		luci.http.write(tostring(x))
+	elseif type(x) == "string" then
+		luci.http.write("%q" % tostring(x))
+	end
+end
+
 
-			if wep then
-				wificonf.encryption = "wep"
-				wificonf.key = param("key")
-			elseif wpa > 0 then
-				wificonf.encryption = param("wpa_suite")
-				wificonf.key = param("key")
+function iface_status()
+	local path = luci.dispatcher.context.requestpath
+	local x    = luci.model.uci.cursor_state()
+	local rv   = { }
+
+	local iface
+	for iface in path[#path]:gmatch("[%w%.%-]+") do
+		local dev = x:get("network", iface, "device") or ""
+		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 = { }
+		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
+
+		if next(data) then
+			rv[#rv+1] = data
+		end
+	end
 
-			uci:section("wireless", "wifi-iface", nil, wificonf)
-			uci:delete("wireless", dev, "disabled")
-			uci:set("wireless", dev, "channel", channel)
+	if #rv > 0 then
+		luci.http.prepare_content("application/json")
+		jsondump(rv)
+		return
+	end
 
-			uci:save("wireless")
-			uci:commit("wireless")
+	luci.http.status(404, "No such device")
+end
 
-			if autoconnect then
-				require "luci.sys".call("/sbin/wifi")
+function wifi_status()
+	local path = luci.dispatcher.context.requestpath
+	local rv   = { }
+
+	local dev
+	for dev in path[#path]:gmatch("[%w%.%-]+") do
+		local iw = luci.sys.wifi.getiwinfo(dev)
+		if iw then
+			local f
+			local j = { }
+			for _, f in ipairs({
+				"channel", "frequency", "txpower", "bitrate", "signal", "noise",
+				"quality", "quality_max", "mode", "ssid", "bssid", "country",
+				"encryption", "ifname"
+			}) do
+				j[f] = iw[f]
 			end
 
-			luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless", dev))
-		elseif cancel then
-			luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless_join?device=" .. dev))
-		else
-			luci.template.render("admin_network/wifi_join_settings")
+			rv[#rv+1] = j
 		end
-	else
-		luci.template.render("admin_network/wifi_join")
 	end
+
+	if #rv > 0 then
+		luci.http.prepare_content("application/json")
+		jsondump(rv)
+		return
+	end
+
+	luci.http.status(404, "No such device")
 end