X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_network%2Fwifi_overview.htm;h=8e64d1422cc893ae1200518b73ce655030f0f878;hp=20f0e8d6ec16f1a46424369d896bb49e012b469d;hb=f845d2fe42c3c4d1fcaf3a22dde1fe024ef4afd4;hpb=e75c0911a3596be125c9eed1b53271e86546f6d1 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 20f0e8d6e..8e64d1422 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 -Copyright 2008-2010 Jo-Philipp Wich +Copyright 2008-2011 Jo-Philipp Wich Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,19 +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() 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") @@ -56,19 +71,23 @@ $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" + + -- 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 @@ -83,25 +102,31 @@ $Id$ 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 %> +
+ <%:Package libiwinfo required!%>
+ <%_The libiwinfo package is not installed. You must install this component for working wireless configuration!%> +
+<% end %> + - + update_status(); +//]]>

<%:Wireless Overview%>

@@ -236,14 +288,14 @@ $Id$ - + @@ -253,16 +305,16 @@ $Id$ <% for i, net in ipairs(nets) do %> - - <% end %> @@ -270,7 +322,7 @@ $Id$ <% end %>
.png" style="float:left; margin-right:10px" /> <%=guess_wifi_hw(dev:name())%> (<%=dev:name()%>)
 - Find and join network - Provide new network + ?device=<%=dev:name()%>"><%:Find and join network%> + ?device=<%=dev:name()%>"><%:Provide new network%>
+
0% 		+ <%:Collecting data...%> - Edit this network - ">Delete this network + <%:Edit this network%> + " onclick="return confirm('<%:Really delete this wireless network? The deletion cannot be undone!\nYou might loose access to this router if you are connected via this network.%>')"><%:Delete this network%>
- (No network configured on this device) + <%:No network configured on this device%>