mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +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:46:36 +01:00
commit 10aa40227b
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/resolvers/basic.lua
View file

@ -1,5 +1,6 @@
local adns = require "net.adns"; local adns = require "net.adns";
local inet_pton = require "util.net".pton; local inet_pton = require "util.net".pton;
local inet_ntop = require "util.net".ntop;
local idna_to_ascii = require "util.encodings".idna.to_ascii; local idna_to_ascii = require "util.encodings".idna.to_ascii;
local unpack = table.unpack or unpack; -- luacheck: ignore 113 local unpack = table.unpack or unpack; -- luacheck: ignore 113
@ -64,6 +65,7 @@ local function new(hostname, port, conn_type, extra)
is_ip = inet_pton(hostname:sub(2,-2)); is_ip = inet_pton(hostname:sub(2,-2));
end end
if is_ip then if is_ip then
hostname = inet_ntop(is_ip);
if #is_ip == 16 then if #is_ip == 16 then
targets = { { conn_type.."6", hostname, port, extra } }; targets = { { conn_type.."6", hostname, port, extra } };
elseif #is_ip == 4 then elseif #is_ip == 4 then