Merge 0.10->trunk

[prosody.git] / net / dns.lua

diff --git a/net/dns.lua b/net/dns.lua
index 2b03caf605af685408cd909d95592e7be6ee6d28..037f3ec666c202e9bb644b9221eddc75117dcf99 100644 (file)
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -226,7 +226,7 @@ end
 
 
 function dns.random(...)    -- - - - - - - - - - - - - - - - - - -  dns.random
-       math.randomseed(math.floor(10000*socket.gettime()) % 0x100000000);
+       math.randomseed(math.floor(10000*socket.gettime()) % 0x80000000);
        dns.random = math.random;
        return dns.random(...);
 end
@@ -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
 
@@ -697,15 +701,20 @@ local function comp_mx(a, b)    -- - - - - - - - - - - - - - - - - - - comp_mx
 end
 
 
-function resolver:peek (qname, qtype, qclass)    -- - - - - - - - - - - -  peek
+function resolver:peek (qname, qtype, qclass, n)    -- - - - - - - - - - - -  peek
        qname, qtype, qclass = standardize(qname, qtype, qclass);
        local rrs = get(self.cache, qclass, qtype, qname);
-       if not rrs then return nil; end
+       if not rrs then
+               if n then if n <= 0 then return end else n = 3 end
+               rrs = get(self.cache, qclass, "CNAME", qname);
+               if not (rrs and rrs[1]) then return end
+               return self:peek(rrs[1].cname, qtype, qclass, n - 1);
+       end
        if prune(rrs, socket.gettime()) and qtype == '*' or not next(rrs) then
                set(self.cache, qclass, qtype, qname, nil);
                return nil;
        end
-       if self.unsorted[rrs] then table.sort (rrs, comp_mx); end
+       if self.unsorted[rrs] then table.sort (rrs, comp_mx); self.unsorted[rrs] = nil; end
        return rrs;
 end
 
@@ -788,13 +797,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 +820,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 +837,7 @@ function resolver:servfail(sock)
                        self.best_server = 1;
                end
        end
+       return sock, err;
 end
 
 function resolver:settimeout(seconds)