Add rd_close_ to websocket stream state

This commit is contained in:
Vinnie Falco committed 2017-07-20 08:15:31 -07:00
1 parent 4d15fc455a
commit 2dced4398e
4 files changed
+11

No files matched your search

+4
View File
@@ -472,6 +472,8 @@ operator()(error_code ec,
}
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);
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(! rd_close_);
rd_close_ = true;
detail::read(cr_, fb.data(), code);
if(code != close_code::none)
goto do_close;
+2
View File
@@ -79,6 +79,7 @@ open(role_type role)
role_ = role;
failed_ = false;
rd_.cont = false;
rd_close_ = false;
wr_close_ = false;
wr_block_ = nullptr; // should be nullptr on close anyway
ping_data_ = nullptr; // should be nullptr on close anyway
@@ -132,6 +133,7 @@ reset()
{
failed_ = false;
rd_.cont = false;
rd_close_ = false;
wr_close_ = false;
wr_.cont = false;
wr_block_ = nullptr; // should be nullptr on close anyway
+1
View File
@@ -213,6 +213,7 @@ class stream
role_type role_; // server or client
bool failed_; // the connection failed
bool rd_close_; // read close frame
bool wr_close_; // sent close frame
op* wr_block_; // op currenly writing