opcode is private (API Change):

* The opcode enum is removed.

Actions Required:

* Remove all occurences of the `opcode` enum at call sites

include/beast/websocket/impl/ping.ipp

@@ -38,7 +38,7 @@ class stream<NextLayer>::ping_op
         int state = 0;
 
         data(Handler& handler, stream<NextLayer>& ws_,
-                opcode op_, ping_data const& payload)
+                detail::opcode op_, ping_data const& payload)
             : ws(ws_)
         {
             using boost::asio::asio_handler_is_continuation;
@@ -212,7 +212,8 @@ async_ping(ping_data const& payload, WriteHandler&& handler)
         void(error_code)> init{handler};
     ping_op<handler_type<
         WriteHandler, void(error_code)>>{
-            init.completion_handler, *this, opcode::ping, payload};
+            init.completion_handler, *this,
+                detail::opcode::ping, payload};
     return init.result.get();
 }
 
@@ -229,7 +230,8 @@ async_pong(ping_data const& payload, WriteHandler&& handler)
         void(error_code)> init{handler};
     ping_op<handler_type<
         WriteHandler, void(error_code)>>{
-            init.completion_handler, *this, opcode::pong, payload};
+            init.completion_handler, *this,
+                detail::opcode::pong, payload};
     return init.result.get();
 }
 
@@ -251,7 +253,7 @@ ping(ping_data const& payload, error_code& ec)
 {
     detail::frame_streambuf db;
     write_ping<static_buffer>(
-        db, opcode::ping, payload);
+        db, detail::opcode::ping, payload);
     boost::asio::write(stream_, db.data(), ec);
 }
 
@@ -273,7 +275,7 @@ pong(ping_data const& payload, error_code& ec)
 {
     detail::frame_streambuf db;
     write_ping<static_buffer>(
-        db, opcode::pong, payload);
+        db, detail::opcode::pong, payload);
     boost::asio::write(stream_, db.data(), ec);
 }
 

include/beast/websocket/impl/read.ipp

@@ -237,7 +237,7 @@ operator()(error_code ec,
                     bytes_transferred, *d.dmb);
                 if(d.fh.mask)
                     detail::mask_inplace(pb, d.key);
-                if(d.ws.rd_.op == opcode::text)
+                if(d.ws.rd_.op == detail::opcode::text)
                 {
                     if(! d.ws.rd_.utf8.write(pb) ||
                         (d.remain == 0 && d.fh.fin &&
@@ -309,7 +309,7 @@ operator()(error_code ec,
                     if(d.ws.failed_)
                         break;
                 }
-                if(d.ws.rd_.op == opcode::text)
+                if(d.ws.rd_.op == detail::opcode::text)
                 {
                     consuming_buffers<typename
                         DynamicBuffer::const_buffers_type
@@ -402,8 +402,8 @@ operator()(error_code ec,
                     d.state = do_control;
                     break;
                 }
-                if(d.fh.op == opcode::text ||
-                        d.fh.op == opcode::binary)
+                if(d.fh.op == detail::opcode::text ||
+                        d.fh.op == detail::opcode::binary)
                     d.ws.rd_begin();
                 if(d.fh.len == 0 && ! d.fh.fin)
                 {
@@ -432,7 +432,7 @@ operator()(error_code ec,
             //------------------------------------------------------------------
 
             case do_control:
-                if(d.fh.op == opcode::ping)
+                if(d.fh.op == detail::opcode::ping)
                 {
                     ping_data payload;
                     detail::read(payload, d.fb.data());
@@ -446,7 +446,7 @@ operator()(error_code ec,
                         break;
                     }
                     d.ws.template write_ping<static_buffer>(
-                        d.fb, opcode::pong, payload);
+                        d.fb, detail::opcode::pong, payload);
                     if(d.ws.wr_block_)
                     {
                         // suspend
@@ -458,7 +458,7 @@ operator()(error_code ec,
                     d.state = do_pong;
                     break;
                 }
-                else if(d.fh.op == opcode::pong)
+                else if(d.fh.op == detail::opcode::pong)
                 {
                     code = close_code::none;
                     ping_data payload;
@@ -469,7 +469,7 @@ operator()(error_code ec,
                     d.state = do_read_fh;
                     break;
                 }
-                BOOST_ASSERT(d.fh.op == opcode::close);
+                BOOST_ASSERT(d.fh.op == detail::opcode::close);
                 {
                     detail::read(d.ws.cr_, d.fb.data(), code);
                     if(code != close_code::none)
@@ -786,22 +786,22 @@ read_frame(DynamicBuffer& dynabuf, error_code& ec)
                 fb.commit(static_cast<std::size_t>(fh.len));
             }
             // Process control frame
-            if(fh.op == opcode::ping)
+            if(fh.op == detail::opcode::ping)
             {
                 ping_data payload;
                 detail::read(payload, fb.data());
                 fb.consume(fb.size());
                 if(ping_cb_)
                     ping_cb_(false, payload);
-                write_ping<static_buffer>(
-                    fb, opcode::pong, payload);
+                write_ping<static_buffer>(fb,
+                    detail::opcode::pong, payload);
                 boost::asio::write(stream_, fb.data(), ec);
                 failed_ = ec != 0;
                 if(failed_)
                     return false;
                 continue;
             }
-            else if(fh.op == opcode::pong)
+            else if(fh.op == detail::opcode::pong)
             {
                 ping_data payload;
                 detail::read(payload, fb.data());
@@ -809,7 +809,7 @@ read_frame(DynamicBuffer& dynabuf, error_code& ec)
                     ping_cb_(true, payload);
                 continue;
             }
-            BOOST_ASSERT(fh.op == opcode::close);
+            BOOST_ASSERT(fh.op == detail::opcode::close);
             {
                 detail::read(cr_, fb.data(), code);
                 if(code != close_code::none)
@@ -831,7 +831,7 @@ read_frame(DynamicBuffer& dynabuf, error_code& ec)
                 goto do_close;
             }
         }
-        if(fh.op != opcode::cont)
+        if(fh.op != detail::opcode::cont)
             rd_begin();
         if(fh.len == 0 && ! fh.fin)
         {
@@ -868,7 +868,7 @@ read_frame(DynamicBuffer& dynabuf, error_code& ec)
                     bytes_transferred, b);
                 if(fh.mask)
                     detail::mask_inplace(pb, key);
-                if(rd_.op == opcode::text)
+                if(rd_.op == detail::opcode::text)
                 {
                     if(! rd_.utf8.write(pb) ||
                         (remain == 0 && fh.fin &&
@@ -915,7 +915,7 @@ read_frame(DynamicBuffer& dynabuf, error_code& ec)
                     if(failed_)
                         return false;
                 }
-                if(rd_.op == opcode::text)
+                if(rd_.op == detail::opcode::text)
                 {
                     consuming_buffers<typename
                         DynamicBuffer::const_buffers_type

include/beast/websocket/impl/write.ipp

@@ -179,7 +179,7 @@ operator()(error_code ec,
             d.fh.rsv2 = false;
             d.fh.rsv3 = false;
             d.fh.op = d.ws.wr_.cont ?
-                opcode::cont : d.ws.wr_opcode_;
+                detail::opcode::cont : d.ws.wr_opcode_;
             d.fh.mask =
                 d.ws.role_ == detail::role_type::client;
 
@@ -281,7 +281,7 @@ operator()(error_code ec,
             d.cb.consume(
                 bytes_transferred - d.fh_buf.size());
             d.fh_buf.consume(d.fh_buf.size());
-            d.fh.op = opcode::cont;
+            d.fh.op = detail::opcode::cont;
             if(d.ws.wr_block_ == &d)
                 d.ws.wr_block_ = nullptr;
             // Allow outgoing control frames to
@@ -386,7 +386,7 @@ operator()(error_code ec,
             d.cb.consume(
                 bytes_transferred - d.fh_buf.size());
             d.fh_buf.consume(d.fh_buf.size());
-            d.fh.op = opcode::cont;
+            d.fh.op = detail::opcode::cont;
             BOOST_ASSERT(d.ws.wr_block_ == &d);
             d.ws.wr_block_ = nullptr;
             // Allow outgoing control frames to
@@ -458,7 +458,7 @@ operator()(error_code ec,
         }
 
         case do_deflate + 2:
-            d.fh.op = opcode::cont;
+            d.fh.op = detail::opcode::cont;
             d.fh.rsv1 = false;
             BOOST_ASSERT(d.ws.wr_block_ == &d);
             d.ws.wr_block_ = nullptr;
@@ -612,7 +612,8 @@ write_frame(bool fin,
     }
     fh.rsv2 = false;
     fh.rsv3 = false;
-    fh.op = wr_.cont ? opcode::cont : wr_opcode_;
+    fh.op = wr_.cont ?
+        detail::opcode::cont : wr_opcode_;
     fh.mask = role_ == detail::role_type::client;
     auto remain = buffer_size(buffers);
     if(wr_.compress)
@@ -658,7 +659,7 @@ write_frame(bool fin,
                 return;
             if(! more)
                 break;
-            fh.op = opcode::cont;
+            fh.op = detail::opcode::cont;
             fh.rsv1 = false;
         }
         if(fh.fin && (
@@ -708,7 +709,7 @@ write_frame(bool fin,
                     return;
                 if(remain == 0)
                     break;
-                fh.op = opcode::cont;
+                fh.op = detail::opcode::cont;
                 cb.consume(n);
             }
         }
@@ -782,7 +783,7 @@ write_frame(bool fin,
                 return;
             if(remain == 0)
                 break;
-            fh.op = opcode::cont;
+            fh.op = detail::opcode::cont;
             cb.consume(n);
         }
         return;