Merge pull request #686 from evoskuil/master

Pass maximum request setting from config to socket.

Author: evoskuil

include/bitcoin/network/channels/channel_rpc.hpp

@@ -60,17 +60,17 @@ class BCT_API channel_rpc
     {
     }
 
+    /// Serialize and write response to client (requires strand).
+    /// Completion handler is always invoked on the channel strand.
+    void send(rpc::response_t&& message, size_t size_hint,
+        result_handler&& handler) NOEXCEPT;
+
     /// 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 response to client (requires strand).
-    /// Completion handler is always invoked on the channel strand.
-    virtual void send(rpc::response_t&& message, size_t size_hint,
-        result_handler&& handler) NOEXCEPT;
-
 protected:
     /// Stranded handler invoked from stop().
     void stopping(const code& ec) NOEXCEPT override;

include/bitcoin/network/net.hpp

@@ -214,9 +214,10 @@ class BCT_API net
     friend class session;
 
     /// I/O factories.
-    virtual acceptor::ptr create_acceptor() NOEXCEPT;
-    virtual connector::ptr create_connector(bool seed=false) NOEXCEPT;
+    virtual acceptor::ptr create_acceptor(size_t maximum) NOEXCEPT;
     virtual connectors_ptr create_connectors(size_t count) NOEXCEPT;
+    virtual connector::ptr create_connector(size_t maximum) NOEXCEPT;
+    virtual connector::ptr create_connector() NOEXCEPT;
 
     /// Sequences.
     virtual void do_start(const result_handler& handler) NOEXCEPT;

include/bitcoin/network/net/acceptor.hpp

@@ -47,8 +47,8 @@ class BCT_API acceptor
     // ------------------------------------------------------------------------
 
     /// Construct an instance.
-    acceptor(const logger& log, asio::strand& strand,
-        asio::io_context& service, std::atomic_bool& suspended) NOEXCEPT;
+    acceptor(const logger& log, asio::strand& strand, asio::io_context& service,
+        size_t maximum_request, std::atomic_bool& suspended) NOEXCEPT;
 
     /// Asserts/logs stopped.
     virtual ~acceptor() NOEXCEPT;
@@ -81,6 +81,7 @@ class BCT_API acceptor
     virtual code start(const asio::endpoint& point) NOEXCEPT;
 
     // These are thread safe.
+    const size_t maximum_;
     asio::io_context& service_;
     asio::strand& strand_;
     std::atomic_bool& suspended_;

include/bitcoin/network/net/connector.hpp

@@ -52,7 +52,7 @@ class BCT_API connector
     /// Construct an instance.
     connector(const logger& log, asio::strand& strand,
         asio::io_context& service, const steady_clock::duration& timeout,
-        std::atomic_bool& suspended) NOEXCEPT;
+        size_t maximum_request, std::atomic_bool& suspended) NOEXCEPT;
 
     /// Asserts/logs stopped.
     virtual ~connector() NOEXCEPT;
@@ -88,6 +88,7 @@ class BCT_API connector
         const config::address& host, socket_handler&& handler) NOEXCEPT;
 
     // These are thread safe
+    const size_t maximum_;
     asio::io_context& service_;
     asio::strand& strand_;
     std::atomic_bool& suspended_;

include/bitcoin/network/net/socket.hpp

@@ -44,11 +44,12 @@ class BCT_API socket
     DELETE_COPY_MOVE(socket);
 
     /// Use only for incoming connections (defaults outgoing address).
-    socket(const logger& log, asio::io_context& service) NOEXCEPT;
+    socket(const logger& log, asio::io_context& service,
+        size_t maximum_request) NOEXCEPT;
 
     /// Use only for outgoing connections (retains outgoing address).
     socket(const logger& log, asio::io_context& service,
-        const config::address& address) NOEXCEPT;
+        size_t maximum_request, const config::address& address) NOEXCEPT;
 
     /// Asserts/logs stopped.
     virtual ~socket() NOEXCEPT;
@@ -284,12 +285,12 @@ class BCT_API socket
 
 protected:
     // These are thread safe.
+    const size_t maximum_;
     asio::strand strand_;
     asio::io_context& service_;
     std::atomic_bool stopped_{};
 
     // These are protected by strand (see also handle_accept).
-    size_t maximum_;
     asio::socket socket_;
     config::address address_;
     config::authority authority_{};

include/bitcoin/network/sessions/session.hpp

@@ -187,10 +187,13 @@ class BCT_API session
     /// -----------------------------------------------------------------------
 
     /// Call to create channel acceptor.
-    virtual acceptor::ptr create_acceptor() NOEXCEPT;
+    virtual acceptor::ptr create_acceptor(size_t maximum) NOEXCEPT;
 
-    /// Call to create channel connector (option for seed connection timeout).
-    virtual connector::ptr create_connector(bool seed=false) NOEXCEPT;
+    /// Call to create channel connector for seed connections.
+    virtual connector::ptr create_connector() NOEXCEPT;
+
+    /// Call to create channel connector for manual/outbound connections.
+    virtual connector::ptr create_connector(size_t maximum) NOEXCEPT;
 
     /// Call to create a set of channel connectors.
     virtual connectors_ptr create_connectors(size_t count) NOEXCEPT;

include/bitcoin/network/settings.hpp

@@ -238,7 +238,6 @@ struct BCT_API settings
 
     /// Helpers.
     virtual bool witness_node() const NOEXCEPT;
-    virtual size_t maximum_payload() const NOEXCEPT;
     virtual steady_clock::duration retry_timeout() const NOEXCEPT;
     virtual steady_clock::duration connect_timeout() const NOEXCEPT;
     virtual steady_clock::duration channel_handshake() const NOEXCEPT;

src/channels/channel_peer.cpp

@@ -219,7 +219,7 @@ void channel_peer::handle_read_heading(const code& ec, size_t) NOEXCEPT
         return;
     }
 
-    if (head->payload_size > settings().maximum_payload())
+    if (head->payload_size > options().maximum_request)
     {
         LOGR("Oversized payload indicated by " << head->command
             << " heading from [" << authority() << "] ("

src/net.cpp

@@ -68,32 +68,41 @@ net::~net() NOEXCEPT
 // I/O factories.
 // ----------------------------------------------------------------------------
 
-acceptor::ptr net::create_acceptor() NOEXCEPT
+// inbound/server
+acceptor::ptr net::create_acceptor(size_t maximum) NOEXCEPT
 {
-    return emplace_shared<acceptor>(log, strand(), service(),
+    return emplace_shared<acceptor>(log, strand(), service(), maximum,
         accept_suspended_);
 }
 
-connector::ptr net::create_connector(bool seed) NOEXCEPT
-{
-    const auto timeout = seed ? settings_.outbound.seeding_timeout() :
-        settings_.connect_timeout();
-
-    return emplace_shared<connector>(log, strand(), service(), timeout,
-        connect_suspended_);
-}
-
+// outbound (batch)
 connectors_ptr net::create_connectors(size_t count) NOEXCEPT
 {
     const auto connects = to_shared<connectors>();
     connects->reserve(count);
 
+    const auto maximum = settings_.outbound.maximum_request;
     for (size_t connect{}; connect < count; ++connect)
-        connects->push_back(create_connector());
+        connects->push_back(create_connector(maximum));
 
     return connects;
 }
 
+// manual/outbound
+connector::ptr net::create_connector(size_t maximum) NOEXCEPT
+{
+    return emplace_shared<connector>(log, strand(), service(),
+        settings_.connect_timeout(), maximum, connect_suspended_);
+}
+
+// seed
+connector::ptr net::create_connector() NOEXCEPT
+{
+    return emplace_shared<connector>(log, strand(), service(),
+        settings_.outbound.seeding_timeout(),
+        settings_.outbound.maximum_request, connect_suspended_);
+}
+
 // Start sequence.
 // ----------------------------------------------------------------------------
 

src/net/acceptor.cpp

@@ -43,8 +43,10 @@ using namespace std::placeholders;
 // Calls are stranded to protect the acceptor member.
 
 acceptor::acceptor(const logger& log, asio::strand& strand,
-    asio::io_context& service, std::atomic_bool& suspended) NOEXCEPT
-  : service_(service),
+    asio::io_context& service, size_t maximum_request,
+    std::atomic_bool& suspended) NOEXCEPT
+  : maximum_(maximum_request),
+    service_(service),
     strand_(strand),
     suspended_(suspended),
     acceptor_(strand_),
@@ -144,7 +146,8 @@ void acceptor::accept(socket_handler&& handler) NOEXCEPT
     }
 
     // Create the socket.
-    const auto socket = std::make_shared<network::socket>(log, service_);
+    const auto socket = std::make_shared<network::socket>(log, service_,
+        maximum_);
 
     // Posts handle_accept to the acceptor's strand.
     // Establishes a socket connection by waiting on the socket.