MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-16 23:10:54 +01:00
Code Issues Releases Wiki Activity

ircd::server: Fix insertion/resolver reentrancy conflict.

Browse source
This commit is contained in:
Jason Volk 2019-03-22 21:00:34 -07:00
parent 2417d7ac7d
commit b72758f904
1 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
ircd/server.cc
View file

@ -21,7 +21,8 @@ namespace ircd::server
template<class F> size_t accumulate_tags(F&&); template<class F> size_t accumulate_tags(F&&);
// Internal control // Internal control
std::unique_ptr<peer> create(const net::hostport &); static decltype(ircd::server::peers)::iterator
create(const net::hostport &, decltype(peers)::iterator &);
} }
decltype(ircd::server::log) decltype(ircd::server::log)
@ -123,40 +124,35 @@ ircd::server::get(const net::hostport &hostport)
auto it(peers.lower_bound(canonized)); auto it(peers.lower_bound(canonized));
if(it == peers.end() || it->first != canonized) if(it == peers.end() || it->first != canonized)
{ it = create(hostport, it);
auto peer
{
create(hostport)
};
log::debug
{
log, "peer(%p) for %s created; adding...",
peer.get(),
canonized
};
assert(bool(peer));
assert(!empty(peer->hostcanon));
const string_view key{peer->hostcanon};
it = peers.emplace_hint(it, key, std::move(peer));
assert(it->second->hostcanon.data() == it->first.data());
assert(key == canonized);
}
return *it->second; return *it->second;
} }
std::unique_ptr<ircd::server::peer> decltype(ircd::server::peers)::iterator
ircd::server::create(const net::hostport &hostport) ircd::server::create(const net::hostport &hostport,
decltype(peers)::iterator &it)
{ {
auto peer auto peer
{ {
std::make_unique<server::peer>(hostport) std::make_unique<server::peer>(hostport)
}; };
peer->resolve(peer->open_opts.hostport); log::debug
return peer; {
log, "peer(%p) for %s created; adding...",
peer.get(),
peer->hostcanon,
};
assert(bool(peer));
assert(!empty(peer->hostcanon));
const string_view key{peer->hostcanon};
it = peers.emplace_hint(it, key, std::move(peer));
assert(it->second->hostcanon.data() == it->first.data());
it->second->resolve(it->second->open_opts.hostport);
return it;
} }
ircd::server::peer & ircd::server::peer &