nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge cbec1dc4e9 into 9d5c551166

Browse Source
This commit is contained in:
Julian 2017-04-10 14:38:50 +00:00 committed by GitHub
commit 32182cfc4c
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
View File

@ -138,6 +138,10 @@ local function find_phy_by_path(path)
for phy in fs.glob('/sys/devices/' .. path .. '/ieee80211/phy*') do for phy in fs.glob('/sys/devices/' .. path .. '/ieee80211/phy*') do
return phy:match('([^/]+)$') return phy:match('([^/]+)$')
end end
for phy in fs.glob('/sys/devices/platform/' .. path .. '/ieee80211/phy*') do
return phy:match('([^/]+)$')
end
end end
local function find_phy_by_macaddr(macaddr) local function find_phy_by_macaddr(macaddr)
@ -149,7 +153,7 @@ local function find_phy_by_macaddr(macaddr)
end end
end end
local function find_phy(radio) function find_phy(radio)
local config = uci:get_all('wireless', radio) local config = uci:get_all('wireless', radio)
if not config or config.type ~= 'mac80211' then if not config or config.type ~= 'mac80211' then

23
package/gluon-web-wifi-config/luasrc/lib/gluon/web/model/admin/wifi-config.lua
View File

@ -4,21 +4,6 @@ local uci = require("simple-uci").cursor()
local util = require 'gluon.util' local util = require 'gluon.util'
local function find_phy_by_path(path)
for phy in fs.glob("/sys/devices/" .. path .. "/ieee80211/phy*") do
return phy:match("([^/]+)$")
end
end
local function find_phy_by_macaddr(macaddr)
local addr = macaddr:lower()
for file in fs.glob("/sys/class/ieee80211/*/macaddress") do
if util.trim(fs.readfile(file)) == addr then
return file:match("([^/]+)/macaddress$")
end
end
end
local function txpower_list(phy) local function txpower_list(phy)
local list = iwinfo.nl80211.txpwrlist(phy) or { } local list = iwinfo.nl80211.txpwrlist(phy) or { }
local off = tonumber(iwinfo.nl80211.txpower_offset(phy)) or 0 local off = tonumber(iwinfo.nl80211.txpower_offset(phy)) or 0
@ -84,12 +69,8 @@ uci:foreach('wireless', 'wifi-device', function(config)
vif_option('mesh', translate("Enable mesh network (802.11s)")) vif_option('mesh', translate("Enable mesh network (802.11s)"))
vif_option('ibss', translate("Enable mesh network (IBSS)")) vif_option('ibss', translate("Enable mesh network (IBSS)"))
local phy local phy = util.find_phy(radio)
if config.path then if phy == nil then
phy = find_phy_by_path(config.path)
elseif config.macaddr then
phy = find_phy_by_macaddr(config.macaddr)
else
return return
end end