From: Steven Barth <steven@midlink.org>
Date: Sat, 18 Oct 2008 07:44:21 +0000 (+0000)
Subject: Rearrange output of luci.sys.wifi.*, luci.sys.net.conntrack
X-Git-Tag: 0.8.2~84
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4e8af56ac13c4361bb8121fc969116b14b5910a9;p=project%2Fluci.git

Rearrange output of luci.sys.wifi.*, luci.sys.net.conntrack
---

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index 56c1384aef..b4d3d2f1b8 100644
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -265,9 +265,9 @@ function net.conntrack()
 	local connt = {}
 	if luci.fs.access("/proc/net/nf_conntrack") then
 		for line in io.lines("/proc/net/nf_conntrack") do
-			local entry = _parse_mixed_record(line, " +")
-			entry.layer3 = entry[1]
-			entry.layer4 = entry[2]
+			local entry, flags = _parse_mixed_record(line, " +")
+			entry.layer3 = flags[1]
+			entry.layer4 = flags[2]
 			for i=1, #entry do
 				entry[i] = nil
 			end
@@ -276,9 +276,9 @@ function net.conntrack()
 		end
 	elseif luci.fs.access("/proc/net/ip_conntrack") then
 		for line in io.lines("/proc/net/ip_conntrack") do
-			local entry = _parse_mixed_record(line, " +")
+			local entry, flags = _parse_mixed_record(line, " +")
 			entry.layer3 = "ipv4"
-			entry.layer4 = entry[1]
+			entry.layer4 = flags[1]
 			for i=1, #entry do
 				entry[i] = nil
 			end
@@ -533,7 +533,11 @@ function wifi.getiwconfig()
 		local k = l:match("^(.-) ")
 		l = l:gsub("^(.-) +", "", 1)
 		if k then
-			iwc[k] = _parse_mixed_record(l)
+			local entry, flags = _parse_mixed_record(l)
+			if entry then
+				entry.flags = flags
+			end
+			iwc[k] = entry
 		end
 	end
 
@@ -557,7 +561,11 @@ function wifi.iwscan(iface)
 				c = c:gsub("^(.-)- ", "", 1)
 				c = luci.util.split(c, "\n", 7)
 				c = table.concat(c, "\n", 1)
-				table.insert(iws[k], _parse_mixed_record(c))
+				local entry, flags = _parse_mixed_record(c)
+				if entry then
+					entry.flags = flags
+				end
+				table.insert(iws[k], entry)
 			end
 		end
 	end
@@ -649,6 +657,7 @@ end
 function _parse_mixed_record(cnt, delimiter)
 	delimiter = delimiter or "  "
 	local data = {}
+	local flags = {}
 
 	for i, l in pairs(luci.util.split(luci.util.trim(cnt), "\n")) do
 		for j, f in pairs(luci.util.split(luci.util.trim(l), delimiter, nil, true)) do
@@ -656,7 +665,7 @@ function _parse_mixed_record(cnt, delimiter)
 
             if k then
 				if x == "" then
-					table.insert(data, k)
+					table.insert(flags, k)
 				else
             		data[k] = v
 				end
@@ -664,5 +673,5 @@ function _parse_mixed_record(cnt, delimiter)
     	end
 	end
 
-    return data
+    return data, flags
 end