From cc182c9f8a6eef6be66f99de4fbfe098a6c83936 Mon Sep 17 00:00:00 2001
From: onefang
Date: Thu, 2 Jan 2020 18:43:36 +1000
Subject: Collate more data from the redirect results.

A few too many bandaids, gonna have to rewrite some stuff soonish.
---
 apt-panopticommon.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'apt-panopticommon.lua')

diff --git a/apt-panopticommon.lua b/apt-panopticommon.lua
index 7664297..ffc3af4 100644
--- a/apt-panopticommon.lua
+++ b/apt-panopticommon.lua
@@ -671,6 +671,7 @@ APT.collateAll = function(hosts, l, host, func)
 	results = loadfile(f)()
 	results = APT.padResults(results)
 	if nil ~= func then func(results) end
+	results = APT.collate(l, host, 'R', results)
 	local v = hosts[host]
 	if nil ~= v then
 	    local IPs = results.IPs
@@ -679,16 +680,18 @@ APT.collateAll = function(hosts, l, host, func)
 		    if "table" == type(u) then
 			for h, t in pairs(u) do
 			    results = APT.collate(l, host, h, results)
+			    results = APT.collate(l, host, h .. '_R', results)
 			    if nil ~= func then func(results, h) end
 			end
 		    else
-			results = APT.collate(l, host, i, results)
+			results = APT.collate(l, host, i .. '_R', results)
 			if nil ~= func then func(results, i) end
 		    end
 		end
 	    end
 	end
     end
+    results = APT.padResults(results)
     return results
 end
 
-- 
cgit v1.1