local uci = luci.model.uci.cursor_state()
uci:foreach("olsrd", "olsrd", function(s)
- if s.SmartGateway and s.SmartGateway == "yes" then has_smartgw = true end
+ if s.SmartGateway and s.SmartGateway == "yes" then has_smartgw = true end
end)
local page = node("admin", "status", "olsr")
end
local page = node("admin", "status", "olsr", "interfaces")
- page.target = call("action_interfaces")
- page.title = _("Interfaces")
- page.order = 70
+ page.target = call("action_interfaces")
+ page.title = _("Interfaces")
+ page.order = 70
local ol = entry(
{"admin", "services", "olsrd"},
odsp = entry(
{"admin", "services", "olsrd", "display"},
cbi("olsr/olsrddisplay"), _("Display")
- )
+ )
oplg.leaf = true
oplg.subindex = true
function action_json()
local http = require "luci.http"
local utl = require "luci.util"
+ local uci = require "luci.model.uci".cursor_state()
+ local jsonreq4
+ local jsonreq6
- local jsonreq4 = utl.exec("echo /status | nc 127.0.0.1 9090")
- local jsonreq6 = utl.exec("echo /status | nc ::1 9090")
-
+ local IpVersion = uci:get_first("olsrd", "olsrd","IpVersion")
+ if IpVersion == "4" or IpVersion == "6and4" then
+ jsonreq4 = utl.exec("echo /status | nc 127.0.0.1 9090")
+ end
+ if IpVersion == "6" or IpVersion == "6and4" then
+ jsonreq6 = utl.exec("echo /status | nc ::1 9090")
+ end
http.prepare_content("application/json")
- http.write("{v4:" .. jsonreq4 .. ", v6:" .. jsonreq6 .. "}")
+ if not jsonreq4 or jsonreq4 == "" then
+ jsonreq4 = "{}"
+ end
+ if not jsonreq6 or jsonreq6 == "" then
+ jsonreq6 = "{}"
+ end
+ http.write('{"v4":' .. jsonreq4 .. ', "v6":' .. jsonreq6 .. '}')
end
function action_neigh(json)
local uci = require "luci.model.uci".cursor_state()
local resolve = uci:get("luci_olsr", "general", "resolve")
- luci.sys.net.routes(function(r) if r.dest:prefix() == 0 then defaultgw = r.gateway:string() end end)
+ local ntm = require "luci.model.network".init()
+ local devices = ntm:get_wifidevs()
+ local sys = require "luci.sys"
+ local assoclist = {}
+ local neightbl = require "neightbl"
+ local ipc = require "luci.ip"
+
+ luci.sys.net.routes(function(r)
+ if r.dest:prefix() == 0 then
+ defaultgw = r.gateway:string()
+ end
+ end)
local function compare(a,b)
if a.proto == b.proto then
end
end
+ for _, dev in ipairs(devices) do
+ for _, net in ipairs(dev:get_wifinets()) do
+ assoclist[#assoclist+1] = {}
+ assoclist[#assoclist]['ifname'] = net.iwdata.ifname
+ assoclist[#assoclist]['network'] = net.iwdata.network
+ assoclist[#assoclist]['device'] = net.iwdata.device
+ assoclist[#assoclist]['list'] = net.iwinfo.assoclist
+ end
+ end
+
for k, v in ipairs(data) do
+ local interface
+ local snr = 0
+ local signal = 0
+ local noise = 0
+ local arptable = sys.net.arptable()
+ local mac = ""
+ local rmac = ""
+ local lmac = ""
+ local ip
+ local neihgt = {}
+
if resolve == "1" then
hostname = nixio.getnameinfo(v.remoteIP, nil, 100)
if hostname then
v.hostname = hostname
end
end
+ if v.proto == '4' then
+ uci:foreach("network", "interface",function(vif)
+ if vif.ipaddr and vif.ipaddr == v.localIP then
+ interface = vif['.name'] or vif.interface
+ lmac = string.lower(vif.macaddr or "")
+ return
+ end
+ end)
+ for _, arpt in ipairs(arptable) do
+ ip = arpt['IP address']
+ if ip == v.remoteIP then
+ rmac = string.lower(arpt['HW address'] or "")
+ end
+ end
+ elseif v.proto == '6' then
+ uci:foreach("network", "interface",function(vif)
+ local name = vif['.name']
+ local net = ntm:get_network(name)
+ local device = net and net:get_interface()
+ local locip = ipc.IPv6(v.localIP)
+ if device and device:ip6addrs() and locip then
+ for _, a in ipairs(device:ip6addrs()) do
+ if not a:is6linklocal() then
+ if a:host() == locip:host() then
+ interface = name
+ neihgt = neightbl.get(device.ifname) or {}
+ end
+ end
+ end
+ end
+ end)
+ for ip,mac in pairs(neihgt) do
+ if ip == v.remoteIP then
+ rmac = mac
+ end
+ end
+ end
+ for _, val in ipairs(assoclist) do
+ if val.network == interface and val.list then
+ for assocmac, assot in pairs(val.list) do
+ assocmac = string.lower(assocmac or "")
+ if rmac == assocmac then
+ signal = tonumber(assot.signal)
+ noise = tonumber(assot.noise)
+ snr = (noise*-1) - (signal*-1)
+ end
+ end
+ end
+ end
+ if interface then
+ v.interface = interface
+ end
+ v.snr = snr
+ v.signal = signal
+ v.noise = noise
+ if rmac then
+ v.remoteMAC = rmac
+ end
+ if lmac then
+ v.localMAC = lmac
+ end
+
if defaultgw == v.remoteIP then
v.defaultgw = 1
end
end
end
if v.validityTime then
- v.validityTime = tonumber(string.format("%.0f", v.validityTime / 1000))
+ v.validityTime = tonumber(string.format("%.0f", v.validityTime / 1000))
end
end
-- Internal
function fetch_jsoninfo(otable)
+ local uci = require "luci.model.uci".cursor_state()
local utl = require "luci.util"
local json = require "luci.json"
- local jsonreq4 = utl.exec("echo /" .. otable .. " | nc 127.0.0.1 9090")
- local jsondata4 = {}
- local jsonreq6 = utl.exec("echo /" .. otable .. " | nc ::1 9090")
- local jsondata6 = {}
+ local IpVersion = uci:get_first("olsrd", "olsrd","IpVersion")
+ local jsonreq4 = ""
+ local jsonreq6 = ""
+ if IpVersion == "4" or IpVersion == "6and4" then
+ jsonreq4 = utl.exec("echo /" .. otable .. " | nc 127.0.0.1 9090")
+ end
+ if IpVersion == "6" or IpVersion == "6and4" then
+ jsonreq6 = utl.exec("echo /" .. otable .. " | nc ::1 9090")
+ end
+ local jsondata4 = {}
+ local jsondata6 = {}
local data4 = {}
local data6 = {}
local has_v4 = False
return nil, 0, 0, true
end
- if #jsonreq4 ~= 0 then
+ if jsonreq4 ~= "" then
has_v4 = 1
- jsondata4 = json.decode(jsonreq4)
+ jsondata4 = json.decode(jsonreq4)
if otable == 'status' then
- data4 = jsondata4
+ data4 = jsondata4 or {}
else
- data4 = jsondata4[otable]
+ data4 = jsondata4[otable] or {}
end
- for k, v in ipairs(data4) do
- data4[k]['proto'] = '4'
+ for k, v in ipairs(data4) do
+ data4[k]['proto'] = '4'
end
- end
- if #jsonreq6 ~= 0 then
+
+ end
+ if jsonreq6 ~= "" then
has_v6 = 1
- jsondata6 = json.decode(jsonreq6)
+ jsondata6 = json.decode(jsonreq6)
if otable == 'status' then
- data6 = jsondata6
+ data6 = jsondata6 or {}
else
- data6 = jsondata6[otable]
+ data6 = jsondata6[otable] or {}
+ end
+ for k, v in ipairs(data6) do
+ data6[k]['proto'] = '6'
end
- for k, v in ipairs(data6) do
- data6[k]['proto'] = '6'
- end
- end
+ end
for k, v in ipairs(data6) do
table.insert(data4, v)
end
- return data4, has_v4, has_v6, false
+ return data4, has_v4, has_v6, false
end
projects / project / luci.git / blobdiff