From fbd53b3ef35ced9589f77aae34313016412de195 Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 29 Sep 2019 12:29:48 +1000
Subject: checkRedirects -> checkHost

---
 mirror-checker.lua | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'mirror-checker.lua')

diff --git a/mirror-checker.lua b/mirror-checker.lua
index f443789..81b32db 100755
--- a/mirror-checker.lua
+++ b/mirror-checker.lua
@@ -215,7 +215,7 @@ checkHEAD = function (host, URL, r, retry)
         local f = io.popen(string.format('if [ ! -f results/%s.check ] ; then touch results/%s.check; echo -n "check"; fi', file:gsub("/", "_"), file:gsub("/", "_") )):read("*a")
 	if (nil == f) or ("check" == f) then
 	    I("  Now checking redirected host " .. file)
-	    checkRedirects(host, host, nil, "redir", pl.path)
+	    checkHost(host, host, nil, "redir", pl.path)
 	else
 	    D("  Already checking " .. file)
 	end
@@ -304,7 +304,7 @@ local execute = function (s)
     os.execute(s)
 end
 
-checkRedirects = function (orig, host, path, ip, file)
+checkHost = function (orig, host, path, ip, file)
     if nil == host then host = orig end
     if nil == path then path = "" end
     if nil == file then file = "" end
@@ -318,7 +318,7 @@ checkRedirects = function (orig, host, path, ip, file)
 	    checkFiles(po.host, ip, path)
 	end
     else
-	if orig == host then D("checkRedirects " .. orig .. "" .. file) else D("checkRedirects " .. orig .. " -> " .. host) end
+	if orig == host then D("checkHost " .. orig .. "" .. file) else D("checkHost " .. orig .. " -> " .. host) end
 -- TODO - use checkFiles() here ^^^ on the original domain name, coz that's not getting caught yet.  I think.
 	gatherIPs(ph.host)
 	for k, v in pairs(IP[ph.host]) do
@@ -328,7 +328,7 @@ checkRedirects = function (orig, host, path, ip, file)
 	    elseif v == "AAAA" then
 		if testing("IPv6") then execute("ionice -c3 ./mirror-checker.lua " .. sendArgs .. " " .. orig .. path .. " [" .. k .. "] " .. file .. " &") end
 	    elseif v == "CNAME" then
-		checkRedirects(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.
+		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?")
 	    end
@@ -510,7 +510,7 @@ if 0 < #arg then
 	    checkExes(downloadLock)
 	end
     end
-    checkRedirects(pu.host, pu.host, pu.path, arg[2], arg[3])
+    checkHost(pu.host, pu.host, pu.path, arg[2], arg[3])
     logFile:close()
 else
     if not keep then os.execute("rm -f results/*.log") end
@@ -523,9 +523,9 @@ else
     mirrors = getMirrors()
 --print(dumpTable(mirrors, "", "mirrors"))
     mirrors[options.referenceSite.value] = nil
-    checkRedirects(options.referenceSite.value)
+    checkHost(options.referenceSite.value)
 --    forkIP(options.referenceSite.value)
-    checkRedirects("deb.devuan.org")
+    checkHost("deb.devuan.org")
 --    forkIP("deb.devuan.org")
     for k, m in pairs(mirrors) do
 	if "/" == m.BaseURL:sub(-1, -1) then
@@ -533,7 +533,7 @@ else
 	    m.BaseURL = m.BaseURL:sub(1, -2)
 	end
 	local pu = url.parse("http://" .. m.BaseURL)
-	checkRedirects(m.BaseURL)
+	checkHost(m.BaseURL)
 --	forkIP(m.BaseURL)
         checkExes("mirror-checker.lua " .. sendArgs)
         if testing("Integrity") or testing("Updated") then checkExes(downloadLock) end
-- 
cgit v1.1