luci-base: fix parsing of non-TCP streams in conntrack table
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 2 Feb 2016 10:52:33 +0000 (11:52 +0100)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 2 Feb 2016 10:52:51 +0000 (11:52 +0100)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
modules/luci-base/luasrc/sys.lua

index ae35652..fb2c4b1 100644 (file)
@@ -325,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 = {