Merge with 0.7

[prosody.git] / net / dns.lua

diff --git a/net/dns.lua b/net/dns.lua
index 5d5f512f3796b6021c2f09b456313dee4ec7f5f7..ca5f3c621d150bc9367ab65d3bc95e11786ad73e 100644 (file)
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -183,7 +183,7 @@ end
 
 
 function dns.random(...)    -- - - - - - - - - - - - - - - - - - -  dns.random
-       math.randomseed(10000*socket.gettime());
+       math.randomseed(math.floor(10000*socket.gettime()));
        dns.random = math.random;
        return dns.random(...);
 end
@@ -594,17 +594,18 @@ end
 
 function resolver:remember(rr, type)    -- - - - - - - - - - - - - -  remember
        --print ('remember', type, rr.class, rr.type, rr.name)
+       local qname, qtype, qclass = standardize(rr.name, rr.type, rr.class);
 
        if type ~= '*' then
-               type = rr.type;
-               local all = get(self.cache, rr.class, '*', rr.name);
+               type = qtype;
+               local all = get(self.cache, qclass, '*', qname);
                --print('remember all', all);
                if all then append(all, rr); end
        end
 
        self.cache = self.cache or setmetatable({}, cache_metatable);
-       local rrs = get(self.cache, rr.class, type, rr.name) or
-               set(self.cache, rr.class, type, rr.name, setmetatable({}, rrs_metatable));
+       local rrs = get(self.cache, qclass, type, qname) or
+               set(self.cache, qclass, type, qname, setmetatable({}, rrs_metatable));
        append(rrs, rr);
 
        if type == 'MX' then self.unsorted[rrs] = true; end
@@ -726,27 +727,26 @@ function resolver:receive(rset)    -- - - - - - - - - - - - - - - - -  receive
                        local packet = sock:receive();
                        if packet then
                                response = self:decode(packet);
-                               if response and self.active[response.header.id] 
+                               if response and self.active[response.header.id]
                                        and self.active[response.header.id][response.question.raw] then
                                        --print('received response');
                                        --self.print(response);
 
-                                       for i,section in pairs({ 'answer', 'authority', 'additional' }) do
-                                               for j,rr in pairs(response[section]) do
+                                       for j,rr in pairs(response.answer) do
+                                               if rr.name:sub(-#response.question[1].name, -1) == response.question[1].name then
                                                        self:remember(rr, response.question[1].type)
                                                end
                                        end
 
                                        -- retire the query
                                        local queries = self.active[response.header.id];
-                                       if queries[response.question.raw] then
-                                               queries[response.question.raw] = nil;
-                                       end
+                                       queries[response.question.raw] = nil;
+                                       
                                        if not next(queries) then self.active[response.header.id] = nil; end
                                        if not next(self.active) then self:closeall(); end
 
                                        -- was the query on the wanted list?
-                                       local q = response.question;
+                                       local q = response.question[1];
                                        local cos = get(self.wanted, q.class, q.type, q.name);
                                        if cos then
                                                for co in pairs(cos) do
@@ -769,21 +769,18 @@ function resolver:feed(sock, packet)
        self.time = socket.gettime();
 
        local response = self:decode(packet);
-       if response then
+       if response and self.active[response.header.id]
+               and self.active[response.header.id][response.question.raw] then
                --print('received response');
                --self.print(response);
 
-               for i,section in pairs({ 'answer', 'authority', 'additional' }) do
-                       for j,rr in pairs(response[section]) do
-                               self:remember(rr, response.question[1].type);
-                       end
+               for j,rr in pairs(response.answer) do
+                       self:remember(rr, response.question[1].type);
                end
 
                -- retire the query
                local queries = self.active[response.header.id];
-               if queries[response.question.raw] then
-                       queries[response.question.raw] = nil;
-               end
+               queries[response.question.raw] = nil;
                if not next(queries) then self.active[response.header.id] = nil; end
                if not next(self.active) then self:closeall(); end
 
@@ -916,11 +913,6 @@ end
 -- module api ------------------------------------------------------ module api
 
 
-local function resolve(func, ...)    -- - - - - - - - - - - - - - resolver_get
-       return func(dns._resolver, ...);
-end
-
-
 function dns.resolver ()    -- - - - - - - - - - - - - - - - - - - - - resolver
        -- this function seems to be redundant with resolver.new ()
 
@@ -931,37 +923,35 @@ function dns.resolver ()    -- - - - - - - - - - - - - - - - - - - - - resolver
        return r;
 end
 
+local _resolver = dns.resolver();
+dns._resolver = _resolver;
 
 function dns.lookup(...)    -- - - - - - - - - - - - - - - - - - - - -  lookup
-       return resolve(resolver.lookup, ...);
+       return _resolver:lookup(...);
 end
 
-
 function dns.purge(...)    -- - - - - - - - - - - - - - - - - - - - - -  purge
-       return resolve(resolver.purge, ...);
+       return _resolver:purge(...);
 end
 
 function dns.peek(...)    -- - - - - - - - - - - - - - - - - - - - - - -  peek
-       return resolve(resolver.peek, ...);
+       return _resolver:peek(...);
 end
 
-
 function dns.query(...)    -- - - - - - - - - - - - - - - - - - - - - -  query
-       return resolve(resolver.query, ...);
+       return _resolver:query(...);
 end
 
-function dns.feed(...)    -- - - - - - - - - - - - - - - - - - - - - -  feed
-       return resolve(resolver.feed, ...);
+function dns.feed(...)    -- - - - - - - - - - - - - - - - - - - - - - -  feed
+       return _resolver:feed(...);
 end
 
-function dns.cancel(...)   -- - - - - - - - - - - - - - - - - - - - - -  cancel
-       return resolve(resolver.cancel, ...);
+function dns.cancel(...)  -- - - - - - - - - - - - - - - - - - - - - -  cancel
+       return _resolver:cancel(...);
 end
 
-function dns:socket_wrapper_set(...)    -- - - - - - - - -  socket_wrapper_set
-       return resolve(resolver.socket_wrapper_set, ...);
+function dns.socket_wrapper_set(...)    -- - - - - - - - -  socket_wrapper_set
+       return _resolver:socket_wrapper_set(...);
 end
 
-dns._resolver = dns.resolver();
-
 return dns;