MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-10-01 05:08:59 +02:00
Code Issues Releases Wiki Activity

ircd::server: Minor cleanup / assertions / comments.

Browse source
This commit is contained in:
Jason Volk 2018-05-02 11:42:46 -07:00
parent 3a73abef8d
commit 8f7a05c9ed
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ircd/server.cc
View file

@ -94,6 +94,7 @@ ircd::server::get(const net::hostport &hostport)
const string_view key{peer->hostname}; const string_view key{peer->hostname};
it = peers.emplace_hint(it, key, std::move(peer)); it = peers.emplace_hint(it, key, std::move(peer));
assert(it->second->hostname.data() == key.data());
} }
return *it->second; return *it->second;
@ -109,6 +110,8 @@ ircd::server::create(const net::hostport &hostport)
peer->remote, net::hostport{peer->hostname} peer->remote, net::hostport{peer->hostname}
}; };
// 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(hostport);
return peer; return peer;
} }
@ -860,7 +863,7 @@ ircd::server::peer::resolve(const hostport &hostport)
void void
ircd::server::peer::handle_resolve(std::exception_ptr eptr, ircd::server::peer::handle_resolve(std::exception_ptr eptr,
const hostport &hp, const hostport &,
const ipport &ipport) const ipport &ipport)
try try
{ {
@ -874,11 +877,13 @@ try
__builtin_unreachable(); __builtin_unreachable();
} }
// Save the results of the query to this object instance.
this->remote = ipport; this->remote = ipport;
open_opts.ipport = this->remote; open_opts.ipport = this->remote;
host(open_opts.hostport) = this->hostname;
port(open_opts.hostport) = port(ipport); port(open_opts.hostport) = port(ipport);
open_opts.common_name = {};
// The hostname in open_opts should still reference this object's string.
assert(host(open_opts.hostport).data() == this->hostname.data());
if(unlikely(finished())) if(unlikely(finished()))
return handle_finished(); return handle_finished();
@ -1601,6 +1606,7 @@ catch(const buffer_overrun &e)
ircd::const_buffer ircd::const_buffer
ircd::server::link::read(const mutable_buffer &buf) ircd::server::link::read(const mutable_buffer &buf)
{ {
assert(!empty(buf));
const size_t received const size_t received
{ {
read_one(*socket, buf) read_one(*socket, buf)
@ -1609,6 +1615,7 @@ ircd::server::link::read(const mutable_buffer &buf)
assert(peer); assert(peer);
peer->read_bytes += received; peer->read_bytes += received;
assert(received);
return const_buffer return const_buffer
{ {
data(buf), received data(buf), received