mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.11->trunk

Browse source
This commit is contained in:
Kim Alvefur 2019-11-24 04:30:32 +01:00
commit 42b9614fe2
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
net/resolvers/basic.lua
View file

@ -34,16 +34,6 @@ function methods:next(cb)
self:next(cb);
end
local is_ip = inet_pton(self.hostname);
if is_ip then
if #is_ip == 16 then
cb(self.conn_type.."6", self.hostname, self.port, self.extra);
elseif #is_ip == 4 then
cb(self.conn_type.."4", self.hostname, self.port, self.extra);
end
return;
end
-- Resolve DNS to target list
local dns_resolver = adns.resolver();
dns_resolver:lookup(function (answer)
@ -66,11 +56,27 @@ function methods:next(cb)
end
local function new(hostname, port, conn_type, extra)
local ascii_host = idna_to_ascii(hostname);
local targets = nil;
local is_ip = inet_pton(hostname);
if not is_ip and hostname:sub(1,1) == '[' then
is_ip = inet_pton(hostname:sub(2,-2));
end
if is_ip then
if #is_ip == 16 then
targets = { { conn_type.."6", hostname, port, extra } };
elseif #is_ip == 4 then
targets = { { conn_type.."4", hostname, port, extra } };
end
end
return setmetatable({
hostname = idna_to_ascii(hostname);
hostname = ascii_host;
port = port;
conn_type = conn_type or "tcp";
extra = extra;
targets = targets;
}, resolver_mt);
end