Gather the IPs and stuff them into mirrors.lua before forking.

2 files changed, 30 insertions, 14 deletions

diff --git a/README.md b/README.md
index 77c642d..8839e63 100644
--- a/README.md
+++ b/README.md
@@ -191,8 +191,9 @@ Open results/mirror-checker-lua.log for message logging.
 
 Download mirror_list.txt from the reference site.  Build a table of
 Active mirrors keyed by the FDQN, include the listed Protocols as a sub
-table.  Write this table to results/mirrors.lua so that the forked tests
-can read it.
+table.  Add the round robin domain name.  Resolve all the IPs and add
+them to this table.  Write this table to results/mirrors.lua so that the
+forked tests can read it.
 
 Remove the mirror site from the mirrors table, then checkHost() it
 first.
diff --git a/mirror-checker.lua b/mirror-checker.lua
index f4b5142..6580190 100755
--- a/mirror-checker.lua
+++ b/mirror-checker.lua
@@ -182,7 +182,7 @@ local repoExists = function (r)
 end
 
 local IP = {}
-local gatherIPs = function (host)
+gatherIPs = function (host)
     if nil == IP[host] then
         local IPs
         local dig = io.popen('dig +keepopen +noall +nottlid +answer ' .. host .. ' A ' .. host .. ' AAAA ' .. host .. ' CNAME ' .. host .. ' SRV | sort -r | uniq')
@@ -193,6 +193,13 @@ local gatherIPs = function (host)
                     if "." == v:sub(-1, -1) then v = v:sub(1, -2) end
                     if nil == IP[k] then IP[k] = {} end
                     IP[k][v] = t
+                    D("  DNS record " .. host .. " == " .. k .. " type " .. t .. " -> " .. v)
+                    if t == "CNAME" then
+                        gatherIPs(v)
+                        IP[k][v] = IP[v]
+                    elseif v == "SRV" then
+                        print("SVR record found, now what do we do?")
+                    end
                 end
             end
         until nil == IPs
@@ -349,17 +356,23 @@ checkHost = function (orig, host, path, ip, file)
             D("checkHost " .. orig .. "" .. file)
             if testing("IPv4") then execute("ionice -c3 ./mirror-checker.lua " .. sendArgs .. " -o " .. orig .. path .. " " .. file .." &") end
         else D("checkHost " .. orig .. " -> " .. host) end
-        gatherIPs(ph.host)
-        for k, v in pairs(IP[ph.host]) do
-            D("  DNS record " .. v .. " " .. ph.host .. " -> " .. k)
-            if v == "A" then
-                if testing("IPv4") then execute("ionice -c3 ./mirror-checker.lua " .. sendArgs .. " " .. orig .. path .. " " .. k .. " " .. file .." &") end
-            elseif v == "AAAA" then
-                if testing("IPv6") then execute("ionice -c3 ./mirror-checker.lua " .. sendArgs .. " " .. orig .. path .. " [" .. k .. "] " .. file .. " &") end
-            elseif v == "CNAME" then
-                checkHost(orig, k, path, ip, file)  -- Check the original, with the DNS records from the CNAME.  Do not check the CNAME, it's just a source of IPs.
-            elseif v == "SRV" then
-                print("SVR record found, now what do we do?")
+        local h = mirrors[ph.host]
+        if nil == h then return end
+        for k, v in pairs(h.IPs) do
+            if "table" == type(v) then
+                for k1, v1 in pairs(v) do
+                    if v1 == "A" then
+                        if testing("IPv4") then execute("ionice -c3 ./mirror-checker.lua " .. sendArgs .. " " .. orig .. path .. " " .. k1 .. " " .. file .." &") end
+                    elseif v1 == "AAAA" then
+                        if testing("IPv6") then execute("ionice -c3 ./mirror-checker.lua " .. sendArgs .. " " .. orig .. path .. " [" .. k1 .. "] " .. file .. " &") end
+                    end
+                end
+            else
+                if v == "A" then
+                    if testing("IPv4") then execute("ionice -c3 ./mirror-checker.lua " .. sendArgs .. " " .. orig .. path .. " " .. k .. " " .. file .." &") end
+                elseif v == "AAAA" then
+                    if testing("IPv6") then execute("ionice -c3 ./mirror-checker.lua " .. sendArgs .. " " .. orig .. path .. " [" .. k .. "] " .. file .. " &") end
+                end
             end
         end
     end
@@ -410,6 +423,8 @@ local getMirrors = function ()
                 end
                 host = d
                 m[t] = d
+                gatherIPs(host)
+                m["IPs"] = IP[host]
             elseif "Protocols" == t then
                 local prot = {}
                 for w in d:gmatch("(%w+)") do