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

net.dns: Use inet_ntop from util.net if available

Browse source
This commit is contained in:
Kim Alvefur 2017-11-29 08:02:14 +01:00
parent 4816e879f8
commit c8323e953d
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
net/dns.lua
View file

@ -15,6 +15,7 @@
local socket = require "socket";
local timer = require "util.timer";
local new_ip = require "util.ip".new_ip;
local have_util_net, util_net = pcall(require, "util.net");
local _, windows = pcall(require, "util.windows");
local is_windows = (_ and windows) or os.getenv("WINDIR");
@ -382,6 +383,12 @@ function resolver:A(rr) -- - - - - - - - - - - - - - - - - - - - - - - - A
rr.a = string.format('%i.%i.%i.%i', b1, b2, b3, b4);
end
if have_util_net and util_net.ntop then
function resolver:A(rr)
rr.a = util_net.ntop(self:sub(4));
end
end
function resolver:AAAA(rr)
local addr = {};
for _ = 1, rr.rdlength, 2 do
@ -402,6 +409,12 @@ function resolver:AAAA(rr)
rr.aaaa = addr:gsub(zeros[1], "::", 1):gsub("^0::", "::"):gsub("::0$", "::");
end
if have_util_net and util_net.ntop then
function resolver:AAAA(rr)
rr.aaaa = util_net.ntop(self:sub(16));
end
end
function resolver:CNAME(rr) -- - - - - - - - - - - - - - - - - - - - CNAME
rr.cname = self:name();
end