libs/sys: fix parsing of model and cpu info, consider 2000::/3 as IPv6 default route...

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

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index d4242a3..722d5a3 100644 (file)
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -30,15 +30,14 @@ local os     = require "os"
 local table  = require "table"
 local nixio  = require "nixio"
 local fs     = require "nixio.fs"
-local iwinfo = require "iwinfo"
 local uci    = require "luci.model.uci"
 
 local luci  = {}
 luci.util   = require "luci.util"
 luci.ip     = require "luci.ip"
 
-local tonumber, ipairs, pairs, pcall, type, next, setmetatable =
-       tonumber, ipairs, pairs, pcall, type, next, setmetatable
+local tonumber, ipairs, pairs, pcall, type, next, setmetatable, require =
+       tonumber, ipairs, pairs, pcall, type, next, setmetatable, require
 
 
 --- LuCI Linux and POSIX system utilities.
@@ -60,20 +59,6 @@ end
 -- @return                     String containg the return the output of the command
 exec = luci.util.exec
 
---- Invoke the luci-flash executable to write an image to the flash memory.
--- @param image                Local path or URL to image file
--- @param kpattern     Pattern of files to keep over flash process
--- @return                     Return value of os.execute()
-function flash(image, kpattern)
-       local cmd = "luci-flash "
-       if kpattern then
-               cmd = cmd .. "-k '" .. kpattern:gsub("'", "") .. "' "
-       end
-       cmd = cmd .. "'" .. image:gsub("'", "") .. "' >/dev/null 2>&1"
-
-       return os.execute(cmd)
-end
-
 --- Retrieve information about currently mounted file systems.
 -- @return     Table containing mount information
 function mounts()
@@ -181,28 +166,30 @@ end
 -- @return     String containing the memory used for caching in kB
 -- @return     String containing the memory used for buffering in kB
 -- @return     String containing the free memory amount in kB
+-- @return     String containing the cpu bogomips (number)
 function sysinfo()
        local cpuinfo = fs.readfile("/proc/cpuinfo")
        local meminfo = fs.readfile("/proc/meminfo")
 
-       local system = cpuinfo:match("system typ.-:%s*([^\n]+)")
-       local model = ""
        local memtotal = tonumber(meminfo:match("MemTotal:%s*(%d+)"))
        local memcached = tonumber(meminfo:match("\nCached:%s*(%d+)"))
        local memfree = tonumber(meminfo:match("MemFree:%s*(%d+)"))
        local membuffers = tonumber(meminfo:match("Buffers:%s*(%d+)"))
+       local bogomips = tonumber(cpuinfo:match("BogoMIPS.-:%s*([^\n]+)"))
 
-       if not system then
-               system = nixio.uname().machine
-               model = cpuinfo:match("model name.-:%s*([^\n]+)")
-               if not model then
-                       model = cpuinfo:match("Processor.-:%s*([^\n]+)")
-               end
-       else
-               model = cpuinfo:match("cpu model.-:%s*([^\n]+)")
-       end
+       local system =
+               cpuinfo:match("system type\t+: ([^\n]+)") or
+               cpuinfo:match("Processor\t+: ([^\n]+)") or
+               cpuinfo:match("model name\t+: ([^\n]+)")
 
-       return system, model, memtotal, memcached, membuffers, memfree
+       local model =
+               cpuinfo:match("machine\t+: ([^\n]+)") or
+               cpuinfo:match("Hardware\t+: ([^\n]+)") or
+               fs.readfile("/proc/diag/model") or
+               nixio.uname().machine() or
+               system
+
+       return system, model, memtotal, memcached, membuffers, memfree, bogomips
 end
 
 --- Retrieves the output of the "logread" command.
@@ -320,6 +307,17 @@ function net.defaultroute6()
                end
        end)
 
+       if not route then
+               local global_unicast = luci.ip.IPv6("2000::/3")
+               net.routes6(function(rt)
+                       if rt.dest:equal(global_unicast) and
+                          (not route or route.metric > rt.metric)
+                       then
+                               route = rt
+                       end
+               end)
+       end
+
        return route
 end
 
@@ -617,16 +615,17 @@ end
 -- @return                     Number containing 0 on success and >= 1 on error
 function user.setpasswd(username, password)
        if password then
-               password = password:gsub("'", "")
+               password = password:gsub("'", [['"'"']])
        end
 
        if username then
-               username = username:gsub("'", "")
+               username = username:gsub("'", [['"'"']])
        end
 
-       local cmd = "(echo '"..password.."';sleep 1;echo '"..password.."')|"
-       cmd = cmd .. "passwd '"..username.."' >/dev/null 2>&1"
-       return os.execute(cmd)
+       return os.execute(
+               "(echo '" .. password .. "'; sleep 1; echo '" .. password .. "') | " ..
+               "passwd '" .. username .. "' >/dev/null 2>&1"
+       )
 end
 
 
@@ -639,6 +638,8 @@ wifi = {}
 -- @param ifname        String containing the interface name
 -- @return              A wrapped iwinfo object instance
 function wifi.getiwinfo(ifname)
+       local stat, iwinfo = pcall(require, "iwinfo")
+
        if ifname then
                local c = 0
                local u = uci.cursor_state()
@@ -665,19 +666,17 @@ function wifi.getiwinfo(ifname)
                                end)
                end
 
-               local t = iwinfo.type(ifname)
-               if t then
-                       local x = iwinfo[t]
-                       return setmetatable({}, {
-                               __index = function(t, k)
-                                       if k == "ifname" then
-                                               return ifname
-                                       elseif x[k] then
-                                               return x[k](ifname)
-                                       end
+               local t = stat and iwinfo.type(ifname)
+               local x = t and iwinfo[t] or { }
+               return setmetatable({}, {
+                       __index = function(t, k)
+                               if k == "ifname" then
+                                       return ifname
+                               elseif x[k] then
+                                       return x[k](ifname)
                                end
-                       })
-               end
+                       end
+               })
        end
 end
 
@@ -735,10 +734,14 @@ end
 -- @param iface        Wireless interface (optional)
 -- @return             Table of available channels
 function wifi.channels(iface)
-       local t = iwinfo.type(iface or "")
+       local stat, iwinfo = pcall(require, "iwinfo")
        local cns
-       if iface and t and iwinfo[t] then
-               cns = iwinfo[t].freqlist(iface)
+
+       if stat then
+               local t = iwinfo.type(iface or "")
+               if iface and t and iwinfo[t] then
+                       cns = iwinfo[t].freqlist(iface)
+               end
        end
 
        if not cns or #cns == 0 then