Declare send and subscribe on protocol_rpc<>.

Author: evoskuil

include/bitcoin/network/channels/channel_rpc.hpp

@@ -40,7 +40,7 @@ class channel_rpc
 
     /// Subscribe to request from client (requires strand).
     /// Event handler is always invoked on the channel strand.
-    template <class Handler>
+    template <class Void, class Handler>
     inline void subscribe(Handler&& handler) NOEXCEPT
     {
         BC_ASSERT(stranded());

include/bitcoin/network/protocols/protocol.hpp

@@ -217,7 +217,7 @@ class BCT_API protocol
 #define DECLARE_SUBSCRIBE_CHANNEL() \
     template <class Derived, class Message, typename Method, typename... Args> \
     void subscribe_channel(Method&& method, Args&&... args) NOEXCEPT \
-    { channel_->subscribe<Message>(BIND_SHARED(method, args)); }
+    { channel_->template subscribe<Message>(BIND_SHARED(method, args)); }
 
 #define SEND(message, method, ...) \
     send<CLASS>(message, &CLASS::method, __VA_ARGS__)

include/bitcoin/network/protocols/protocol_rpc.hpp

@@ -39,9 +39,18 @@ class protocol_rpc
 protected:
     inline protocol_rpc(const session::ptr& session,
         const channel::ptr& channel, const options_t&) NOEXCEPT
-      : protocol(session, channel)
+      : protocol(session, channel),
+        channel_(std::dynamic_pointer_cast<channel_t>(channel))
     {
     }
+
+    DECLARE_SEND()
+    DECLARE_SUBSCRIBE_CHANNEL()
+
+private:
+    // This is mostly thread safe, and used in a thread safe manner.
+    // pause/resume/paused/attach not invoked, setters limited to handshake.
+    const channel_t::ptr channel_;
 };
 
 } // namespace network