Merge pull request #943 from evoskuil/master

Add minimum_buffer/maximum_request settings for all services.

Author: evoskuil

include/bitcoin/node/channels/channel_ws.hpp

@@ -55,9 +55,8 @@ class BCN_API channel_ws
 
         // TODO: Serialize message.
         const auto ptr = system::move_shared(std::move(message));
-        network::count_handler complete = std::bind(&channel_ws::handle_send,
-            shared_from_base<channel_ws>(), _1, _2, ptr,
-            std::move(handler));
+        network::count_handler complete = std::bind(&channel_ws::handle_send_ws,
+            shared_from_base<channel_ws>(), _1, _2, ptr, std::move(handler));
 
         if (!ptr)
         {
@@ -96,7 +95,7 @@ class BCN_API channel_ws
         });
     }
 
-    inline void handle_send(const code& ec, size_t, const system::chunk_ptr&,
+    inline void handle_send_ws(const code& ec, size_t, const system::chunk_ptr&,
         const network::result_handler& handler) NOEXCEPT
     {
         if (ec) stop(ec);

src/parser.cpp

@@ -609,11 +609,6 @@ options_metadata parser::load_settings() THROWS
         value<uint32_t>(&configured.network.maximum_skew_minutes),
         "The maximum allowable channel clock skew, defaults to '120'."
     )
-    (
-        "network.minimum_buffer",
-        value<uint32_t>(&configured.network.minimum_buffer),
-        "The minimum retained read buffer size, defaults to '4000000'."
-    )
     (
         "network.rate_limit",
         value<uint32_t>(&configured.network.rate_limit),
@@ -666,6 +661,16 @@ options_metadata parser::load_settings() THROWS
         value<uint32_t>(&configured.network.outbound.expiration_minutes),
         "The age limit for any connection, defaults to '60'."
     )
+    (
+        "outbound.minimum_buffer",
+        value<uint32_t>(&configured.network.outbound.minimum_buffer),
+        "The minimum retained read buffer size, defaults to '4000000'."
+    )
+    (
+        "outbound.maximum_request",
+        value<uint32_t>(&configured.network.outbound.maximum_request),
+        "The maximum allowed request size, defaults to '4000000'."
+    )
     (
         "outbound.use_ipv6",
         value<bool>(&configured.network.outbound.use_ipv6),
@@ -718,6 +723,16 @@ options_metadata parser::load_settings() THROWS
         value<uint32_t>(&configured.network.inbound.expiration_minutes),
         "The age limit for any connection, defaults to '60'."
     )
+    (
+        "inbound.minimum_buffer",
+        value<uint32_t>(&configured.network.inbound.minimum_buffer),
+        "The minimum retained read buffer size, defaults to '4000000'."
+    )
+    (
+        "inbound.maximum_request",
+        value<uint32_t>(&configured.network.inbound.maximum_request),
+        "The maximum allowed request size, defaults to '4000000'."
+    )
     (
         "inbound.enable_loopback",
         value<bool>(&configured.network.inbound.enable_loopback),
@@ -755,6 +770,16 @@ options_metadata parser::load_settings() THROWS
         value<uint32_t>(&configured.network.manual.expiration_minutes),
         "The age limit for any connection, defaults to '60' (will attempt reconnect)."
     )
+    (
+        "manual.minimum_buffer",
+        value<uint32_t>(&configured.network.manual.minimum_buffer),
+        "The minimum retained read buffer size, defaults to '4000000'."
+    )
+    (
+        "manual.maximum_request",
+        value<uint32_t>(&configured.network.manual.maximum_request),
+        "The maximum allowed request size, defaults to '4000000'."
+    )
     (
         "manual.peer",
         value<network::config::endpoints>(&configured.network.manual.peers),
@@ -787,6 +812,16 @@ options_metadata parser::load_settings() THROWS
         value<uint32_t>(&configured.server.web.expiration_minutes),
         "The idle timeout (http keep-alive), defaults to '60'."
     )
+    (
+        "web.minimum_buffer",
+        value<uint32_t>(&configured.server.web.minimum_buffer),
+        "The minimum retained read buffer size, defaults to '4000000'."
+    )
+    (
+        "web.maximum_request",
+        value<uint32_t>(&configured.server.web.maximum_request),
+        "The maximum allowed request size, defaults to '4000000'."
+    )
     (
         "web.server",
         value<std::string>(&configured.server.web.server),
@@ -844,6 +879,16 @@ options_metadata parser::load_settings() THROWS
         value<uint32_t>(&configured.server.explore.expiration_minutes),
         "The idle timeout (http keep-alive), defaults to '60'."
     )
+    (
+        "explore.minimum_buffer",
+        value<uint32_t>(&configured.server.explore.minimum_buffer),
+        "The minimum retained read buffer size, defaults to '4000000'."
+    )
+    (
+        "explore.maximum_request",
+        value<uint32_t>(&configured.server.explore.maximum_request),
+        "The maximum allowed request size, defaults to '4000000'."
+    )
     (
         "explore.server",
         value<std::string>(&configured.server.explore.server),
@@ -906,6 +951,16 @@ options_metadata parser::load_settings() THROWS
         value<uint32_t>(&configured.server.bitcoind.expiration_minutes),
         "The idle timeout (http keep-alive), defaults to '60'."
     )
+    (
+        "bitcoind.minimum_buffer",
+        value<uint32_t>(&configured.server.bitcoind.minimum_buffer),
+        "The minimum retained read buffer size, defaults to '4000000'."
+    )
+    (
+        "bitcoind.maximum_request",
+        value<uint32_t>(&configured.server.bitcoind.maximum_request),
+        "The maximum allowed request size, defaults to '4000000'."
+    )
     (
         "bitcoind.server",
         value<std::string>(&configured.server.bitcoind.server),
@@ -953,6 +1008,16 @@ options_metadata parser::load_settings() THROWS
         value<uint32_t>(&configured.server.electrum.expiration_minutes),
         "The idle timeout (http keep-alive), defaults to '60'."
     )
+    (
+        "electrum.minimum_buffer",
+        value<uint32_t>(&configured.server.electrum.minimum_buffer),
+        "The minimum retained read buffer size, defaults to '4000000'."
+    )
+    (
+        "electrum.maximum_request",
+        value<uint32_t>(&configured.server.electrum.maximum_request),
+        "The maximum allowed request size, defaults to '4000000'."
+    )
 
     /* [stratum_v1] */
     ////(
@@ -980,6 +1045,16 @@ options_metadata parser::load_settings() THROWS
         value<uint32_t>(&configured.server.stratum_v1.expiration_minutes),
         "The idle timeout (http keep-alive), defaults to '60'."
     )
+    (
+        "stratum_v1.minimum_buffer",
+        value<uint32_t>(&configured.server.stratum_v1.minimum_buffer),
+        "The minimum retained read buffer size, defaults to '4000000'."
+    )
+    (
+        "stratum_v1.maximum_request",
+        value<uint32_t>(&configured.server.stratum_v1.maximum_request),
+        "The maximum allowed request size, defaults to '4000000'."
+    )
 
     /* [stratum_v2] */
     ////(
@@ -1007,6 +1082,16 @@ options_metadata parser::load_settings() THROWS
         value<uint32_t>(&configured.server.stratum_v2.expiration_minutes),
         "The idle timeout (http keep-alive), defaults to '60'."
     )
+    (
+        "stratum_v2.minimum_buffer",
+        value<uint32_t>(&configured.server.stratum_v2.minimum_buffer),
+        "The minimum retained read buffer size, defaults to '4000000'."
+    )
+    (
+        "stratum_v2.maximum_request",
+        value<uint32_t>(&configured.server.stratum_v2.maximum_request),
+        "The maximum allowed request size, defaults to '4000000'."
+    )
 
     /* [node] */
     (