prosody
e8db377a2983
net/adns.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

net/adns.lua @ 10563:e8db377a2983

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 24 Dec 2019 00:39:45 +0100
parent 10114:2f7628804db6
child 10614:431511e190bc
comparison
equal deleted inserted replaced
10562:670afc079f68 10563:e8db377a2983
9 local server = require "net.server"; 9 local server = require "net.server";
10 local new_resolver = require "net.dns".resolver; 10 local new_resolver = require "net.dns".resolver;
11 11
12 local log = require "util.logger".init("adns"); 12 local log = require "util.logger".init("adns");
13 13
14 local coroutine, tostring, pcall = coroutine, tostring, pcall; 14 local coroutine, pcall = coroutine, pcall;
15 local setmetatable = setmetatable; 15 local setmetatable = setmetatable;
16 16
17 local function dummy_send(sock, data, i, j) return (j-i)+1; end 17 local function dummy_send(sock, data, i, j) return (j-i)+1; end -- luacheck: ignore 212
18 18
19 local _ENV = nil; 19 local _ENV = nil;
20 -- luacheck: std none 20 -- luacheck: std none
21 21
22 local async_resolver_methods = {}; 22 local async_resolver_methods = {};
27 27
28 local function new_async_socket(sock, resolver) 28 local function new_async_socket(sock, resolver)
29 local peername = "<unknown>"; 29 local peername = "<unknown>";
30 local listener = {}; 30 local listener = {};
31 local handler = {}; 31 local handler = {};
32 local err; 32 function listener.onincoming(conn, data) -- luacheck: ignore 212/conn
33 function listener.onincoming(conn, data)
34 if data then 33 if data then
35 resolver:feed(handler, data); 34 resolver:feed(handler, data);
36 end 35 end
37 end 36 end
38 function listener.ondisconnect(conn, err) 37 function listener.ondisconnect(conn, err)
44 end 43 end
45 44
46 resolver:servfail(conn); -- Let the magic commence 45 resolver:servfail(conn); -- Let the magic commence
47 end 46 end
48 end 47 end
49 handler, err = server.wrapclient(sock, "dns", 53, listener); 48 do
50 if not handler then 49 local err;
51 return nil, err; 50 handler, err = server.wrapclient(sock, "dns", 53, listener);
51 if not handler then
52 return nil, err;
53 end
52 end 54 end
53 55
54 handler.settimeout = function () end 56 handler.settimeout = function () end
55 handler.setsockname = function (_, ...) return sock:setsockname(...); end 57 handler.setsockname = function (_, ...) return sock:setsockname(...); end
56 handler.setpeername = function (_, ...) peername = (...); local ret, err = sock:setpeername(...); _:set_send(dummy_send); return ret, err; end 58 handler.setpeername = function (_, ...) peername = (...); local ret, err = sock:setpeername(...); _:set_send(dummy_send); return ret, err; end
69 if peek then 71 if peek then
70 log("debug", "Records for %s already cached, using those...", qname); 72 log("debug", "Records for %s already cached, using those...", qname);
71 handler(peek); 73 handler(peek);
72 return; 74 return;
73 end 75 end
74 log("debug", "Records for %s not in cache, sending query (%s)...", qname, tostring(coroutine.running())); 76 log("debug", "Records for %s not in cache, sending query (%s)...", qname, coroutine.running());
75 local ok, err = resolver:query(qname, qtype, qclass); 77 local ok, err = resolver:query(qname, qtype, qclass);
76 if ok then 78 if ok then
77 coroutine.yield(setmetatable({ resolver, qclass or "IN", qtype or "A", qname, coroutine.running()}, query_mt)); -- Wait for reply 79 coroutine.yield(setmetatable({ resolver, qclass or "IN", qtype or "A", qname, coroutine.running()}, query_mt)); -- Wait for reply
78 log("debug", "Reply for %s (%s)", qname, tostring(coroutine.running())); 80 log("debug", "Reply for %s (%s)", qname, coroutine.running());
79 end 81 end
80 if ok then 82 if ok then
81 ok, err = pcall(handler, resolver:peek(qname, qtype, qclass)); 83 ok, err = pcall(handler, resolver:peek(qname, qtype, qclass));
82 else 84 else
83 log("error", "Error sending DNS query: %s", err); 85 log("error", "Error sending DNS query: %s", err);
84 ok, err = pcall(handler, nil, err); 86 ok, err = pcall(handler, nil, err);
85 end 87 end
86 if not ok then 88 if not ok then
87 log("error", "Error in DNS response handler: %s", tostring(err)); 89 log("error", "Error in DNS response handler: %s", err);
88 end 90 end
89 end)(resolver:peek(qname, qtype, qclass)); 91 end)(resolver:peek(qname, qtype, qclass));
90 end 92 end
91 93
92 function query_methods:cancel(call_handler, reason) 94 function query_methods:cancel(call_handler, reason) -- luacheck: ignore 212/reason
93 log("warn", "Cancelling DNS lookup for %s", tostring(self[4])); 95 log("warn", "Cancelling DNS lookup for %s", self[4]);
94 self[1].cancel(self[2], self[3], self[4], self[5], call_handler); 96 self[1].cancel(self[2], self[3], self[4], self[5], call_handler);
95 end 97 end
96 98
97 local function new_async_resolver() 99 local function new_async_resolver()
98 local resolver = new_resolver(); 100 local resolver = new_resolver();