libs/sys: workaround for Lua number overflow in ipv6 route metrics

[project/luci.git] / libs / sys / luasrc / sys.lua

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index d570770..f30a2b6 100644 (file)
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -25,18 +25,19 @@ limitations under the License.
 ]]--
 
 
-local io    = require "io"
-local os    = require "os"
-local table = require "table"
-local nixio = require "nixio"
-local fs    = require "nixio.fs"
+local io     = require "io"
+local os     = require "os"
+local table  = require "table"
+local nixio  = require "nixio"
+local fs     = require "nixio.fs"
+local iwinfo = require "iwinfo"
 
 local luci  = {}
 luci.util   = require "luci.util"
 luci.ip     = require "luci.ip"
 
-local tonumber, ipairs, pairs, pcall, type, next =
-       tonumber, ipairs, pairs, pcall, type, next
+local tonumber, ipairs, pairs, pcall, type, next, setmetatable =
+       tonumber, ipairs, pairs, pcall, type, next, setmetatable
 
 
 --- LuCI Linux and POSIX system utilities.
@@ -462,7 +463,11 @@ function net.routes6(callback)
                                refcount = tonumber(refcnt, 16),
                                usecount = tonumber(usecnt, 16),
                                flags    = tonumber(flags, 16),
-                               device   = dev
+                               device   = dev,
+
+                               -- lua number is too small for storing the metric
+                               -- add a metric_raw field with the original content
+                               metric_raw = metric
                        }
 
                        if callback then
@@ -617,6 +622,21 @@ end
 -- @name       luci.sys.wifi
 wifi = {}
 
+--- Get wireless information for given interface.
+-- @param ifname        String containing the interface name
+-- @return              A wrapped iwinfo object instance
+function wifi.getiwinfo(ifname)
+       local t = iwinfo.type(ifname)
+       if t then
+               local x = iwinfo[t]
+               return setmetatable({}, {
+                       __index = function(t, k)
+                               if x[k] then return x[k](ifname) end
+                       end
+               })
+       end
+end
+
 --- Get iwconfig output for all wireless devices.
 -- @return     Table of tables containing the iwconfing output for each wifi device
 function wifi.getiwconfig()
@@ -671,27 +691,25 @@ end
 -- @param iface        Wireless interface (optional)
 -- @return             Table of available channels
 function wifi.channels(iface)
-       local cmd = "iwlist " .. ( iface or "" ) .. " freq 2>/dev/null"
-       local cns = { }
-
-       local fd = io.popen(cmd)
-       if fd then
-               local ln, c, f
-               while true do
-                       ln = fd:read("*l")
-                       if not ln then break end
-                       c, f = ln:match("Channel (%d+) : (%d+%.%d+) GHz")
-                       if c and f then
-                               cns[tonumber(c)] = tonumber(f)
-                       end
-               end
-               fd:close()
+       local t = iwinfo.type(iface or "")
+       local cns
+       if t and iwinfo[t] then
+               cns = iwinfo[t].freqlist(iface)
        end
 
-       if not next(cns) then
+       if not cns or #cns == 0 then
                cns = {
-                       2.412, 2.417, 2.422, 2.427, 2.432, 2.437,
-                       2.442, 2.447, 2.452, 2.457, 2.462
+                       {channel =  1, mhz = 2412},
+                       {channel =  2, mhz = 2417},
+                       {channel =  3, mhz = 2422},
+                       {channel =  4, mhz = 2427},
+                       {channel =  5, mhz = 2432},
+                       {channel =  6, mhz = 2437},
+                       {channel =  7, mhz = 2442},
+                       {channel =  8, mhz = 2447},
+                       {channel =  9, mhz = 2452},
+                       {channel = 10, mhz = 2457},
+                       {channel = 11, mhz = 2462}
                }
        end