X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=applications%2Fluci-app-olsr%2Fluasrc%2Fcontroller%2Folsr.lua;h=229f3d61b3489dc4c81c88a831500bcaa9d056ff;hb=28e3b328545529c19429ce88c7d1769e64e2de0f;hp=74deb716c4a8dbbd8643b7995373cced373e717b;hpb=76dfdc1b1e7a62b363954f01f71f5a1e77d5249a;p=project%2Fluci.git

diff --git a/applications/luci-app-olsr/luasrc/controller/olsr.lua b/applications/luci-app-olsr/luasrc/controller/olsr.lua
index 74deb716c..229f3d61b 100644
--- a/applications/luci-app-olsr/luasrc/controller/olsr.lua
+++ b/applications/luci-app-olsr/luasrc/controller/olsr.lua
@@ -80,12 +80,15 @@ end
 function action_json()
 	local http = require "luci.http"
 	local utl = require "luci.util"
-	local uci = require "luci.model.uci".cursor_state()
+	local uci = require "luci.model.uci".cursor()
 	local jsonreq4
 	local jsonreq6
 
-	jsonreq4 = utl.exec("echo /status | nc 127.0.0.1 9090")
-	jsonreq6 = utl.exec("echo /status | nc ::1 9090")
+	local v4_port = uci:get("olsrd", "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 .. " | sed -n '/^[}{ ]/p') 2>/dev/null" )
+	jsonreq6 = utl.exec("(echo /status | nc ::1 " .. v6_port .. " | sed -n '/^[}{ ]/p') 2>/dev/null")
 	http.prepare_content("application/json")
 	if not jsonreq4 or jsonreq4 == "" then
 		jsonreq4 = "{}"
@@ -98,41 +101,19 @@ end
 
 
 local function local_mac_lookup(ipaddr)
-	local _, ifa, dev
-
-	ipaddr = tostring(ipaddr)
-
-	if not ifaddr_table then
-		ifaddr_table = nixio.getifaddrs()
-	end
-
-	-- ipaddr -> ifname
-	for _, ifa in ipairs(ifaddr_table) do
-		if ifa.addr == ipaddr then
-			dev = ifa.name
-			break
-		end
-	end
-
-	-- ifname -> macaddr
-	for _, ifa in ipairs(ifaddr_table) do
-		if ifa.name == dev and ifa.family == "packet" then
-			return ifa.addr
-		end
+	local _, rt
+	for _, rt in ipairs(luci.ip.routes({ type = 1, src = ipaddr })) do
+		local link = rt.dev and luci.ip.link(rt.dev)
+		local mac = link and luci.ip.checkmac(link.mac)
+		if mac then return mac end
 	end
 end
 
 local function remote_mac_lookup(ipaddr)
 	local _, n
-
-	if not neigh_table then
-		neigh_table = luci.ip.neighbors()
-	end
-
-	for _, n in ipairs(neigh_table) do
-		if n.mac and n.dest and n.dest:equal(ipaddr) then
-			return n.mac
-		end
+	for _, n in ipairs(luci.ip.neighbors({ dest = ipaddr })) do
+		local mac = luci.ip.checkmac(n.mac)
+		if mac then return mac end
 	end
 end
 
@@ -168,11 +149,12 @@ function action_neigh(json)
 
 	for _, dev in ipairs(devices) do
 		for _, net in ipairs(dev:get_wifinets()) do
+			local radio = net:get_device()
 			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
+			assoclist[#assoclist]['ifname'] = net:ifname()
+			assoclist[#assoclist]['network'] = net:network()[1]
+			assoclist[#assoclist]['device'] = radio and radio:name() or nil
+			assoclist[#assoclist]['list'] = net:assoclist()
 		end
 	end
 
@@ -197,9 +179,9 @@ function action_neigh(json)
 
 		for _, val in ipairs(assoclist) do
 			if val.network == interface and val.list then
+				local assocmac, assot
 				for assocmac, assot in pairs(val.list) do
-					assocmac = string.lower(assocmac or "")
-					if rmac == assocmac then
+					if rmac == luci.ip.checkmac(assocmac) then
 						signal = tonumber(assot.signal)
 						noise = tonumber(assot.noise)
 						snr = (noise*-1) - (signal*-1)
@@ -368,8 +350,11 @@ function fetch_jsoninfo(otable)
 	local IpVersion = uci:get_first("olsrd", "olsrd","IpVersion")
 	local jsonreq4 = ""
 	local jsonreq6 = ""
-	jsonreq4 = utl.exec("echo /" .. otable .. " | nc 127.0.0.1 9090")
-	jsonreq6 = utl.exec("echo /" .. otable .. " | nc ::1 9090")
+	local v4_port = uci:get("olsrd", "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 .. " | sed -n '/^[}{ ]/p') 2>/dev/null")
+	jsonreq6 = utl.exec("(echo /" .. otable .. " | nc ::1 " .. v6_port .. " | sed -n '/^[}{ ]/p') 2>/dev/null")
 	local jsondata4 = {}
 	local jsondata6 = {}
 	local data4 = {}