MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2025-01-14 00:34:18 +01:00
Code Issues Releases Wiki Activity

modules/s_dns_resolver: Handle ServFail better with retries so it's not immediately cached.

Browse source 
modules/s_dns_resolver: Increase recv work log level to critical.
This commit is contained in:
Jason Volk 2019-03-22 14:08:55 -07:00
parent 4ec689ef65
commit dfd9a3ed83
1 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
modules/s_dns_resolver.cc
View file

@ -530,7 +530,7 @@ try
}
catch(const std::exception &e)
{
log::error
log::critical
{
log, "%s", e.what()
};
@ -610,11 +610,6 @@ ircd::net::dns::resolver::handle_reply(const ipport &from,
string(addr_strbuf[1], tag.server)
};
const unwind untag{[this, &tag, &it]
{
remove(tag, it);
}};
log::debug
{
log, "dns %s recv tag:%u t:%u qtype:%u qd:%u an:%u ns:%u ar:%u",
@ -628,6 +623,34 @@ ircd::net::dns::resolver::handle_reply(const ipport &from,
header.arcount,
};
// Handle ServFail as a special case here. We can try again without
// handling this tag or propagating this error any further yet.
if(header.rcode == 2 && tag.tries < size_t(retry_max))
{
log::error
{
log, "dns %s recv tag:%u t:%u qtype:%u protocol error #%u :%s",
string(addr_strbuf[0], from),
tag.id,
tag.tries,
tag.opts.qtype,
header.rcode,
rfc1035::rcode.at(header.rcode)
};
assert(tag.tries > 0);
tag.last = steady_point::min();
submit(tag);
return;
}
// The tag is committed to being handled after this point. It will be
// removed from the tags map and any retry must c
const unwind untag{[this, &tag, &it]
{
remove(tag, it);
}};
assert(tag.tries > 0);
tag.last = steady_point::min();
tag.rcode = header.rcode;