net.dns: remove unused one-letter loop variables [luacheck]

[prosody.git] / net / dns.lua

diff --git a/net/dns.lua b/net/dns.lua
index d893e38f5cc982cc4b3e9bf53a8a5e5f3dccdd42..4a35fc1be79640660c374d1239910ec8bb253f08 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, ...)
@@ -190,7 +190,7 @@ end
 local rrs_metatable = {};    -- - - - - - - - - - - - - - - - - -  rrs_metatable
 function rrs_metatable.__tostring(rrs)
        local t = {};
-       for i,rr in ipairs(rrs) do
+       for _, rr in ipairs(rrs) do
                append(t, tostring(rr)..'\n');
        end
        return table.concat(t);
@@ -591,7 +591,7 @@ function resolver:adddefaultnameservers()    -- - - - -  adddefaultnameservers
                if resolv_conf then
                        for line in resolv_conf:lines() do
                                line = line:gsub("#.*$", "")
-                                       :match('^%s*nameserver%s+([%x:%.]*)%s*$');
+                                       :match('^%s*nameserver%s+([%x:%.]*%%?%S*)%s*$');
                                if line then
                                        local ip = new_ip(line);
                                        if ip then
@@ -754,17 +754,17 @@ 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;
                local i = 1;
@@ -841,7 +841,7 @@ function resolver:receive(rset)    -- - - - - - - - - - - - - - - - -  receive
        rset = rset or self.socket;
 
        local response;
-       for i,sock in pairs(rset) do
+       for _, sock in pairs(rset) do
 
                if self.socketset[sock] then
                        local packet = sock:receive();
@@ -852,14 +852,16 @@ function resolver:receive(rset)    -- - - - - - - - - - - - - - - - -  receive
                                        --print('received response');
                                        --self.print(response);
 
-                                       for j,rr in pairs(response.answer) do
-                                               self:remember(rr, response.question[1].type)
+                                       for _, 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];
                                        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
 
@@ -873,7 +875,7 @@ function resolver:receive(rset)    -- - - - - - - - - - - - - - - - -  receive
                                                set(self.wanted, q.class, q.type, q.name, nil);
                                        end
                                end
-
+                               
                        end
                end
        end
@@ -892,7 +894,7 @@ function resolver:feed(sock, packet, force)
                --print('received response');
                --self.print(response);
 
-               for j,rr in pairs(response.answer) do
+               for _, rr in pairs(response.answer) do
                        self:remember(rr, response.question[1].type);
                end