From 93121127fa4ed579516ab203c3e2696725551d37 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 12 Nov 2021 16:52:55 +0100 Subject: net.connect: Propagate last error message from resolvers Previously it would only say "unable to resolve server" for all DNS problems. While "NoError in A lookup" might not make much sense to users, it should help in debugging more than the previous generic error. Friendlier errors will be future work. --- net/resolvers/basic.lua | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'net/resolvers/basic.lua') diff --git a/net/resolvers/basic.lua b/net/resolvers/basic.lua index 34f1e1c7..b62440e1 100644 --- a/net/resolvers/basic.lua +++ b/net/resolvers/basic.lua @@ -52,12 +52,17 @@ function methods:next(cb) local dns_resolver = adns.resolver(); if not self.extra or self.extra.use_ipv4 ~= false then - dns_resolver:lookup(function (answer) + dns_resolver:lookup(function (answer, err) if answer then secure = secure and answer.secure; for _, record in ipairs(answer) do table.insert(targets, { self.conn_type.."4", record.a, self.port, self.extra }); end + if answer.status then + self.last_error = answer.status .. " in A lookup"; + end + else + self.last_error = err; end ready(); end, self.hostname, "A", "IN"); @@ -66,12 +71,17 @@ function methods:next(cb) end if not self.extra or self.extra.use_ipv6 ~= false then - dns_resolver:lookup(function (answer) + dns_resolver:lookup(function (answer, err) if answer then secure = secure and answer.secure; for _, record in ipairs(answer) do table.insert(targets, { self.conn_type.."6", record.aaaa, self.port, self.extra }); end + if answer.status then + self.last_error = answer.status .. " in AAAA lookup"; + end + else + self.last_error = err; end ready(); end, self.hostname, "AAAA", "IN"); @@ -80,12 +90,17 @@ function methods:next(cb) end if self.extra and self.extra.use_dane == true then - dns_resolver:lookup(function (answer) + dns_resolver:lookup(function (answer, err) if answer then secure = secure and answer.secure; for _, record in ipairs(answer) do table.insert(tlsa, record.tlsa); end + if answer.status then + self.last_error = answer.status .. " in TLSA lookup"; + end + else + self.last_error = err; end ready(); end, ("_%d._tcp.%s"):format(self.port, self.hostname), "TLSA", "IN"); -- cgit v1.2.3