Merge pull request #886 from evoskuil/master

evoskuil · web-flow · commit 72a457ec7f15 · 2025-11-07T21:11:33.000-05:00
Change handshake_timeout_seconds default to 15s.
diff --git a/include/bitcoin/node/configuration.hpp b/include/bitcoin/node/configuration.hpp
@@ -29,8 +29,6 @@ namespace node {
 class BCN_API configuration
 {
 public:
-    DEFAULT_COPY_MOVE_DESTRUCT(configuration);
-
     configuration(system::chain::selection context,
         const server::settings::embedded_pages& explore,
         const server::settings::embedded_pages& web) NOEXCEPT;
diff --git a/src/parser.cpp b/src/parser.cpp
@@ -631,12 +631,12 @@ options_metadata parser::load_settings() THROWS
     (
         "network.handshake_timeout_seconds",
         value<uint32_t>(&configured.network.handshake_timeout_seconds),
-        "The time limit to complete the connection handshake, defaults to '30'."
+        "The time limit to complete the connection handshake, defaults to '15'."
     )
     (
         "network.seeding_timeout_seconds",
         value<uint32_t>(&configured.network.seeding_timeout_seconds),
-        "The time limit for obtaining seed addresses, defaults to '30'."
+        "The time limit for obtaining seed connections and addresses, defaults to '30'."
     )
     (
         "network.channel_heartbeat_minutes",

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@ namespace node {`
`29`	`29`	`class BCN_API configuration`
`30`	`30`	`{`
`31`	`31`	`public:`
`32`		`- DEFAULT_COPY_MOVE_DESTRUCT(configuration);`
`33`		`-`
`34`	`32`	`configuration(system::chain::selection context,`
`35`	`33`	`const server::settings::embedded_pages& explore,`
`36`	`34`	`const server::settings::embedded_pages& web) NOEXCEPT;`
Original file line number	Diff line number	Diff line change
`@@ -631,12 +631,12 @@ options_metadata parser::load_settings() THROWS`
`631`	`631`	`(`
`632`	`632`	`"network.handshake_timeout_seconds",`
`633`	`633`	`value<uint32_t>(&configured.network.handshake_timeout_seconds),`
`634`		`- "The time limit to complete the connection handshake, defaults to '30'."`
	`634`	`+ "The time limit to complete the connection handshake, defaults to '15'."`
`635`	`635`	`)`
`636`	`636`	`(`
`637`	`637`	`"network.seeding_timeout_seconds",`
`638`	`638`	`value<uint32_t>(&configured.network.seeding_timeout_seconds),`
`639`		`- "The time limit for obtaining seed addresses, defaults to '30'."`
	`639`	`+ "The time limit for obtaining seed connections and addresses, defaults to '30'."`
`640`	`640`	`)`
`641`	`641`	`(`
`642`	`642`	`"network.channel_heartbeat_minutes",`