Remove obsolete frame tests

include/boost/beast/websocket/impl/stream.ipp

@@ -424,194 +424,6 @@ parse_fh(
     return true;
 }
 
-// Read fixed frame header from buffer
-// Requires at least 2 bytes
-//
-template<class NextLayer>
-template<class DynamicBuffer>
-std::size_t
-stream<NextLayer>::
-read_fh1(detail::frame_header& fh,
-    DynamicBuffer& db, close_code& code)
-{
-    using boost::asio::buffer;
-    using boost::asio::buffer_copy;
-    using boost::asio::buffer_size;
-    auto const err =
-        [&](close_code cv)
-        {
-            code = cv;
-            return 0;
-        };
-    std::uint8_t b[2];
-    BOOST_ASSERT(buffer_size(db.data()) >= sizeof(b));
-    db.consume(buffer_copy(buffer(b), db.data()));
-    std::size_t need;
-    fh.len = b[1] & 0x7f;
-    switch(fh.len)
-    {
-        case 126: need = 2; break;
-        case 127: need = 8; break;
-        default:
-            need = 0;
-    }
-    fh.mask = (b[1] & 0x80) != 0;
-    if(fh.mask)
-        need += 4;
-    fh.op   = static_cast<
-        detail::opcode>(b[0] & 0x0f);
-    fh.fin  = (b[0] & 0x80) != 0;
-    fh.rsv1 = (b[0] & 0x40) != 0;
-    fh.rsv2 = (b[0] & 0x20) != 0;
-    fh.rsv3 = (b[0] & 0x10) != 0;
-    switch(fh.op)
-    {
-    case detail::opcode::binary:
-    case detail::opcode::text:
-        if(rd_.cont)
-        {
-            // new data frame when continuation expected
-            return err(close_code::protocol_error);
-        }
-        if((fh.rsv1 && ! pmd_) ||
-            fh.rsv2 || fh.rsv3)
-        {
-            // reserved bits not cleared
-            return err(close_code::protocol_error);
-        }
-        if(pmd_)
-            pmd_->rd_set = fh.rsv1;
-        break;
-
-    case detail::opcode::cont:
-        if(! rd_.cont)
-        {
-            // continuation without an active message
-            return err(close_code::protocol_error);
-        }
-        if(fh.rsv1 || fh.rsv2 || fh.rsv3)
-        {
-            // reserved bits not cleared
-            return err(close_code::protocol_error);
-        }
-        break;
-
-    default:
-        if(is_reserved(fh.op))
-        {
-            // reserved opcode
-            return err(close_code::protocol_error);
-        }
-        if(! fh.fin)
-        {
-            // fragmented control message
-            return err(close_code::protocol_error);
-        }
-        if(fh.len > 125)
-        {
-            // invalid length for control message
-            return err(close_code::protocol_error);
-        }
-        if(fh.rsv1 || fh.rsv2 || fh.rsv3)
-        {
-            // reserved bits not cleared
-            return err(close_code::protocol_error);
-        }
-        break;
-    }
-    // unmasked frame from client
-    if(role_ == role_type::server && ! fh.mask)
-    {
-        code = close_code::protocol_error;
-        return 0;
-    }
-    // masked frame from server
-    if(role_ == role_type::client && fh.mask)
-    {
-        code = close_code::protocol_error;
-        return 0;
-    }
-    code = close_code::none;
-    return need;
-}
-
-// Decode variable frame header from buffer
-//
-template<class NextLayer>
-template<class DynamicBuffer>
-void
-stream<NextLayer>::
-read_fh2(detail::frame_header& fh,
-    DynamicBuffer& db, close_code& code)
-{
-    using boost::asio::buffer;
-    using boost::asio::buffer_copy;
-    using boost::asio::buffer_size;
-    using namespace boost::endian;
-    switch(fh.len)
-    {
-    case 126:
-    {
-        std::uint8_t b[2];
-        BOOST_ASSERT(buffer_size(db.data()) >= sizeof(b));
-        db.consume(buffer_copy(buffer(b), db.data()));
-        fh.len = detail::big_uint16_to_native(&b[0]);
-        // length not canonical
-        if(fh.len < 126)
-        {
-            code = close_code::protocol_error;
-            return;
-        }
-        break;
-    }
-    case 127:
-    {
-        std::uint8_t b[8];
-        BOOST_ASSERT(buffer_size(db.data()) >= sizeof(b));
-        db.consume(buffer_copy(buffer(b), db.data()));
-        fh.len = detail::big_uint64_to_native(&b[0]);
-        // length not canonical
-        if(fh.len < 65536)
-        {
-            code = close_code::protocol_error;
-            return;
-        }
-        break;
-    }
-    }
-    if(fh.mask)
-    {
-        std::uint8_t b[4];
-        BOOST_ASSERT(buffer_size(db.data()) >= sizeof(b));
-        db.consume(buffer_copy(buffer(b), db.data()));
-        fh.key = detail::little_uint32_to_native(&b[0]);
-    }
-    else
-    {
-        // initialize this otherwise operator== breaks
-        fh.key = 0;
-    }
-    if(! detail::is_control(fh.op))
-    {
-        if(fh.op != detail::opcode::cont)
-        {
-            rd_.size = 0;
-            rd_.op = fh.op;
-        }
-        else
-        {
-            if(rd_.size > (std::numeric_limits<
-                std::uint64_t>::max)() - fh.len)
-            {
-                code = close_code::too_big;
-                return;
-            }
-        }
-        rd_.cont = ! fh.fin;
-    }
-    code = close_code::none;
-}
-
 template<class NextLayer>
 template<class DynamicBuffer>
 void

include/boost/beast/websocket/stream.hpp

@@ -3768,16 +3768,6 @@ private:
     parse_fh(detail::frame_header& fh,
         DynamicBuffer& b, close_code& code);
 
-    template<class DynamicBuffer>
-    std::size_t
-    read_fh1(detail::frame_header& fh,
-        DynamicBuffer& db, close_code& code);
-
-    template<class DynamicBuffer>
-    void
-    read_fh2(detail::frame_header& fh,
-        DynamicBuffer& db, close_code& code);
-
     template<class DynamicBuffer>
     void
     write_close(DynamicBuffer& db, close_reason const& rc);