Changeset 6964

Timestamp:

03/13/11 23:08:32 (2 years ago)

Author:

jow

Message:

libs/sys: ignore TIME_WAIT connections in luci.sys.net.conntrack()

Files:

• luci/trunk/libs/sys/luasrc/sys.lua (modified) (2 diffs)

luci/trunk/libs/sys/luasrc/sys.lua

@@ -241 +241 @@
             line = line:match "^(.-( [^ =]+=).-)%2"
             local entry, flags = _parse_mixed_record(line, " +")
-            entry.layer3 = flags[1]
-            entry.layer4 = flags[3]
-            for i=1, #entry do
-                entry[i] = nil
-            end
-
-            if callback then
-                callback(entry)
-            else
-                connt[#connt+1] = entry
+            if flags[6] ~= "TIME_WAIT" then
+                entry.layer3 = flags[1]
+                entry.layer4 = flags[3]
+                for i=1, #entry do
+                    entry[i] = nil
+                end
+
+                if callback then
+                    callback(entry)
+                else
+                    connt[#connt+1] = entry
+                end
             end
         end
@@ -257 +259 @@
             line = line:match "^(.-( [^ =]+=).-)%2"
             local entry, flags = _parse_mixed_record(line, " +")
-            entry.layer3 = "ipv4"
-            entry.layer4 = flags[1]
-            for i=1, #entry do
-                entry[i] = nil
-            end
-
-            if callback then
-                callback(entry)
-            else
-                connt[#connt+1] = entry
+            if flags[4] ~= "TIME_WAIT" then
+                entry.layer3 = "ipv4"
+                entry.layer4 = flags[1]
+                for i=1, #entry do
+                    entry[i] = nil
+                end
+
+                if callback then
+                    callback(entry)
+                else
+                    connt[#connt+1] = entry
+                end
             end
         end