Frame processing routines are member functions

include/beast/websocket/impl/read_frame_op.ipp

@@ -243,8 +243,7 @@ operator()(error_code ec,std::size_t bytes_transferred, bool again)
             {
                 d.fb.commit(bytes_transferred);
                 code = close_code::none;
-                auto const n = detail::read_fh1(
-                    d.ws.rd_fh_, d.fb, d.ws.role_, code);
+                auto const n = d.ws.read_fh1(d.fb, code);
                 if(code != close_code::none)
                 {
                     // protocol error
@@ -266,10 +265,7 @@ operator()(error_code ec,std::size_t bytes_transferred, bool again)
             case do_read_fh + 2:
                 d.fb.commit(bytes_transferred);
                 code = close_code::none;
-                detail::read_fh2(d.ws.rd_fh_,
-                    d.fb, d.ws.role_, code);
-                if(code == close_code::none)
-                    d.ws.prepare_fh(code);
+                d.ws.read_fh2(d.fb, code);
                 if(code != close_code::none)
                 {
                     // protocol error

include/beast/websocket/impl/stream.ipp

@@ -38,142 +38,6 @@
 namespace beast {
 namespace websocket {
 
-namespace detail {
-
-template<class _>
-void
-stream_base::open(role_type role)
-{
-    role_ = role;
-}
-
-template<class _>
-void
-stream_base::prepare_fh(close_code::value& code)
-{
-    // continuation without an active message
-    if(! rd_cont_ && rd_fh_.op == opcode::cont)
-    {
-        code = close_code::protocol_error;
-        return;
-    }
-    // new data frame when continuation expected
-    if(rd_cont_ && ! is_control(rd_fh_.op) &&
-        rd_fh_.op != opcode::cont)
-    {
-        code = close_code::protocol_error;
-        return;
-    }
-    if(rd_fh_.mask)
-        prepare_key(rd_key_, rd_fh_.key);
-    if(! is_control(rd_fh_.op))
-    {
-        if(rd_fh_.op != opcode::cont)
-        {
-            rd_size_ = rd_fh_.len;
-            rd_opcode_ = rd_fh_.op;
-        }
-        else
-        {
-            if(rd_size_ > std::numeric_limits<
-                std::uint64_t>::max() - rd_fh_.len)
-            {
-                code = close_code::too_big;
-                return;
-            }
-            rd_size_ += rd_fh_.len;
-        }
-        if(rd_msg_max_ && rd_size_ > rd_msg_max_)
-        {
-            code = close_code::too_big;
-            return;
-        }
-        rd_need_ = rd_fh_.len;
-        rd_cont_ = ! rd_fh_.fin;
-    }
-}
-
-template<class DynamicBuffer>
-void
-stream_base::write_close(
-    DynamicBuffer& db, close_reason const& cr)
-{
-    using namespace boost::endian;
-    frame_header fh;
-    fh.op = opcode::close;
-    fh.fin = true;
-    fh.rsv1 = false;
-    fh.rsv2 = false;
-    fh.rsv3 = false;
-    fh.len = cr.code == close_code::none ?
-        0 : 2 + cr.reason.size();
-    fh.mask = role_ == detail::role_type::client;
-    if(fh.mask)
-        fh.key = maskgen_();
-    detail::write(db, fh);
-    if(cr.code != close_code::none)
-    {
-        detail::prepared_key_type key;
-        if(fh.mask)
-            detail::prepare_key(key, fh.key);
-        {
-            std::uint8_t b[2];
-            ::new(&b[0]) big_uint16_buf_t{
-                (std::uint16_t)cr.code};
-            auto d = db.prepare(2);
-            boost::asio::buffer_copy(d,
-                boost::asio::buffer(b));
-            if(fh.mask)
-                detail::mask_inplace(d, key);
-            db.commit(2);
-        }
-        if(! cr.reason.empty())
-        {
-            auto d = db.prepare(cr.reason.size());
-            boost::asio::buffer_copy(d,
-                boost::asio::const_buffer(
-                    cr.reason.data(), cr.reason.size()));
-            if(fh.mask)
-                detail::mask_inplace(d, key);
-            db.commit(cr.reason.size());
-        }
-    }
-}
-
-template<class DynamicBuffer>
-void
-stream_base::write_ping(DynamicBuffer& db,
-    opcode op, ping_data const& data)
-{
-    frame_header fh;
-    fh.op = op;
-    fh.fin = true;
-    fh.rsv1 = false;
-    fh.rsv2 = false;
-    fh.rsv3 = false;
-    fh.len = data.size();
-    fh.mask = role_ == role_type::client;
-    if(fh.mask)
-        fh.key = maskgen_();
-    detail::write(db, fh);
-    if(data.empty())
-        return;
-    detail::prepared_key_type key;
-    if(fh.mask)
-        detail::prepare_key(key, fh.key);
-    auto d = db.prepare(data.size());
-    boost::asio::buffer_copy(d,
-        boost::asio::const_buffers_1(
-            data.data(), data.size()));
-    if(fh.mask)
-        detail::mask_inplace(d, key);
-    db.commit(data.size());
-}
-
-} // detail
-
-//------------------------------------------------------------------------------
-
 template<class NextLayer>
 template<class... Args>
 stream<NextLayer>::
@@ -1037,8 +901,7 @@ do_read_fh(detail::frame_streambuf& fb,
         stream_, fb.prepare(2), ec));
     if(ec)
         return;
-    auto const n = detail::read_fh1(
-        rd_fh_, fb, role_, code);
+    auto const n = read_fh1(fb, code);
     if(code != close_code::none)
         return;
     if(n > 0)
@@ -1048,11 +911,7 @@ do_read_fh(detail::frame_streambuf& fb,
         if(ec)
             return;
     }
-    detail::read_fh2(
-        rd_fh_, fb, role_, code);
-    if(code != close_code::none)
-        return;
-    prepare_fh(code);
+    read_fh2(fb, code);
 }
 
 } // websocket