Merge pull request #682 from evoskuil/master

Stub in channel_rpc methods.

Author: evoskuil

include/bitcoin/network/channels/channel_http.hpp

@@ -33,7 +33,7 @@
 namespace libbitcoin {
 namespace network {
 
-/// Half-duplex reading of http-request and sending of http-response.
+/// Half-duplex reading/writing of http-request/response.
 class BCT_API channel_http
   : public channel
 {
@@ -43,7 +43,7 @@ class BCT_API channel_http
     using interface = rpc::interface::http;
     using dispatcher = rpc::dispatcher<interface>;
 
-    /// Subscribe to request from peer (requires strand).
+    /// Subscribe to request from client (requires strand).
     /// Event handler is always invoked on the channel strand.
     template <class Request>
     inline void subscribe(auto&& handler) NOEXCEPT
@@ -71,7 +71,7 @@ class BCT_API channel_http
     /// Must call after successful message handling if no stop.
     virtual void receive() NOEXCEPT;
 
-    /// Serialize and write http response to peer (requires strand).
+    /// Serialize and write http response to client (requires strand).
     /// Completion handler is always invoked on the channel strand.
     virtual void send(http::response&& response,
         result_handler&& handler) NOEXCEPT;
@@ -89,7 +89,7 @@ class BCT_API channel_http
     /// Size and assign response_buffer_ if value type is json or json-rpc.
     virtual void assign_json_buffer(http::response& response) NOEXCEPT;
 
-    // Handlers.
+    /// Handlers.
     virtual void handle_receive(const code& ec, size_t bytes,
         const http::request_cptr& request) NOEXCEPT;
     virtual void handle_send(const code& ec, size_t bytes, http::response_ptr&,

include/bitcoin/network/channels/channel_rpc.hpp

@@ -28,7 +28,7 @@
 namespace libbitcoin {
 namespace network {
 
-/// rpc over tcp channel.
+/// Read rpc-request and send rpc-response.
 class BCT_API channel_rpc
   : public channel
 {
@@ -41,6 +41,16 @@ class BCT_API channel_rpc
       : channel(log, socket, identifier, settings, options)
     {
     }
+
+    /// Resume reading from the socket (requires strand).
+    void resume() NOEXCEPT override;
+
+    /// Must call after successful message handling if no stop.
+    virtual void receive() NOEXCEPT;
+
+    /// Serialize and write rpc response to client (requires strand).
+    /// Completion handler is always invoked on the channel strand.
+    virtual void send() NOEXCEPT;
 };
 
 } // namespace network

include/bitcoin/network/protocols/protocol_http.hpp

@@ -47,12 +47,12 @@ class BCT_API protocol_http
     using channel_t = channel_http;
     using options_t = channel_t::options_t;
 
+    void start() NOEXCEPT override;
+
 protected:
     protocol_http(const session::ptr& session, const channel::ptr& channel,
         const options_t& options) NOEXCEPT;
 
-    void start() NOEXCEPT override;
-
     DECLARE_SEND();
     DECLARE_SUBSCRIBE_CHANNEL();
 

src/channels/channel_rpc.cpp

@@ -23,5 +23,22 @@
 namespace libbitcoin {
 namespace network {
 
+void channel_rpc::resume() NOEXCEPT
+{
+    BC_ASSERT(stranded());
+    channel::resume();
+    receive();
+}
+
+void channel_rpc::receive() NOEXCEPT
+{
+    BC_ASSERT(stranded());
+}
+
+void channel_rpc::send() NOEXCEPT
+{
+    BC_ASSERT(stranded());
+}
+
 } // namespace network
 } // namespace libbitcoin

src/protocols/protocol_http.cpp

@@ -58,6 +58,7 @@ protocol_http::protocol_http(const session::ptr& session,
 // Start.
 // ----------------------------------------------------------------------------
 
+// public
 void protocol_http::start() NOEXCEPT
 {
     BC_ASSERT(stranded());