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

applications/olsr: Fix invalid json output

Browse source
This commit is contained in:
Manuel Munz 2013-09-19 16:49:28 +00:00
parent 110e087441
commit 148b883c11
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -106,8 +106,8 @@ function action_json()
local http = require "luci.http" local http = require "luci.http"
local utl = require "luci.util" local utl = require "luci.util"
local uci = require "luci.model.uci".cursor_state() local uci = require "luci.model.uci".cursor_state()
local jsonreq4 = "" local jsonreq4
local jsonreq6 = "" local jsonreq6
local IpVersion = uci:get_first("olsrd", "olsrd","IpVersion") local IpVersion = uci:get_first("olsrd", "olsrd","IpVersion")
if IpVersion == "4" or IpVersion == "6and4" then if IpVersion == "4" or IpVersion == "6and4" then
@ -117,8 +117,13 @@ function action_json()
jsonreq6 = utl.exec("echo /status | nc ::1 9090") jsonreq6 = utl.exec("echo /status | nc ::1 9090")
end end
http.prepare_content("application/json") http.prepare_content("application/json")
if not jsonreq4 or jsonreq4 == "" then
http.write("{v4:" .. jsonreq4 .. ", v6:" .. jsonreq6 .. "}") jsonreq4 = "{}"
end
if not jsonreq6 or jsonreq6 == "" then
jsonreq6 = "{}"
end
http.write('{"v4":' .. jsonreq4 .. ', "v6":' .. jsonreq6 .. '}')
end end
function action_neigh(json) function action_neigh(json)