feedc0de/boost_beast
1
0
Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Refactor read_op + fail_op

Browse Source
This commit is contained in:
Vinnie Falco
2017-08-14 15:40:13 -07:00
parent 3652137718
commit fa087e19f1
12 changed files with 456 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/beast/websocket/impl/close.ipp
+1 -1
View File
@@ -251,7 +251,7 @@ close(close_reason const& cr, error_code& ec)
rd_close_ = true;
auto const mb = buffer_prefix(
clamp(rd_.fh.len),
rd_.buf.mutable_data());
rd_.buf.data());
if(rd_.fh.len > 0 && rd_.fh.mask)
detail::mask_inplace(mb, rd_.key);
detail::read_close(cr_, mb, code);
include/boost/beast/websocket/impl/fail.ipp
+1 -4
View File
@@ -202,10 +202,7 @@ operator()(error_code ec, std::size_t)
upcall:
BOOST_ASSERT(d.ws.wr_block_ == d.tok);
d.ws.wr_block_.reset();
d.ws.close_op_.maybe_invoke() ||
d.ws.ping_op_.maybe_invoke() ||
d.ws.wr_op_.maybe_invoke();
d_.invoke(ec, 0);
d_.invoke(ec);
}
}
include/boost/beast/websocket/impl/read.ipp
+445 -510
View File
File diff suppressed because it is too large Load Diff
include/boost/beast/websocket/impl/stream.ipp
+5 -1
View File
@@ -177,11 +177,13 @@ open(role_type role)
rd_.cont = false;
rd_.done = true;
// Can't clear this because accept uses it
//rd_.buf.consume(rd_.buf.size());
//rd_.buf.reset();
rd_.fh.fin = false;
rd_close_ = false;
wr_close_ = false;
wr_block_.reset();
rd_block_.reset();
cr_.code = close_code::none;
ping_data_ = nullptr; // should be nullptr on close anyway
wr_.cont = false;
@@ -240,6 +242,8 @@ reset()
wr_close_ = false;
wr_.cont = false;
wr_block_.reset();
rd_block_.reset();
cr_.code = close_code::none;
ping_data_ = nullptr; // should be nullptr on close anyway
}