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

ircd::server: Flash the HTTP header to a node callback to learn information.

Browse source
This commit is contained in:
Jason Volk 2018-01-24 09:15:57 -08:00
parent 7bbe116b88
commit ed4d645523
3 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,7 @@ struct ircd::server::node
net::remote remote;
std::exception_ptr eptr;
std::list<link> links;
std::string server_name;
template<class F> size_t accumulate_links(F&&) const;
template<class F> size_t accumulate_tags(F&&) const;
@ -40,6 +41,7 @@ struct ircd::server::node
void disperse(link &);
void del(link &);
void handle_head_recv(const link &, const tag &, const http::response::head &);
void handle_link_done(link &);
void handle_tag_done(link &, tag &) noexcept;
void handle_finished(link &);

4
include/ircd/server/tag.h
View file

@ -56,7 +56,7 @@ struct ircd::server::tag
mutable_buffer make_read_head_buffer() const;
const_buffer read_content(const const_buffer &, bool &done);
const_buffer read_head(const const_buffer &, bool &done);
const_buffer read_head(const const_buffer &, bool &done, link &);
public:
size_t write_total() const;
@ -75,7 +75,7 @@ struct ircd::server::tag
void wrote_buffer(const const_buffer &);
mutable_buffer make_read_buffer() const;
const_buffer read_buffer(const const_buffer &, bool &done);
const_buffer read_buffer(const const_buffer &, bool &done, link &);
tag() = default;
tag(server::request &);

38
ircd/server.cc
View file

@ -589,6 +589,26 @@ ircd::server::node::handle_link_done(link &link)
}
}
/// This is called when a tag on a link receives an HTTP response head.
/// We can use this to learn information from the tag's request and the
/// response head etc.
void
ircd::server::node::handle_head_recv(const link &link,
const tag &tag,
const http::response::head &head)
{
// Learn the software version of the remote node so we can shape
// requests more effectively.
if(!server_name && head.server)
{
server_name = std::string{head.server};
log.debug("node(%p) learned %s is '%s'",
this,
string(remote),
server_name);
}
}
void
ircd::server::node::disperse(link &link)
{
@ -1281,7 +1301,7 @@ try
const const_buffer overrun
{
tag.read_buffer(view, done)
tag.read_buffer(view, done, *this)
};
assert(done || empty(overrun));
@ -1672,15 +1692,20 @@ ircd::server::disassociate(request &request,
/// The tag indicates it is entirely finished with receiving its data by
/// setting the value of `done` to true. Otherwise it is assumed false.
///
/// The link argument is not to be used to control/modify the link from the
/// tag; it's only a backreference to flash information to the link/node
/// through specific callbacks so the node can learn information.
///
ircd::const_buffer
ircd::server::tag::read_buffer(const const_buffer &buffer,
bool &done)
bool &done,
link &link)
{
assert(request);
return
head_read < size(request->in.head)?
read_head(buffer, done):
read_head(buffer, done, link):
read_content(buffer, done);
}
@ -1799,7 +1824,8 @@ const
ircd::const_buffer
ircd::server::tag::read_head(const const_buffer &buffer,
bool &done)
bool &done,
link &link)
{
assert(request);
auto &req{*request};
@ -1893,6 +1919,10 @@ ircd::server::tag::read_head(const const_buffer &buffer,
assert(pb.completed() == head_read);
this->status = http::status(head.status);
// Proffer the HTTP head to the node so it can learn from any data
assert(link.node);
link.node->handle_head_recv(link, *this, head);
// Now we know how much content was received beyond the head
const size_t &content_read
{