Merge 0.10->trunk

[prosody.git] / net / dns.lua

diff --git a/net/dns.lua b/net/dns.lua
index d123731c14b578aeb26f3726d46908375ef4257f..726b2b80db4ec324496862993f9acc82c79077ca 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
@@ -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);
@@ -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
@@ -850,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();
@@ -861,7 +852,7 @@ function resolver:receive(rset)    -- - - - - - - - - - - - - - - - -  receive
                                        --print('received response');
                                        --self.print(response);
 
-                                       for j,rr in pairs(response.answer) do
+                                       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
@@ -903,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
 
@@ -1020,7 +1011,7 @@ end
 
 
 function resolver.print(response)    -- - - - - - - - - - - - - resolver.print
-       for s,s in pairs { 'id', 'qr', 'opcode', 'aa', 'tc', 'rd', 'ra', 'z',
+       for _, s in pairs { 'id', 'qr', 'opcode', 'aa', 'tc', 'rd', 'ra', 'z',
                                                'rcode', 'qdcount', 'ancount', 'nscount', 'arcount' } do
                print( string.format('%-30s', 'header.'..s), response.header[s], hint(response.header, s) );
        end
@@ -1033,7 +1024,7 @@ function resolver.print(response)    -- - - - - - - - - - - - - resolver.print
 
        local common = { name=1, type=1, class=1, ttl=1, rdlength=1, rdata=1 };
        local tmp;
-       for s,s in pairs({'answer', 'authority', 'additional'}) do
+       for _, s in pairs({'answer', 'authority', 'additional'}) do
                for i,rr in pairs(response[s]) do
                        for j,t in pairs({ 'name', 'type', 'class', 'ttl', 'rdlength' }) do
                                tmp = string.format('%s[%i].%s', s, i, t);
@@ -1054,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);