MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 15:33:54 +01:00
Code Issues Releases Wiki Activity

ircd::server: Internalize more references to the peer instance; various cleanup.

Browse source
This commit is contained in:
Jason Volk 2018-05-18 19:42:41 -07:00
parent fc3fd6a8b2
commit 65f7adc8c6
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ircd/server/peer.h
View file

@ -109,7 +109,7 @@ struct ircd::server::peer
void interrupt();
void close(const net::close_opts & = net::close_opts_default);
peer();
peer(std::string hostname);
peer(peer &&) = delete;
peer(const peer &) = delete;
~peer() noexcept;

20
ircd/server.cc
View file

@ -103,16 +103,22 @@ ircd::server::get(const net::hostport &hostport)
std::unique_ptr<ircd::server::peer>
ircd::server::create(const net::hostport &hostport)
{
auto peer(std::make_unique<peer>());
peer->hostname = net::canonize(hostport);
auto peer
{
std::make_unique<server::peer>(net::canonize(hostport))
};
peer->open_opts = net::open_opts
{
peer->remote, net::hostport{peer->hostname}
peer->remote, net::hostport
{
peer->hostname, "matrix", port(hostport)
}
};
// Async DNS resolve. The links for the new peer will be connected
// once the resolver calls back into peer::handle_resolve().
peer->resolve(hostport);
peer->resolve(peer->open_opts.hostport);
return peer;
}
@ -330,8 +336,9 @@ ircd::server::submit(const hostport &hostport,
peer.submit(request);
}
///////////////////////////////////////////////////////////////////////////////
//
// peer
// server/peer.h
//
decltype(ircd::server::peers)
@ -356,7 +363,8 @@ ircd::server::peer::link_max_default
// peer::peer
//
ircd::server::peer::peer()
ircd::server::peer::peer(std::string hostname)
:hostname{std::move(hostname)}
{
}