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

applications/olsr: Get jsoninfo source port prom olsrd/olsrd6 config file

Browse source
This commit is contained in:
Manuel Munz 2015-05-30 20:48:57 +02:00
parent 595c637c3b
commit cc39eaa681
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
applications/luci-app-olsr/luasrc/controller/olsr.lua
View file

@ -80,12 +80,15 @@ end
function action_json() 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()
local jsonreq4 local jsonreq4
local jsonreq6 local jsonreq6
jsonreq4 = utl.exec("echo /status | nc 127.0.0.1 9090") local v4_port = uci:get("olsrd", "olsrd_jsoninfo", "port") or 9090
jsonreq6 = utl.exec("echo /status | nc ::1 9090") local v6_port = uci:get("olsrd6", "olsrd_jsoninfo", "port") or 9090
jsonreq4 = utl.exec("echo /status | nc 127.0.0.1 " .. v4_port )
jsonreq6 = utl.exec("echo /status | nc ::1 " .. v6_port)
http.prepare_content("application/json") http.prepare_content("application/json")
if not jsonreq4 or jsonreq4 == "" then if not jsonreq4 or jsonreq4 == "" then
jsonreq4 = "{}" jsonreq4 = "{}"
@ -368,8 +371,11 @@ function fetch_jsoninfo(otable)
local IpVersion = uci:get_first("olsrd", "olsrd","IpVersion") local IpVersion = uci:get_first("olsrd", "olsrd","IpVersion")
local jsonreq4 = "" local jsonreq4 = ""
local jsonreq6 = "" local jsonreq6 = ""
jsonreq4 = utl.exec("echo /" .. otable .. " | nc 127.0.0.1 9090") local v4_port = uci:get("olsrd", "olsrd_jsoninfo", "port") or 9090
jsonreq6 = utl.exec("echo /" .. otable .. " | nc ::1 9090") local v6_port = uci:get("olsrd6", "olsrd_jsoninfo", "port") or 9090
jsonreq4 = utl.exec("echo /" .. otable .. " | nc 127.0.0.1 " .. v4_port)
jsonreq6 = utl.exec("echo /" .. otable .. " | nc ::1 " .. v6_port)
local jsondata4 = {} local jsondata4 = {}
local jsondata6 = {} local jsondata6 = {}
local data4 = {} local data4 = {}