Mercurial > prosody-hg

comparison net/unbound.lua @ 12511:a24d2b3c19a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.12->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 16 May 2022 14:51:58 +0200
parents cd3b5912c9a3
children ee5b061588ea
comparison
equal deleted inserted replaced
12508:e6cfd0a6f0da 12511:a24d2b3c19a3
23 local gettime = require"socket".gettime; 23 local gettime = require"socket".gettime;
24 local dns_utils = require"util.dns"; 24 local dns_utils = require"util.dns";
25 local classes, types, errors = dns_utils.classes, dns_utils.types, dns_utils.errors; 25 local classes, types, errors = dns_utils.classes, dns_utils.types, dns_utils.errors;
26 local parsers = dns_utils.parsers; 26 local parsers = dns_utils.parsers;
27 27
28 local builtin_defaults = { hoststxt = false }
29
28 local function add_defaults(conf) 30 local function add_defaults(conf)
29 if conf then 31 if conf then
32 for option, default in pairs(builtin_defaults) do
33 if conf[option] == nil then
34 conf[option] = default;
35 end
36 end
30 for option, default in pairs(libunbound.config) do 37 for option, default in pairs(libunbound.config) do
31 if conf[option] == nil then 38 if conf[option] == nil then
32 conf[option] = default; 39 conf[option] = default;
33 end 40 end
34 end 41 end
42 else
43 return builtin_defaults;
35 end 44 end
36 return conf; 45 return conf;
37 end 46 end
38 47
39 local unbound_config; 48 local unbound_config;
131 local err; 140 local err;
132 ret, err = unbound:resolve_async(callback_wrapper, qname, ntype, nclass); 141 ret, err = unbound:resolve_async(callback_wrapper, qname, ntype, nclass);
133 if ret then 142 if ret then
134 waiting_queries[ret] = callback; 143 waiting_queries[ret] = callback;
135 else 144 else
136 log_query("warn", "Resolver error: %s", err); 145 log_query("error", "Resolver error: %s", err);
137 end 146 end
138 return ret, err; 147 return ret, err;
139 end 148 end
140 149
141 local function lookup_sync(qname, qtype, qclass) 150 local function lookup_sync(qname, qtype, qclass)