util.time: New tiny library to abstract LuaSocket's gettime() function, so we can...

[prosody.git] / net / dns.lua

diff --git a/net/dns.lua b/net/dns.lua
index 49958ed785a4ed53f9d3e06b5fb5355397c1708d..689020a47a792e986fc95ad01546c654eca25a1e 100644 (file)
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -22,8 +22,8 @@ local is_windows = (_ and windows) or os.getenv("WINDIR");
 local coroutine, io, math, string, table =
       coroutine, io, math, string, table;
 
-local ipairs, next, pairs, print, setmetatable, tostring, assert, error, unpack, select, type=
-      ipairs, next, pairs, print, setmetatable, tostring, assert, error, unpack, select, type;
+local ipairs, next, pairs, print, setmetatable, tostring, assert, error, select, type, unpack=
+      ipairs, next, pairs, print, setmetatable, tostring, assert, error, select, type, table.unpack or unpack;
 
 local ztact = { -- public domain 20080404 lua@ztact.com
        get = function(parent, ...)
@@ -71,8 +71,8 @@ local get, set = ztact.get, ztact.set;
 local default_timeout = 15;
 
 -------------------------------------------------- module dns
-module('dns')
-local dns = _M;
+local _ENV = nil;
+local dns = {};
 
 
 -- dns type & class codes ------------------------------ dns type & class codes
@@ -213,15 +213,6 @@ function cache_metatable.__tostring(cache)
 end
 
 
-function resolver:new()    -- - - - - - - - - - - - - - - - - - - - - resolver
-       local r = { active = {}, cache = {}, unsorted = {} };
-       setmetatable(r, resolver);
-       setmetatable(r.cache, cache_metatable);
-       setmetatable(r.unsorted, { __mode = 'kv' });
-       return r;
-end
-
-
 -- packet layer -------------------------------------------------- packet layer
 
 
@@ -629,7 +620,7 @@ function resolver:getsocket(servernum)    -- - - - - - - - - - - - - getsocket
        if peer:find(":") then
                sock, err = socket.udp6();
        else
-               sock, err = socket.udp();
+               sock, err = (socket.udp4 or socket.udp)();
        end
        if sock and self.socket_wrapper then sock, err = self.socket_wrapper(sock, self); end
        if not sock then
@@ -763,16 +754,16 @@ function resolver:query(qname, qtype, qclass)    -- - - - - - - - - - -- query
        self.active[id] = self.active[id] or {};
        self.active[id][question] = o;
 
-       -- remember which coroutine wants the answer
-       if co then
-               set(self.wanted, qclass, qtype, qname, co, true);
-       end
-
        local conn, err = self:getsocket(o.server)
        if not conn then
                return nil, err;
        end
        conn:send (o.packet)
+
+       -- remember which coroutine wants the answer
+       if co then
+               set(self.wanted, qclass, qtype, qname, co, true);
+       end
        
        if timer and self.timeout then
                local num_servers = #self.server;
@@ -862,7 +853,9 @@ function resolver:receive(rset)    -- - - - - - - - - - - - - - - - -  receive
                                        --self.print(response);
 
                                        for j,rr in pairs(response.answer) do
-                                               self:remember(rr, response.question[1].type)
+                                               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
@@ -1052,8 +1045,6 @@ end
 
 
 function dns.resolver ()    -- - - - - - - - - - - - - - - - - - - - - resolver
-       -- this function seems to be redundant with resolver.new ()
-
        local r = { active = {}, cache = {}, unsorted = {}, wanted = {}, best_server = 1 };
        setmetatable (r, resolver);
        setmetatable (r.cache, cache_metatable);