X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-base%2Fluasrc%2Fsys.lua;h=a97271732ad0f2d0d72db2b4695963dc391e9e3f;hp=5d203aa8f866c928bd63bf916b8e366b0c44f7b2;hb=4323935a1eab53f3109066ec08c8cdfcdf69db75;hpb=c23885f6a776db74aa728b1efcd1bf644dde626d

diff --git a/modules/luci-base/luasrc/sys.lua b/modules/luci-base/luasrc/sys.lua
index 5d203aa8f..a97271732 100644
--- a/modules/luci-base/luasrc/sys.lua
+++ b/modules/luci-base/luasrc/sys.lua
@@ -168,14 +168,13 @@ local function _nethints(what, callback)
 		end
 	end
 
-	if fs.access("/proc/net/arp") then
-		for e in io.lines("/proc/net/arp") do
-			ip, mac = e:match("^([%d%.]+)%s+%S+%s+%S+%s+([a-fA-F0-9:]+)%s+")
-			if ip and mac then
-				_add(what, mac:upper(), ip, nil, nil)
-			end
+	luci.ip.neighbors(nil, function(neigh)
+		if neigh.mac and neigh.family == 4 then
+			_add(what, neigh.mac:upper(), neigh.dest:string(), nil, nil)
+		elseif neigh.mac and neigh.family == 6 then
+			_add(what, neigh.mac:upper(), nil, neigh.dest:string(), nil)
 		end
-	end
+	end)
 
 	if fs.access("/etc/ethers") then
 		for e in io.lines("/etc/ethers") do
@@ -186,14 +185,18 @@ local function _nethints(what, callback)
 		end
 	end
 
-	if fs.access("/var/dhcp.leases") then
-		for e in io.lines("/var/dhcp.leases") do
-			mac, ip, name = e:match("^%d+ (%S+) (%S+) (%S+)")
-			if mac and ip then
-				_add(what, mac:upper(), ip, nil, name ~= "*" and name)
+	cur:foreach("dhcp", "dnsmasq",
+		function(s)
+			if s.leasefile and fs.access(s.leasefile) then
+				for e in io.lines(s.leasefile) do
+					mac, ip, name = e:match("^%d+ (%S+) (%S+) (%S+)")
+					if mac and ip then
+						_add(what, mac:upper(), ip, nil, name ~= "*" and name)
+					end
+				end
 			end
 		end
-	end
+	)
 
 	cur:foreach("dhcp", "host",
 		function(s)
@@ -322,12 +325,10 @@ function net.conntrack(callback)
 
 	local line, connt = nil, (not callback) and { }
 	for line in nfct do
-		local fam, l3, l4, timeout, state, tuples =
-			line:match("^(ipv[46]) +(%d+) +%S+ +(%d+) +(%d+) +([A-Z_]+) +(.+)$")
+		local fam, l3, l4, timeout, tuples =
+			line:match("^(ipv[46]) +(%d+) +%S+ +(%d+) +(%d+) +(.+)$")
 
-		if fam and l3 and l4 and timeout and state and tuples and
-		   state ~= "TIME_WAIT"
-		then
+		if fam and l3 and l4 and timeout and not tuples:match("^TIME_WAIT ") then
 			l4 = nixio.getprotobynumber(l4)
 
 			local entry = {
@@ -342,7 +343,11 @@ function net.conntrack(callback)
 			for key, val in tuples:gmatch("(%w+)=(%S+)") do
 				if key == "bytes" or key == "packets" then
 					entry[key] = entry[key] + tonumber(val, 10)
-				elseif key == "src" or key == "dst" or key == "sport" or key == "dport" then
+				elseif key == "src" or key == "dst" then
+					if entry[key] == nil then
+						entry[key] = luci.ip.new(val):string()
+					end
+				elseif key == "sport" or key == "dport" then
 					if entry[key] == nil then
 						entry[key] = val
 					end