<%#
LuCI - Lua Configuration Interface
Copyright 2008-2009 Steven Barth <steven@midlink.org>
-Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
+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.
<%-
local sys = require "luci.sys"
+ local fs = require "luci.fs"
local utl = require "luci.util"
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")
-- 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"
+
+ -- hostap
+ elseif name == "wlan" and fs.isdirectory("/proc/net/hostap/" .. ifname) then
+ return "Prism2/2.5/3 802.11b Wireless Controller"
-- dunno yet
else
- return "Generic 802.11 Wireless Controller"
+ return "Generic 802.11%s Wireless Controller" % bands
end
end
for _, dev in ipairs(devices) do
local net
for _, net in ipairs(dev:get_wifinets()) do
- netlist[#netlist+1] = net:ifname()
- netdevs[net:ifname()] = dev:name()
+ netlist[#netlist+1] = net:id()
+ netdevs[net:id()] = dev:name()
end
end
-%>
<%+header%>
+<% if not has_iwinfo then %>
+ <div class="errorbox">
+ <strong><%:Package libiwinfo required!%></strong><br />
+ <%_The <em>libiwinfo</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[
+<script type="text/javascript">//<![CDATA[
var iwxhr = new XHR();
var wifidevs = <%=luci.http.write_json(netdevs)%>;
var arptable = <%=luci.http.write_json(arpcache)%>;
- (function() {
+ var update_status = function() {
iwxhr.get('<%=luci.dispatcher.build_url("admin", "network", "wireless_status", table.concat(netlist, ","))%>', null,
function(x, st)
{
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.channel);
- var p = (100 / iw.quality_max * iw.quality);
+ 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 (is_assoc)
info.innerHTML = String.format(
- '<strong><%:SSID%>:</strong> %s | ' +
+ '<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.description : '<%:None%>'
+ iw.encryption ? iw.encryption : '<%:None%>'
);
else
- info.innerHTML = '<em><%:Wireless is disabled or not associated%></em>';
+ info.innerHTML = String.format(
+ '<strong><%:SSID%>:</strong> %h | ' +
+ '<strong><%:Mode%>:</strong> %s<br />' +
+ '<em><%:Wireless is disabled or not associated%></em>',
+ iw.ssid || '?', iw.mode
+ );
}
var dev = document.getElementById(wifidevs[iw.id] + '-iw-devinfo');
'<strong><%:Channel%>:</strong> %s (%s GHz) | ' +
'<strong><%:Bitrate%>:</strong> %s Mb/s',
iw.channel ? iw.channel : '?',
- iw.frequency ? iw.frequency / 1000 : '?',
- iw.bitrate ? iw.bitrate / 1000 : '?'
+ iw.frequency ? iw.frequency : '?',
+ iw.bitrate ? iw.bitrate : '?'
);
else
dev.innerHTML = '';
for( var j = 0; j < assoclist.length; j++ )
{
- var tr = document.createElement('tr');
- tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((j % 2) + (i % 2));
+ 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;
else
icon = "<%=resource%>/icons/signal-75-100.png";
- tr.innerHTML = String.format(
- '<td class="cbi-value-field">' +
- '<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" />' +
- '</td>' +
- '<td class="cbi-value-field">%s</td>' +
- '<td class="cbi-value-field">%s</td>' +
- '<td class="cbi-value-field">%s</td>' +
- '<td class="cbi-value-field">%d dBm</td>' +
- '<td class="cbi-value-field">%d dBm</td>',
- icon,
- assoclist[j].signal, assoclist[j].noise,
- iw.ssid ? iw.ssid : '?',
- assoclist[j].bssid,
- arptable[assoclist[j].bssid]
- ? arptable[assoclist[j].bssid] : '?',
- assoclist[j].signal, assoclist[j].noise
+ tr.insertCell(-1).innerHTML = String.format(
+ '<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" />',
+ icon, assoclist[j].signal, assoclist[j].noise
);
- assoctable.rows[0].parentNode.appendChild(tr);
+ tr.insertCell(-1).innerHTML = 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);
+
+ rowstyle = (rowstyle == 1) ? 2 : 1;
}
}
}
if (assoctable && assoctable.rows.length == 1)
{
- var tr = document.createElement('tr');
- tr.className = 'cbi-section-table-row';
-
- tr.innerHTML = '<td class="cbi-value-field" colspan="6"><br /><em><%:No information available%></em></td>';
+ var tr = assoctable.insertRow(-1);
+ tr.className = 'cbi-section-table-row';
- assoctable.rows[0].parentNode.appendChild(tr);
+ var td = tr.insertCell(-1);
+ td.colSpan = 6;
+ 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' + (devup[dev] ? '' : '_disabled') + '.png';
+ img.src = '<%=resource%>/icons/wifi_big' + (devup[dev] ? '' : '_disabled') + '.png';
}
}
+
+ window.setTimeout(update_status, 5000);
}
)
+ };
- window.setTimeout(arguments.callee, 5000);
- })();
-]]></script>
+ update_status();
+//]]></script>
<h2><a id="content" name="content"><%:Wireless Overview%></a></h2>
<table class="cbi-section-table" style="margin:10px; empty-cells:hide">
<!-- physical device -->
<tr>
- <td style="width:34px"><img src="<%=resource%>/icons/wifi_disabled.png" style="float:left; margin-right:10px" id="<%=dev:name()%>-iw-upstate" /></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><%=guess_wifi_hw(dev:name())%> (<%=dev:name()%>)</strong></big><br />
<span id="<%=dev:name()%>-iw-devinfo"></span>
<% 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" id="<%=net:ifname()%>-iw-signal">
+ <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" id="<%=net:ifname()%>-iw-status">
+ <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">
projects / project / luci.git / blobdiff