MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-07-04 17:48:35 +02:00
Code Issues Releases Wiki Activity

ircd::net: Return pointer to cached error record for put_error().

Browse source
This commit is contained in:
Jason Volk 2018-04-28 16:25:20 -07:00
parent 48abece29b
commit 1d408173dc
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ircd/net/dns.h
View file

@ -98,7 +98,7 @@ struct ircd::net::dns::cache
public:
bool get(const hostport &, const opts &, const callback &);
rfc1035::record *put(const rfc1035::question &, const rfc1035::answer &);
bool put_error(const rfc1035::question &, const uint &code);
rfc1035::record *put_error(const rfc1035::question &, const uint &code);
};
template<class Callback>

15
ircd/net.cc
View file

@ -2527,7 +2527,7 @@ ircd::net::dns::make_SRV_key(const mutable_buffer &out,
// cache
//
bool
ircd::rfc1035::record *
ircd::net::dns::cache::put_error(const rfc1035::question &question,
const uint &code)
{
@ -2556,8 +2556,8 @@ ircd::net::dns::cache::put_error(const rfc1035::question &question,
rfc1035::record::A record;
record.ttl = ircd::time() + seconds(cache::clear_nxdomain).count(); //TODO: code
map.emplace_hint(it, host, record);
return true;
it = map.emplace_hint(it, host, record);
return &it->second;
}
case 33: // SRV
@ -2577,12 +2577,13 @@ ircd::net::dns::cache::put_error(const rfc1035::question &question,
rfc1035::record::SRV record;
record.ttl = ircd::time() + seconds(cache::clear_nxdomain).count(); //TODO: code
map.emplace_hint(it, host, record);
return true;
it = map.emplace_hint(it, host, record);
it->second.tgt = it->first;
return &it->second;
}
}
return false;
return nullptr;
}
ircd::rfc1035::record *
@ -2705,7 +2706,7 @@ ircd::net::dns::cache::get(const hostport &hp,
// Cached entry is a cached error, we set the eptr, but also
// include the record and increment the count like normal.
assert(!eptr);
if(!rr.tgt)
if(!rr.tgt || !rr.port)
{
//TODO: we don't cache what the error was, assuming it's
//TODO: NXDomain can be incorrect and in bad ways downstream...