libs/sys: recent busybox versions changed top output from %MEM to %VSZ, fix luci...

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

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index 1cf8b9f..f9b253e 100644 (file)
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -171,23 +171,23 @@ 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]+)"))
+       local bogomips = tonumber(cpuinfo:match("[Bb]ogo[Mm][Ii][Pp][Ss].-: ([^\n]+)")) or 0
 
-       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]+)")
+
+       local model =
+               cpuinfo:match("machine\t+: ([^\n]+)") or
+               cpuinfo:match("Hardware\t+: ([^\n]+)") or
+               luci.util.pcdata(fs.readfile("/proc/diag/model")) or
+               nixio.uname().machine or
+               system
 
        return system, model, memtotal, memcached, membuffers, memfree, bogomips
 end
@@ -240,32 +240,36 @@ function net.conntrack(callback)
                for line in io.lines("/proc/net/nf_conntrack") do
                        line = line:match "^(.-( [^ =]+=).-)%2"
                        local entry, flags = _parse_mixed_record(line, " +")
-                       entry.layer3 = flags[1]
-                       entry.layer4 = flags[3]
-                       for i=1, #entry do
-                               entry[i] = nil
-                       end
+                       if flags[6] ~= "TIME_WAIT" then
+                               entry.layer3 = flags[1]
+                               entry.layer4 = flags[3]
+                               for i=1, #entry do
+                                       entry[i] = nil
+                               end
 
-                       if callback then
-                               callback(entry)
-                       else
-                               connt[#connt+1] = entry
+                               if callback then
+                                       callback(entry)
+                               else
+                                       connt[#connt+1] = entry
+                               end
                        end
                end
        elseif fs.access("/proc/net/ip_conntrack", "r") then
                for line in io.lines("/proc/net/ip_conntrack") do
                        line = line:match "^(.-( [^ =]+=).-)%2"
                        local entry, flags = _parse_mixed_record(line, " +")
-                       entry.layer3 = "ipv4"
-                       entry.layer4 = flags[1]
-                       for i=1, #entry do
-                               entry[i] = nil
-                       end
+                       if flags[4] ~= "TIME_WAIT" then
+                               entry.layer3 = "ipv4"
+                               entry.layer4 = flags[1]
+                               for i=1, #entry do
+                                       entry[i] = nil
+                               end
 
-                       if callback then
-                               callback(entry)
-                       else
-                               connt[#connt+1] = entry
+                               if callback then
+                                       callback(entry)
+                               else
+                                       connt[#connt+1] = entry
+                               end
                        end
                end
        else
@@ -302,11 +306,24 @@ function net.defaultroute6()
        local route
 
        net.routes6(function(rt)
-               if rt.dest:prefix() == 0 and (not route or route.metric > rt.metric) then
+               if rt.dest:prefix() == 0 and rt.device ~= "lo" and 
+                  (not route or route.metric > rt.metric)
+               then
                        route = rt
                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
 
@@ -509,6 +526,9 @@ function process.list()
                end
 
                k = luci.util.split(luci.util.trim(line), "%s+", nil, true)
+               if k[6] == "%VSZ" then
+                       k[6] = "%MEM"
+               end
                if k[1] == "PID" then
                        break
                end
@@ -604,16 +624,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
 
 
@@ -773,7 +794,7 @@ end
 -- @return             Boolean indicating whether init is enabled
 function init.enabled(name)
        if fs.access(init.dir..name) then
-               return ( call(init.dir..name.." enabled") == 0 )
+               return ( call(init.dir..name.." enabled >/dev/null") == 0 )
        end
        return false
 end
@@ -783,7 +804,7 @@ end
 -- @return             Numeric index value
 function init.index(name)
        if fs.access(init.dir..name) then
-               return call("source "..init.dir..name.." enabled; exit $START")
+               return call("source "..init.dir..name.." enabled >/dev/null; exit $START")
        end
 end
 
@@ -792,7 +813,7 @@ end
 -- @return             Boolean indicating success
 function init.enable(name)
        if fs.access(init.dir..name) then
-               return ( call(init.dir..name.." enable") == 1 )
+               return ( call(init.dir..name.." enable >/dev/null") == 1 )
        end
 end
 
@@ -801,7 +822,7 @@ end
 -- @return             Boolean indicating success
 function init.disable(name)
        if fs.access(init.dir..name) then
-               return ( call(init.dir..name.." disable") == 0 )
+               return ( call(init.dir..name.." disable >/dev/null") == 0 )
        end
 end