# HG changeset patch # User Matthew Wild # Date 1293166360 0 # Node ID d2f80697c3292b387d4346d318fbcd5e82ff286e # Parent 7910f36e279172760c98a527970e7b0a69d47cc1 net.adns: Handle dns.query() failures, and pass error to handler diff -r 7910f36e2791 -r d2f80697c329 net/adns.lua --- a/net/adns.lua Fri Dec 24 04:52:13 2010 +0000 +++ b/net/adns.lua Fri Dec 24 04:52:40 2010 +0000 @@ -26,10 +26,17 @@ return; end log("debug", "Records for %s not in cache, sending query (%s)...", qname, tostring(coroutine.running())); - dns.query(qname, qtype, qclass); - coroutine.yield({ qclass or "IN", qtype or "A", qname, coroutine.running()}); -- Wait for reply - log("debug", "Reply for %s (%s)", qname, tostring(coroutine.running())); - local ok, err = pcall(handler, dns.peek(qname, qtype, qclass)); + local ok, err = dns.query(qname, qtype, qclass); + if ok then + coroutine.yield({ qclass or "IN", qtype or "A", qname, coroutine.running()}); -- Wait for reply + log("debug", "Reply for %s (%s)", qname, tostring(coroutine.running())); + end + if ok then + ok, err = pcall(handler, dns.peek(qname, qtype, qclass)); + else + log("error", "Error sending DNS query: %s", err); + ok, err = pcall(handler, nil, err); + end if not ok then log("error", "Error in DNS response handler: %s", tostring(err)); end