Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix: A disabled wireless network may be shown as enabled, when multiple networks are defined on the same radio.

Browse source
This commit is contained in:
Georgi Valkov 2015-07-18 02:28:54 +03:00 committed by Jo-Philipp Wich
parent 159b60f449
commit ec170d6282
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/luci-base/luasrc/tools/status.lua
View file

@ -120,7 +120,9 @@ function wifi_networks()
assoclist = net:assoclist(), assoclist = net:assoclist(),
country = net:country(), country = net:country(),
txpower = net:txpower(), txpower = net:txpower(),
txpoweroff = net:txpower_offset() txpoweroff = net:txpower_offset(),
disabled = (dev:get("disabled") == "1" or
net:get("disabled") == "1")
} }
end end

2
modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm
View file

@ -183,7 +183,7 @@
for( var i = 0; i < st.length; i++ ) for( var i = 0; i < st.length; i++ )
{ {
var iw = st[i]; var iw = st[i];
var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel && iw.mode != 'Unknown'); var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel && iw.mode != 'Unknown' && !iw.disabled);
var p = iw.quality; var p = iw.quality;
var q = is_assoc ? p : -1; var q = is_assoc ? p : -1;

2
modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm
View file

@ -6,7 +6,7 @@
{ {
if (iw && (iw = iw[0])) if (iw && (iw = iw[0]))
{ {
var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel); var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel && !iw.disabled);
var p = iw.quality; var p = iw.quality;
var q = is_assoc ? p : -1; var q = is_assoc ? p : -1;

2
modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
View file

@ -352,7 +352,7 @@
for (var nidx = 0; nidx < dev.networks.length; nidx++) for (var nidx = 0; nidx < dev.networks.length; nidx++)
{ {
var net = dev.networks[nidx]; var net = dev.networks[nidx];
var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel); var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel && !net.disabled);
var icon; var icon;
if (!is_assoc) if (!is_assoc)