applications/luci-olsr: Fix overview page for ipv4 or ipv6 only

[project/luci.git] / applications / luci-olsr / luasrc / controller / olsr.lua

diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua
index c1b6ed9..20bf25b 100644 (file)
--- a/applications/luci-olsr/luasrc/controller/olsr.lua
+++ b/applications/luci-olsr/luasrc/controller/olsr.lua
@@ -108,8 +108,16 @@ function action_json()
 
         local jsonreq4 = utl.exec("echo /status | nc 127.0.0.1 9090")
         local jsonreq6 = utl.exec("echo /status | nc ::1 9090")
-
        http.prepare_content("application/json")
+
+       if #jsonreq4 < 1 then
+               jsonreq4 = "{}"
+       end
+
+       if #jsonreq6 < 1 then
+               jsonreq6 = "{}"
+       end
+
        http.write("{v4:" .. jsonreq4 .. ", v6:" .. jsonreq6 .. "}")
 end
 
@@ -134,7 +142,7 @@ function action_neigh(json)
 
        for k, v in ipairs(data) do
                if resolve == "1" then
-                       hostname = nixio.getnameinfo(v.remoteIP)
+                       hostname = nixio.getnameinfo(v.remoteIP, nil, 100)
                        if hostname then
                                v.hostname = hostname
                        end
@@ -159,7 +167,7 @@ function action_routes()
 
        for k, v in ipairs(data) do
                if resolve == "1" then
-                       local hostname = nixio.getnameinfo(v.gateway)
+                       local hostname = nixio.getnameinfo(v.gateway, nil, 100)
                        if hostname then
                                v.hostname = hostname
                        end
@@ -215,7 +223,7 @@ function action_hna()
 
        for k, v in ipairs(data) do
                if resolve == "1" then
-                       hostname = nixio.getnameinfo(v.gateway)
+                       hostname = nixio.getnameinfo(v.gateway, nil, 100)
                        if hostname then
                                v.hostname = hostname
                        end