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

Merge pull request #929 from bittorf/master

Browse source 
luci-app-olsr: adapt to changed behavior of new OLSRd v0.9.5
This commit is contained in:
Hannu Nyman 2017-01-10 18:28:18 +02:00 committed by GitHub
commit 8703653eb8
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -87,8 +87,8 @@ function action_json()
local v4_port = uci:get("olsrd", "olsrd_jsoninfo", "port") or 9090 local v4_port = uci:get("olsrd", "olsrd_jsoninfo", "port") or 9090
local v6_port = uci:get("olsrd6", "olsrd_jsoninfo", "port") or 9090 local v6_port = uci:get("olsrd6", "olsrd_jsoninfo", "port") or 9090
jsonreq4 = utl.exec("(echo /status | nc 127.0.0.1 " .. v4_port .. ") 2>/dev/null" ) jsonreq4 = utl.exec("(echo /status | nc 127.0.0.1 " .. v4_port .. " | sed -n '/^[}{ ]/p') 2>/dev/null" )
jsonreq6 = utl.exec("(echo /status | nc ::1 " .. v6_port .. ") 2>/dev/null") jsonreq6 = utl.exec("(echo /status | nc ::1 " .. v6_port .. " | sed -n '/^[}{ ]/p') 2>/dev/null")
http.prepare_content("application/json") http.prepare_content("application/json")
if not jsonreq4 or jsonreq4 == "" then if not jsonreq4 or jsonreq4 == "" then
jsonreq4 = "{}" jsonreq4 = "{}"
@ -375,8 +375,8 @@ function fetch_jsoninfo(otable)
local v4_port = uci:get("olsrd", "olsrd_jsoninfo", "port") or 9090 local v4_port = uci:get("olsrd", "olsrd_jsoninfo", "port") or 9090
local v6_port = uci:get("olsrd6", "olsrd_jsoninfo", "port") or 9090 local v6_port = uci:get("olsrd6", "olsrd_jsoninfo", "port") or 9090
jsonreq4 = utl.exec("(echo /" .. otable .. " | nc 127.0.0.1 " .. v4_port .. ") 2>/dev/null") jsonreq4 = utl.exec("(echo /" .. otable .. " | nc 127.0.0.1 " .. v4_port .. " | sed -n '/^[}{ ]/p') 2>/dev/null")
jsonreq6 = utl.exec("(echo /" .. otable .. " | nc ::1 " .. v6_port .. ") 2>/dev/null") jsonreq6 = utl.exec("(echo /" .. otable .. " | nc ::1 " .. v6_port .. " | sed -n '/^[}{ ]/p') 2>/dev/null")
local jsondata4 = {} local jsondata4 = {}
local jsondata6 = {} local jsondata6 = {}
local data4 = {} local data4 = {}

8
applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
View file

@ -12,8 +12,8 @@ local i = 1
if luci.http.formvalue("status") == "1" then if luci.http.formvalue("status") == "1" then
local rv = {} local rv = {}
for k, link in ipairs(links) do for k, link in ipairs(links) do
link.linkCost = tonumber(link.linkCost)/1024 or 0 link.linkCost = tonumber(link.linkCost) or 0
if link.linkCost == 4096 then if link.linkCost == 4194304 then
link.linkCost = 0 link.linkCost = 0
end end
local color = olsrtools.etx_color(link.linkCost) local color = olsrtools.etx_color(link.linkCost)
@ -129,8 +129,8 @@ end
<tbody id="olsr_neigh_table"> <tbody id="olsr_neigh_table">
<% local i = 1 <% local i = 1
for k, link in ipairs(links) do for k, link in ipairs(links) do
link.linkCost = tonumber(link.linkCost)/1024 or 0 link.linkCost = tonumber(link.linkCost) or 0
if link.linkCost == 4096 then if link.linkCost == 4194304 then
link.linkCost = 0 link.linkCost = 0
end end