X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_network%2Fwifi_overview.htm;h=22d27cb1cd59c3eb754cf62a90341e62f511d4f7;hp=251f767d23272ca0d9a0d5444716e13de5a46189;hb=0453e50932ab03c172ef18727673a2d874d93c52;hpb=4d3ddb03a308629abc4f9c37686c5d2351ce5950

diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
index 251f767d23..22d27cb1cd 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -1,7 +1,7 @@
 <%#
 LuCI - Lua Configuration Interface
 Copyright 2008-2009 Steven Barth <steven@midlink.org>
-Copyright 2008-2009 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2008-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.
@@ -16,16 +16,34 @@ $Id$
 <%-
 
 	local sys = require "luci.sys"
+	local fs = require "luci.fs"
 	local utl = require "luci.util"
-	local uci = require "luci.model.uci".cursor_state()
+	local uci = require "luci.model.uci".cursor()
+	local ntm = require "luci.model.network"
+
+	local has_iwinfo = pcall(require, "iwinfo")
+
+	ntm.init(uci)
 
 	function guess_wifi_hw(ifname)
+		local bands = ""
 		local name, idx = ifname:match("^([a-z]+)(%d+)")
 		idx = tonumber(idx)
 
+		if has_iwinfo then
+			local iw = luci.sys.wifi.getiwinfo(ifname)
+			local bl = iw.hwmodelist
+			if bl and next(bl) then
+				if bl.a then bands = bands .. "a" end
+				if bl.b then bands = bands .. "b" end
+				if bl.g then bands = bands .. "g" end
+				if bl.n then bands = bands .. "n" end
+			end
+		end
+
 		-- wl.o
 		if name == "wl" then
-			local name = "Broadcom 802.11 Wireless Controller"
+			local name = "Broadcom 802.11%s Wireless Controller" % bands
 			local nm   = 0
 
 			local fd = nixio.open("/proc/bus/pci/devices", "r")
@@ -53,141 +71,324 @@ $Id$
 
 		-- madwifi
 		elseif name == "ath" or name == "wifi" then
-			return "Atheros 802.11 Wireless Controller"
+			return "Atheros 802.11%s Wireless Controller" % bands
 
 		-- ralink
 		elseif name == "ra" then
-			return "RaLink 802.11 Wireless Controller"
+			return "RaLink 802.11%s Wireless Controller" % bands
 
-		-- prism?
+		-- hermes
 		elseif name == "eth" then
-			return "Prism 802.11 Wireless Controller"
+			return "Hermes 802.11b Wireless Controller"
 
-		-- dunno yet
-		else
-			return "Unkown 802.11 Wireless Controller"
-		end
-	end
+		-- hostap
+		elseif name == "wlan" and fs.isdirectory("/proc/net/hostap/" .. ifname) then
+			return "Prism2/2.5/3 802.11b Wireless Controller"
 
-	function guess_wifi_signal(info)
-		local snr = -1 * ((info.noise or 0) - (info.signal or 0))
-		local scale = math.floor(snr / 5)
-		local icon
-
-		if not info.bssid or info.bssid == "00:00:00:00:00:00" then
-			icon = resource .. "/icons/signal-none.png"
-		elseif scale < 1 then
-			icon = resource .. "/icons/signal-0.png"
-		elseif scale < 2 then
-			icon = resource .. "/icons/signal-0-25.png"
-		elseif scale < 3 then
-			icon = resource .. "/icons/signal-25-50.png"
-		elseif scale < 4 then
-			icon = resource .. "/icons/signal-50-75.png"
-		else
-			icon = resource .. "/icons/signal-75-100.png"
-		end
-
-		return icon
-	end
-
-	function percent_wifi_signal(info)
-		local qc = info.quality or 0
-		local qm = info.quality_max or 0
-
-		if info.bssid and qc > 0 and qm > 0 then
-			return math.floor((100 / qm) * qc)
+		-- dunno yet
 		else
-			return 0
+			return "Generic 802.11%s Wireless Controller" % bands
 		end
 	end
 
-	function find_wifi_devices()
-		local devs = { }
-		uci:foreach("wireless", "wifi-device",
-			function(s)
-				local dev = s['.name']
-				local act = 0
-				devs[dev] = { active = 0, networks = { } }
-
-				uci:foreach("wireless", "wifi-iface",
-					function(s)
-						if s.device == dev then
-							if s.up == "1" then act = act + 1 end
-							devs[dev].networks[#devs[dev].networks+1] = {
-								active = (s.up == "1"),
-								ifname = s.ifname,
-								info   = sys.wifi.getiwinfo(s.ifname or s.device)
-							}
-						end
-					end)
-
-				devs[dev].hwname = guess_wifi_hw(dev)
-				devs[dev].active = (act > 0)
-			end)
+	local devices  = ntm:get_wifidevs()
+	local arpcache = { }
+	sys.net.arptable(function(e) arpcache[e["HW address"]:upper()] = e["IP address"] end)
 
-		return devs
-	end
+	local netlist = { }
+	local netdevs = { }
 
-	function find_wifi_frequency(state)
-		if state.active then
-			return string.format("%d (%.03f GHz)",
-				state.networks[1].info.channel,
-				state.networks[1].info.frequency / 1000);
-		else
-			return "n/a"
+	local dev
+	for _, dev in ipairs(devices) do
+		local net
+		for _, net in ipairs(dev:get_wifinets()) do
+			netlist[#netlist+1] = net:id()
+			netdevs[net:id()] = dev:name()
 		end
 	end
-
-
-	local devices  = find_wifi_devices()
-	local arpcache = { }
-	sys.net.arptable(function(e) arpcache[e["HW address"]] = e["IP address"] end)
 -%>
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:a_s_iw_overview Wireless Overview%></a></h2>
+<% if not has_iwinfo then %>
+	<div class="errorbox">
+		<strong><%:Package libiwinfo required!%></strong><br />
+		<%_The <em>libiwinfo-lua</em> package is not installed. You must install this component for working wireless configuration!%>
+	</div>
+<% end %>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+	var wifidevs = <%=luci.http.write_json(netdevs)%>;
+	var arptable = <%=luci.http.write_json(arpcache)%>;
+
+	var is_reconnecting = false;
+
+	function wifi_shutdown(id, toggle) {
+		var reconnect = (toggle.getAttribute('active') == 'false');
+
+		if (!reconnect && !confirm(String.format('<%:Really shutdown network ?\nYou might lose access to this router if you are connected via this interface.%>')))
+			return;
+
+		is_reconnecting = true;
+
+		var s = document.getElementById('iw-rc-status');
+		if (s)
+		{
+			s.parentNode.style.display = 'block';
+			s.innerHTML = '<%:Waiting for router...%>';
+		}
+
+		for (var net in wifidevs)
+		{
+			var st = document.getElementById(net + '-iw-status');
+			if (st)
+				st.innerHTML = '<em><%:Wireless is restarting...%></em>';
+		}
+
+		XHR.get('<%=luci.dispatcher.build_url("admin", "network")%>/wireless_' + (reconnect ? 'reconnect' : 'shutdown') + '/' + id, null,
+			function(x)
+			{
+				if (s)
+				{
+					s.innerHTML = reconnect
+						? '<%:Wireless restarted%>'
+						: '<%:Wireless shut down%>';
+
+					window.setTimeout(function() {
+						s.parentNode.style.display = 'none';
+						is_reconnecting = false;
+					}, 1000);
+				}
+			}
+		);
+	}
+
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "wireless_status", table.concat(netlist, ","))%>', null,
+		function(x, st)
+		{
+			if (st)
+			{
+				var assoctable = document.getElementById('iw-assoclist');
+				if (assoctable)
+					while (assoctable.rows.length > 1)
+						assoctable.rows[1].parentNode.removeChild(assoctable.rows[1]);
+
+				var devup = { };
+				var rowstyle = 1;
+
+				for( var i = 0; i < st.length; i++ )
+				{
+					var iw = st[i];
+					var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel);
+					var p = iw.quality;
+					var q = is_assoc ? p : -1;
+
+					var icon;
+					if (q < 0)
+						icon = "<%=resource%>/icons/signal-none.png";
+					else if (q == 0)
+						icon = "<%=resource%>/icons/signal-0.png";
+					else if (q < 25)
+						icon = "<%=resource%>/icons/signal-0-25.png";
+					else if (q < 50)
+						icon = "<%=resource%>/icons/signal-25-50.png";
+					else if (q < 75)
+						icon = "<%=resource%>/icons/signal-50-75.png";
+					else
+						icon = "<%=resource%>/icons/signal-75-100.png";
+
+					if (!devup[wifidevs[iw.id]])
+						devup[wifidevs[iw.id]] = is_assoc;
+
+					var sig = document.getElementById(iw.id + '-iw-signal');
+					if (sig)
+						sig.innerHTML = String.format(
+							'<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" /><br />' +
+							'<small>%d%%</small>', icon, iw.signal, iw.noise, p
+						);
+
+					var toggle = document.getElementById(iw.id + '-iw-toggle');
+					if (toggle)
+					{
+						if (is_assoc)
+						{
+							toggle.className = 'cbi-button cbi-button-reset';
+							toggle.value = '<%:Disable%>';
+							toggle.title = '<%:Shutdown this network%>';
+						}
+						else
+						{
+							toggle.className = 'cbi-button cbi-button-reload';
+							toggle.value = '<%:Enable%>';
+							toggle.title = '<%:Activate this network%>';
+						}
+
+						toggle.setAttribute('active', is_assoc);
+					}
+
+					var info = document.getElementById(iw.id + '-iw-status');
+					if (info)
+					{
+						if (is_assoc)
+							info.innerHTML = String.format(
+								'<strong><%:SSID%>:</strong> %h | ' +
+								'<strong><%:Mode%>:</strong> %s<br />' +
+								'<strong><%:BSSID%>:</strong> %s | ' +
+								'<strong><%:Encryption%>:</strong> %s',
+									iw.ssid, iw.mode, iw.bssid,
+									iw.encryption ? iw.encryption : '<%:None%>'
+							);
+						else
+							info.innerHTML = String.format(
+								'<strong><%:SSID%>:</strong> %h | ' +
+								'<strong><%:Mode%>:</strong> %s<br />' +
+								'<em>%s</em>',
+									iw.ssid || '?', iw.mode,
+									is_reconnecting
+										? '<em><%:Wireless is restarting...%></em>'
+										: '<em><%:Wireless is disabled or not associated%></em>'
+							);
+					}
+
+					var dev = document.getElementById(wifidevs[iw.id] + '-iw-devinfo');
+					if (dev)
+					{
+						if (is_assoc)
+							dev.innerHTML = String.format(
+								'<strong><%:Channel%>:</strong> %s (%s GHz) | ' +
+								'<strong><%:Bitrate%>:</strong> %s Mb/s',
+									iw.channel ? iw.channel : '?',
+									iw.frequency ? iw.frequency : '?',
+									iw.bitrate ? iw.bitrate : '?'
+							);
+						else
+							dev.innerHTML = '';
+					}
+
+					if (assoctable)
+					{
+						var assoclist = [ ];
+						for( var bssid in iw.assoclist )
+						{
+							assoclist.push(iw.assoclist[bssid]);
+							assoclist[assoclist.length-1].bssid = bssid;
+						}
+
+						assoclist.sort(function(a, b) { a.bssid < b.bssid });
+
+						for( var j = 0; j < assoclist.length; j++ )
+						{
+							var tr = assoctable.insertRow(-1);
+							    tr.className = 'cbi-section-table-row cbi-rowstyle-' + rowstyle;
+
+							var icon;
+							var q = (-1 * (assoclist[j].noise - assoclist[j].signal)) / 5;
+							if (q < 1)
+								icon = "<%=resource%>/icons/signal-0.png";
+							else if (q < 2)
+								icon = "<%=resource%>/icons/signal-0-25.png";
+							else if (q < 3)
+								icon = "<%=resource%>/icons/signal-25-50.png";
+							else if (q < 4)
+								icon = "<%=resource%>/icons/signal-50-75.png";
+							else
+								icon = "<%=resource%>/icons/signal-75-100.png";
+
+							tr.insertCell(-1).innerHTML = String.format(
+								'<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" />',
+								icon, assoclist[j].signal, assoclist[j].noise
+							);
+
+							tr.insertCell(-1).innerHTML = String.format('%h', iw.ssid ? iw.ssid : '?');
+							tr.insertCell(-1).innerHTML = assoclist[j].bssid;
+
+							tr.insertCell(-1).innerHTML = arptable[assoclist[j].bssid]
+								? arptable[assoclist[j].bssid] : '?';
+
+							tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[j].signal);
+							tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[j].noise);
+
+							tr.insertCell(-1).innerHTML = (assoclist[j].rx_mcs > -1)
+								? String.format('%.1f Mbit/s, MCS %d, %dMHz', assoclist[j].rx_rate / 1000, assoclist[j].rx_mcs, assoclist[j].rx_40mhz ? 40 : 20)
+								: String.format('%.1f Mbit/s', assoclist[j].rx_rate / 1000)
+							;
+
+							tr.insertCell(-1).innerHTML = (assoclist[j].tx_mcs > -1)
+								? String.format('%.1f Mbit/s, MCS %d, %dMHz', assoclist[j].tx_rate / 1000, assoclist[j].tx_mcs, assoclist[j].tx_40mhz ? 40 : 20)
+								: String.format('%.1f Mbit/s', assoclist[j].tx_rate / 1000)
+							;
+
+							rowstyle = (rowstyle == 1) ? 2 : 1;
+						}
+					}
+				}
+
+				if (assoctable && assoctable.rows.length == 1)
+				{
+					var tr = assoctable.insertRow(-1);
+					    tr.className = 'cbi-section-table-row';
+
+					var td = tr.insertCell(-1);
+					    td.colSpan = 8;
+					    td.innerHTML = '<br /><em><%:No information available%></em>';
+				}
+
+				for (var dev in devup)
+				{
+					var img = document.getElementById(dev + '-iw-upstate');
+					if (img)
+						img.src = '<%=resource%>/icons/wifi_big' + (devup[dev] ? '' : '_disabled') + '.png';
+				}
+			}
+		}
+	);
+//]]></script>
+
+<h2><a id="content" name="content"><%:Wireless Overview%></a></h2>
+
+<fieldset class="cbi-section" style="display:none">
+	<legend><%:Reconnecting interface%></legend>
+	<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
+	<span id="iw-rc-status"><%:Waiting for router...%></span>
+</fieldset>
 
 <div class="cbi-map">
 
-	<% for dev, state in utl.kspairs(devices) do %>
-	<!-- device <%=dev%> -->
+	<% for _, dev in ipairs(devices) do local nets = dev:get_wifinets() %>
+	<!-- device <%=dev:name()%> -->
 	<fieldset class="cbi-section">
 		<table class="cbi-section-table" style="margin:10px; empty-cells:hide">
 			<!-- physical device -->
 			<tr>
-				<td style="width:34px"><img src="<%=resource%>/icons/wifi<%=state.active and "" or "_disabled"%>.png" style="float:left; margin-right:10px" /></td>
+				<td style="width:34px"><img src="<%=resource%>/icons/wifi_big_disabled.png" style="float:left; margin-right:10px" id="<%=dev:name()%>-iw-upstate" /></td>
 				<td colspan="2" style="text-align:left">
-					<big><strong><%=state.hwname%> (<%=dev%>)</strong></big><br />
-					<strong>Channel:</strong> <%=find_wifi_frequency(state)%> |
-					<strong>Bitrate:</strong> <%=state.active and (state.networks[1].info.bitrate / 1000) .. " Mb/s" or "n/a"%>
+					<big><strong><%=guess_wifi_hw(dev:name())%> (<%=dev:name()%>)</strong></big><br />
+					<span id="<%=dev:name()%>-iw-devinfo"></span>
 				</td>
-				<td style="width:40px">
-					<a href="<%=luci.dispatcher.build_url("admin/network/wireless_join?device="..dev)%>"><img style="border:none" src="<%=resource%>/cbi/find.gif" alt="Find and join network" title="Find and join network" /></a>
-					<a href="#"><img style="border:none" src="<%=resource%>/cbi/add.gif" alt="Provide new network" title="Provide new network" /></a>
+				<td style="width:310px;text-align:right">
+					<input type="button" class="cbi-button cbi-button-find" style="width:100px" onclick="location.href='<%=luci.dispatcher.build_url("admin/network/wireless_join")%>?device=<%=dev:name()%>'" title="<%:Find and join network%>" value="<%:Scan%>" />
+					<input type="button" class="cbi-button cbi-button-add" style="width:100px" onclick="location.href='<%=luci.dispatcher.build_url("admin/network/wireless_add")%>?device=<%=dev:name()%>'" title="<%:Provide new network%>" value="<%:Add%>" />
 				</td>
 			</tr>
 			<!-- /physical device -->
 
 			<!-- network list -->
-			<% if #state.networks > 0 then %>
-				<% for i, net in ipairs(state.networks) do %>
+			<% if #nets > 0 then %>
+				<% for i, net in ipairs(nets) do %>
 				<tr class="cbi-section-table-row cbi-rowstyle-<%=1 + ((i-1) % 2)%>">
 					<td></td>
-					<td class="cbi-value-field" style="width:16px; padding:3px">
-						<img src="<%=guess_wifi_signal(net.info)%>" title="Signal: <%=net.info.signal%> dBm / Noise: <%=net.info.noise%> dBm" /><br />
-						<small><%=percent_wifi_signal(net.info)%>%</small>
+					<td class="cbi-value-field" style="width:16px; padding:3px" id="<%=net:id()%>-iw-signal">
+						<img src="<%=resource%>/icons/signal-none.png" title="<%:Not associated%>" /><br />
+						<small>0%</small>
 					</td>
-					<td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px">
-						<strong>SSID:</strong> <%=utl.pcdata(net.info.ssid)%> |
-						<strong>Mode:</strong> <%=net.info.mode%><br />
-						<strong>BSSID:</strong> <%=net.info.bssid%> |
-						<strong>Encryption:</strong> <%=net.info.enctype%>
+					<td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=net:id()%>-iw-status">
+						<em><%:Collecting data...%></em>
 					</td>
-					<td class="cbi-value-field" style="width:40px">
-						<a href="<%=REQUEST_URI%>/<%=dev%>"><img style="border:none" src="<%=resource%>/cbi/edit.gif" alt="Edit this network" title="Edit this network" /></a>
-						<a href="#"><img style="border:none" src="<%=resource%>/cbi/remove.gif" alt="Delete this network" title="Delete this network" /></a>
+					<td class="cbi-value-field" style="width:310px;text-align:right">
+						<input id="<%=net:id()%>-iw-toggle" type="button" class="cbi-button cbi-button-reload" style="width:100px" onclick="wifi_shutdown('<%=net:id()%>', this)" title="<%:Delete this network%>" value="<%:Enable%>" />
+						<input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=net:adminlink()%>'" title="<%:Edit this network%>" value="<%:Edit%>" />
+						<input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="if (confirm('<%:Really delete this wireless network? The deletion cannot be undone!\nYou might lose access to this router if you are connected via this network.%>')) location.href='<%=luci.dispatcher.build_url("admin/network/wireless_delete", net:ifname())%>'" title="<%:Delete this network%>" value="<%:Remove%>" />
 					</td>
 				</tr>
 				<% end %>
@@ -195,54 +396,36 @@ $Id$
 				<tr class="cbi-section-table-row cbi-rowstyle-2">
 					<td></td>
 					<td colspan="3" class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px">
-						<em>(No network configured on this device)</em>
+						<em><%:No network configured on this device%></em>
 					</td>
 				</tr>
 			<% end %>
 			<!-- /network list -->
 		</table>
 	</fieldset>
-	<!-- /device <%=dev%> -->
+	<!-- /device <%=dev:name()%> -->
 	<% end %>
 
 
-
-
-	<h2><a id="content" name="content"><%:a_s_iw_overview2 Associated Stations%></a></h2>
+	<h2><a id="content" name="content"><%:Associated Stations%></a></h2>
 
 	<fieldset class="cbi-section">
-		<table class="cbi-section-table" style="margin:10px; width:50%">
+		<table class="cbi-section-table" style="margin:10px" id="iw-assoclist">
 			<tr class="cbi-section-table-titles">
 				<th class="cbi-section-table-cell"></th>
-				<th class="cbi-section-table-cell">SSID</th>
-				<th class="cbi-section-table-cell">MAC</th>
-				<th class="cbi-section-table-cell">Address</th>
-				<th class="cbi-section-table-cell">Signal</th>
-				<th class="cbi-section-table-cell">Noise</th>
+				<th class="cbi-section-table-cell"><%:SSID%></th>
+				<th class="cbi-section-table-cell"><%:MAC%></th>
+				<th class="cbi-section-table-cell"><%:Address%></th>
+				<th class="cbi-section-table-cell"><%:Signal%></th>
+				<th class="cbi-section-table-cell"><%:Noise%></th>
+				<th class="cbi-section-table-cell"><%:RX Rate%></th>
+				<th class="cbi-section-table-cell"><%:TX Rate%></th>
 			</tr>
-
-			<% local count = -1 %>
-			<% for dev, state in utl.kspairs(devices) do %>
-				<% for _, net in ipairs(state.networks) do %>
-					<% for mac, info in utl.kspairs(net.info.assoclist) do info.bssid = mac; count = count + 1 %>
-					<tr class="cbi-section-table-row cbi-rowstyle-<%=1 + (count % 2)%>">
-						<td class="cbi-value-field"><img src="<%=guess_wifi_signal(info)%>" title="Signal: <%=info.signal%> dBm / Noise: <%=info.noise%> dBm" /></td>
-						<td class="cbi-value-field"><%=net.info.ssid%></td>
-						<td class="cbi-value-field"><%=mac%></td>
-						<td class="cbi-value-field"><%=arpcache[mac] or "n/a"%></td>
-						<td class="cbi-value-field"><%=info.signal%> dBm</td>
-						<td class="cbi-value-field"><%=info.noise%> dBm</td>
-					</tr>
-					<% end %>
-				<% end %>
-			<% end %>
-			<% if count <= 0 then %>
 			<tr class="cbi-section-table-row cbi-rowstyle-2">
-				<td class="cbi-value-field" colspan="6">
-					<em>No information available</em>
+				<td class="cbi-value-field" colspan="8">
+					<em><%:Collecting data...%></em>
 				</td>
 			</tr>
-			<% end %>
 		</table>
 	</fieldset>
 </div>