diff options
| author | stickies-v <stickies-v@protonmail.com> | 2023-07-25 15:49:36 +0100 |
|---|---|---|
| committer | stickies-v <stickies-v@protonmail.com> | 2023-07-25 21:51:20 +0100 |
| commit | 547fa52443cbb5e8ccfee993486f5ced8cdbb33b (patch) | |
| tree | 5ab78271c9374017441260ca750b88d19c8b506e | |
| parent | e451d1e3c66350017da195335f428a96fdc7d840 (diff) | |
net processing: clamp -blockreconstructionextratxn to uint32_t bounds
Also changes max_extra_txs into a uint32_t to avoid platform-specific
behaviour
| -rw-r--r-- | src/net_processing.h | 4 | ||||
| -rw-r--r-- | src/node/peerman_args.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/net_processing.h b/src/net_processing.h index 619bf6220d..837e308617 100644 --- a/src/net_processing.h +++ b/src/net_processing.h @@ -20,7 +20,7 @@ static constexpr bool DEFAULT_TXRECONCILIATION_ENABLE{false}; static const uint32_t DEFAULT_MAX_ORPHAN_TRANSACTIONS{100}; /** Default number of non-mempool transactions to keep around for block reconstruction. Includes orphan, replaced, and rejected transactions. */ -static const unsigned int DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN = 100; +static const uint32_t DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN{100}; static const bool DEFAULT_PEERBLOOMFILTERS = false; static const bool DEFAULT_PEERBLOCKFILTERS = false; /** Threshold for marking a node to be discouraged, e.g. disconnected and added to the discouragement filter. */ @@ -55,7 +55,7 @@ public: uint32_t max_orphan_txs{DEFAULT_MAX_ORPHAN_TRANSACTIONS}; //! Number of non-mempool transactions to keep around for block reconstruction. Includes //! orphan, replaced, and rejected transactions. - size_t max_extra_txs{DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN}; + uint32_t max_extra_txs{DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN}; //! Whether all P2P messages are captured to disk bool capture_messages{false}; }; diff --git a/src/node/peerman_args.cpp b/src/node/peerman_args.cpp index 1a70ce96f1..efe4514271 100644 --- a/src/node/peerman_args.cpp +++ b/src/node/peerman_args.cpp @@ -17,7 +17,7 @@ void ApplyArgsManOptions(const ArgsManager& argsman, PeerManager::Options& optio } if (auto value{argsman.GetIntArg("-blockreconstructionextratxn")}) { - options.max_extra_txs = size_t(std::max(int64_t{0}, *value)); + options.max_extra_txs = uint32_t((std::clamp<int64_t>(*value, 0, std::numeric_limits<uint32_t>::max()))); } if (auto value{argsman.GetBoolArg("-capturemessages")}) options.capture_messages = *value; |