certmanager: Fix previous commit

[prosody.git] / net / dns.lua

diff --git a/net/dns.lua b/net/dns.lua
index 2b03caf605af685408cd909d95592e7be6ee6d28..2cb677f6e052f53a14cf6ea848a53eb394241fc8 100644 (file)
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -624,7 +624,7 @@ function resolver:getsocket(servernum)    -- - - - - - - - - - - - - getsocket
        local sock = self.socket[servernum];
        if sock then return sock; end
 
-       local err;
+       local ok, err;
        local peer = self.server[servernum];
        if peer:find(":") then
                sock, err = socket.udp6();
@@ -637,10 +637,14 @@ function resolver:getsocket(servernum)    -- - - - - - - - - - - - - getsocket
        end
        sock:settimeout(0);
        -- todo: attempt to use a random port, fallback to 0
-       sock:setsockname('*', 0);
-       sock:setpeername(peer, 53);
        self.socket[servernum] = sock;
        self.socketset[sock] = servernum;
+       -- set{sock,peer}name can fail, eg because of local routing table
+       -- if so, try the next server
+       ok, err = sock:setsockname('*', 0);
+       if not ok then return self:servfail(sock, err); end
+       ok, err = sock:setpeername(peer, 53);
+       if not ok then return self:servfail(sock, err); end
        return sock;
 end
 
@@ -788,13 +792,13 @@ function resolver:query(qname, qtype, qclass)    -- - - - - - - - - - -- query
        return true;
 end
 
-function resolver:servfail(sock)
+function resolver:servfail(sock, err)
        -- Resend all queries for this server
 
        local num = self.socketset[sock]
 
        -- Socket is dead now
-       self:voidsocket(sock);
+       sock = self:voidsocket(sock);
 
        -- Find all requests to the down server, and retry on the next server
        self.time = socket.gettime();
@@ -811,8 +815,8 @@ function resolver:servfail(sock)
                                        --print('timeout');
                                        queries[question] = nil;
                                else
-                                       local _a = self:getsocket(o.server);
-                                       if _a then _a:send(o.packet); end
+                                       sock, err = self:getsocket(o.server);
+                                       if sock then sock:send(o.packet); end
                                end
                        end
                end
@@ -828,6 +832,7 @@ function resolver:servfail(sock)
                        self.best_server = 1;
                end
        end
+       return sock, err;
 end
 
 function resolver:settimeout(seconds)