From df565f76b50e08c40f38d8303cb8c7ac4af0c4dc Mon Sep 17 00:00:00 2001 From: Jan-Tarek Butt Date: Wed, 24 Jan 2018 12:15:39 +0100 Subject: [PATCH] geolocator: ensure MAC addreses are filert by uppercase matching --- .../luasrc/lib/gluon/geolocator/geolocator | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/gluon-geolocator/luasrc/lib/gluon/geolocator/geolocator b/package/gluon-geolocator/luasrc/lib/gluon/geolocator/geolocator index 1be3c55c..1a08ccf2 100755 --- a/package/gluon-geolocator/luasrc/lib/gluon/geolocator/geolocator +++ b/package/gluon-geolocator/luasrc/lib/gluon/geolocator/geolocator @@ -33,7 +33,7 @@ local function exit(exc) if file_exsist(PID_PART) then os.remove(PID_PART) end - os.exit(tonumber(exc)) + os.exit(exc) end local function table_contains(tbl, prefix) @@ -64,7 +64,8 @@ local function Get_geolocation_info() -- Get list of BSSID there should ignored local blacklist_bssid = { } for _, bl_bssid in ipairs(uci:get(GLC, "settings", "blacklist")) do - table.insert(blacklist_bssid,string.upper(bl_bssid)) + -- Ensure rm colons and uppercase + table.insert(blacklist_bssid,string.upper(bl_bssid):gsub(":", "")) end local scaned_bssid = "" @@ -76,6 +77,8 @@ local function Get_geolocation_info() -- Get list of BSSID without blacklisted and redundancy entrys. for _, net in ipairs(iw.scanlist(ifname) or { }) do + -- Ensure rm colons and uppercase + net.bssid = string.upper(net.bssid:gsub(":", "")) if not uniq[net.bssid] and not table_contains(blacklist_bssid, net.bssid) then scaned_bssid = scaned_bssid .. "," .. net.bssid uniq[net.bssid] = true