From 4323935a1eab53f3109066ec08c8cdfcdf69db75 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 20 Feb 2016 22:14:37 +0100 Subject: luci-base: luci.sys: canonicalize src and dest addrs in luci.sys.net.conntrack() Signed-off-by: Jo-Philipp Wich --- modules/luci-base/luasrc/sys.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/luci-base/luasrc/sys.lua b/modules/luci-base/luasrc/sys.lua index fb2c4b1f8..a97271732 100644 --- a/modules/luci-base/luasrc/sys.lua +++ b/modules/luci-base/luasrc/sys.lua @@ -343,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 -- cgit v1.2.3