Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rearrange output of luci.sys.wifi.*, luci.sys.net.conntrack

Browse source
This commit is contained in:
Steven Barth 2008-10-17 21:56:21 +00:00
parent 2f6ae89936
commit 758c06df58
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libs/sys/luasrc/sys.lua
View file

@ -265,9 +265,9 @@ function net.conntrack()
local connt = {} local connt = {}
if luci.fs.access("/proc/net/nf_conntrack") then if luci.fs.access("/proc/net/nf_conntrack") then
for line in io.lines("/proc/net/nf_conntrack") do for line in io.lines("/proc/net/nf_conntrack") do
local entry = _parse_mixed_record(line, " +") local entry, flags = _parse_mixed_record(line, " +")
entry.layer3 = entry[1] entry.layer3 = flags[1]
entry.layer4 = entry[2] entry.layer4 = flags[2]
for i=1, #entry do for i=1, #entry do
entry[i] = nil entry[i] = nil
end end
@ -276,9 +276,9 @@ function net.conntrack()
end end
elseif luci.fs.access("/proc/net/ip_conntrack") then elseif luci.fs.access("/proc/net/ip_conntrack") then
for line in io.lines("/proc/net/ip_conntrack") do for line in io.lines("/proc/net/ip_conntrack") do
local entry = _parse_mixed_record(line, " +") local entry, flags = _parse_mixed_record(line, " +")
entry.layer3 = "ipv4" entry.layer3 = "ipv4"
entry.layer4 = entry[1] entry.layer4 = flags[1]
for i=1, #entry do for i=1, #entry do
entry[i] = nil entry[i] = nil
end end
@ -533,7 +533,11 @@ function wifi.getiwconfig()
local k = l:match("^(.-) ") local k = l:match("^(.-) ")
l = l:gsub("^(.-) +", "", 1) l = l:gsub("^(.-) +", "", 1)
if k then if k then
iwc[k] = _parse_mixed_record(l) local entry, flags = _parse_mixed_record(l)
if entry then
entry.flags = flags
end
iwc[k] = entry
end end
end end
@ -557,7 +561,11 @@ function wifi.iwscan(iface)
c = c:gsub("^(.-)- ", "", 1) c = c:gsub("^(.-)- ", "", 1)
c = luci.util.split(c, "\n", 7) c = luci.util.split(c, "\n", 7)
c = table.concat(c, "\n", 1) c = table.concat(c, "\n", 1)
table.insert(iws[k], _parse_mixed_record(c)) local entry, flags = _parse_mixed_record(c)
if entry then
entry.flags = flags
end
table.insert(iws[k], entry)
end end
end end
end end
@ -653,6 +661,7 @@ end
function _parse_mixed_record(cnt, delimiter) function _parse_mixed_record(cnt, delimiter)
delimiter = delimiter or " " delimiter = delimiter or " "
local data = {} local data = {}
local flags = {}
for i, l in pairs(luci.util.split(luci.util.trim(cnt), "\n")) do for i, l in pairs(luci.util.split(luci.util.trim(cnt), "\n")) do
for j, f in pairs(luci.util.split(luci.util.trim(l), delimiter, nil, true)) do for j, f in pairs(luci.util.split(luci.util.trim(l), delimiter, nil, true)) do
@ -660,7 +669,7 @@ function _parse_mixed_record(cnt, delimiter)
if k then if k then
if x == "" then if x == "" then
table.insert(data, k) table.insert(flags, k)
else else
data[k] = v data[k] = v
end end
@ -668,5 +677,5 @@ function _parse_mixed_record(cnt, delimiter)
end end
end end
return data return data, flags
end end