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

Add rd_close_ to websocket stream state

Browse Source
This commit is contained in:
Vinnie Falco
2017-07-14 12:22:37 -07:00
parent 4d15fc455a
commit 2dced4398e
4 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -1,6 +1,10 @@
* Documentation tidying * Documentation tidying
* is_invocable works with move-only types * is_invocable works with move-only types
WebSocket
* websocket::stream tidying * websocket::stream tidying
* Add rd_close_ to websocket stream state
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

4
include/beast/websocket/impl/read.ipp
View File

@@ -472,6 +472,8 @@ operator()(error_code ec,
} }
BOOST_ASSERT(d.fh.op == detail::opcode::close); BOOST_ASSERT(d.fh.op == detail::opcode::close);
{ {
BOOST_ASSERT(! d.ws.rd_close_);
d.ws.rd_close_ = true;
detail::read(d.ws.cr_, d.fb.data(), code); detail::read(d.ws.cr_, d.fb.data(), code);
if(code != close_code::none) if(code != close_code::none)
{ {
@@ -822,6 +824,8 @@ read_frame(DynamicBuffer& dynabuf, error_code& ec)
} }
BOOST_ASSERT(fh.op == detail::opcode::close); BOOST_ASSERT(fh.op == detail::opcode::close);
{ {
BOOST_ASSERT(! rd_close_);
rd_close_ = true;
detail::read(cr_, fb.data(), code); detail::read(cr_, fb.data(), code);
if(code != close_code::none) if(code != close_code::none)
goto do_close; goto do_close;

2
include/beast/websocket/impl/stream.ipp
View File

@@ -79,6 +79,7 @@ open(role_type role)
role_ = role; role_ = role;
failed_ = false; failed_ = false;
rd_.cont = false; rd_.cont = false;
rd_close_ = false;
wr_close_ = false; wr_close_ = false;
wr_block_ = nullptr; // should be nullptr on close anyway wr_block_ = nullptr; // should be nullptr on close anyway
ping_data_ = nullptr; // should be nullptr on close anyway ping_data_ = nullptr; // should be nullptr on close anyway
@@ -132,6 +133,7 @@ reset()
{ {
failed_ = false; failed_ = false;
rd_.cont = false; rd_.cont = false;
rd_close_ = false;
wr_close_ = false; wr_close_ = false;
wr_.cont = false; wr_.cont = false;
wr_block_ = nullptr; // should be nullptr on close anyway wr_block_ = nullptr; // should be nullptr on close anyway

1
include/beast/websocket/stream.hpp
View File

@@ -213,6 +213,7 @@ class stream
role_type role_; // server or client role_type role_; // server or client
bool failed_; // the connection failed bool failed_; // the connection failed
bool rd_close_; // read close frame
bool wr_close_; // sent close frame bool wr_close_; // sent close frame
op* wr_block_; // op currenly writing op* wr_block_; // op currenly writing