certmanager: Fix previous commit

[prosody.git] / net / dns.lua

diff --git a/net/dns.lua b/net/dns.lua
index 42bbdb013b80648f4dd0ec64128b4de9045bfcdf..2cb677f6e052f53a14cf6ea848a53eb394241fc8 100644 (file)
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -135,17 +135,19 @@ end
 
 local function prune(rrs, time, soft)    -- - - - - - - - - - - - - - -  prune
        time = time or socket.gettime();
-       for i,rr in pairs(rrs) do
+       for i,rr in ipairs(rrs) do
                if rr.tod then
                        -- rr.tod = rr.tod - 50    -- accelerated decripitude
                        rr.ttl = math.floor(rr.tod - time);
                        if rr.ttl <= 0 then
+                               rrs[rr[rr.type:lower()]] = nil;
                                table.remove(rrs, i);
                                return prune(rrs, time, soft); -- Re-iterate
                        end
                elseif soft == 'soft' then    -- What is this?  I forget!
                        assert(rr.ttl == 0);
-                       rrs[i] = nil;
+                       rrs[rr[rr.type:lower()]] = nil;
+                       table.remove(rrs, i);
                end
        end
 end
@@ -188,7 +190,7 @@ end
 local rrs_metatable = {};    -- - - - - - - - - - - - - - - - - -  rrs_metatable
 function rrs_metatable.__tostring(rrs)
        local t = {};
-       for i,rr in pairs(rrs) do
+       for i,rr in ipairs(rrs) do
                append(t, tostring(rr)..'\n');
        end
        return table.concat(t);
@@ -622,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();
@@ -635,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
 
@@ -681,7 +687,10 @@ function resolver:remember(rr, type)    -- - - - - - - - - - - - - -  remember
        self.cache = self.cache or setmetatable({}, cache_metatable);
        local rrs = get(self.cache, qclass, type, qname) or
                set(self.cache, qclass, type, qname, setmetatable({}, rrs_metatable));
-       append(rrs, rr);
+       if not rrs[rr[qtype:lower()]] then
+               rrs[rr[qtype:lower()]] = true;
+               append(rrs, rr);
+       end
 
        if type == 'MX' then self.unsorted[rrs] = true; end
 end
@@ -783,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();
@@ -806,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
@@ -823,6 +832,7 @@ function resolver:servfail(sock)
                        self.best_server = 1;
                end
        end
+       return sock, err;
 end
 
 function resolver:settimeout(seconds)