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

applications/luci-olsr: General code cleanup, thanks patrick at lunatiki dot de

Browse source
This commit is contained in:
Manuel Munz 2011-01-02 12:08:56 +00:00
parent 8ee6d915ee
commit 50c69527e5
1 changed files with 74 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
applications/luci-olsr/luasrc/controller/olsr.lua
View file

@ -233,10 +233,20 @@ function fetch_txtinfo(otable)
local data = {} local data = {}
local dataindex = 0 local dataindex = 0
local name = "" local name = ""
local defaultgw
if #rawdata ~= 0 then if #rawdata ~= 0 then
local tables = luci.util.split(luci.util.trim(rawdata), "\r?\n\r?\n", nil, true) local tables = luci.util.split(luci.util.trim(rawdata), "\r?\n\r?\n", nil, true)
if otable == "links" then
local route = {}
for i, route in ipairs(luci.sys.net.routes()) do
if route.dest:prefix() == 0 then
defaultgw = route.gateway:string()
end
end
end
for i, tbl in ipairs(tables) do for i, tbl in ipairs(tables) do
local lines = luci.util.split(tbl, "\r?\n", nil, true) local lines = luci.util.split(tbl, "\r?\n", nil, true)
name = table.remove(lines, 1):sub(8) name = table.remove(lines, 1):sub(8)
@ -253,12 +263,15 @@ function fetch_txtinfo(otable)
data[name][di] = {} data[name][di] = {}
for k, key in pairs(keys) do for k, key in pairs(keys) do
if key == "Remote IP" or key == "Dest. IP" or key == "Gateway IP" or key == "Gateway" then if key == "Remote IP" or key == "Dest. IP" or key == "Gateway IP" or key == "Gateway" then
data[name][di][key] = fields[k]
hostname = nixio.getnameinfo(fields[k], "inet") hostname = nixio.getnameinfo(fields[k], "inet")
if hostname then if hostname then
data[name][di][key] = fields[k]
data[name][di]["Hostname"] = hostname data[name][di]["Hostname"] = hostname
else end
data[name][di][key] = fields[k] if key == "Remote IP" and defaultgw then
if defaultgw == fields[k] then
data[name][di]["defaultgw"] = 1
end
end end
elseif key == "Local IP" then elseif key == "Local IP" then
data[name][di][key] = fields[k] data[name][di][key] = fields[k]
@ -310,12 +323,10 @@ function fetch_txtinfo(otable)
data[name][di] = {} data[name][di] = {}
for k, key in pairs(keys) do for k, key in pairs(keys) do
if key == "Remote IP" then if key == "Remote IP" then
data[name][di][key] = "[" .. fields[k] .. "]"
hostname = nixio.getnameinfo(fields[k], "inet6") hostname = nixio.getnameinfo(fields[k], "inet6")
if hostname then if hostname then
data[name][di][key] = "[" .. fields[k] .. "]"
data[name][di]["Hostname"] = hostname data[name][di]["Hostname"] = hostname
else
data[name][di][key] = "[" .. fields[k] .. "]"
end end
elseif key == "Local IP" then elseif key == "Local IP" then
data[name][di][key] = fields[k] data[name][di][key] = fields[k]
@ -351,7 +362,7 @@ function fetch_txtinfo(otable)
end end
end end
end end
end end
if data then if data then