diff options
| author | dergoegge <n.goeggi@gmail.com> | 2023-04-20 13:50:47 +0200 |
|---|---|---|
| committer | dergoegge <n.goeggi@gmail.com> | 2023-07-24 18:35:30 +0200 |
| commit | 23c7b51ddd2888cf7fb260c439f004bd28768473 (patch) | |
| tree | dab464da8c9a72dee63cab34646835985cfd2e53 | |
| parent | bd59bda26b67b53293a5cef7433e992203da325a (diff) | |
[net processing] Move -capturemessages to PeerManager::Options
| -rw-r--r-- | src/net_processing.cpp | 3 | ||||
| -rw-r--r-- | src/net_processing.h | 1 | ||||
| -rw-r--r-- | src/node/peerman_args.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 399c751bd9..be6777d14b 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -10,7 +10,6 @@ #include <blockencodings.h> #include <blockfilter.h> #include <chainparams.h> -#include <common/args.h> #include <consensus/amount.h> #include <consensus/validation.h> #include <deploymentstatus.h> @@ -5005,7 +5004,7 @@ bool PeerManagerImpl::ProcessMessages(CNode* pfrom, std::atomic<bool>& interrupt msg.m_recv.data() ); - if (gArgs.GetBoolArg("-capturemessages", false)) { + if (m_opts.capture_messages) { CaptureMessage(pfrom->addr, msg.m_type, MakeUCharSpan(msg.m_recv), /*is_incoming=*/true); } diff --git a/src/net_processing.h b/src/net_processing.h index 6ee4f22960..a0cbe92289 100644 --- a/src/net_processing.h +++ b/src/net_processing.h @@ -51,6 +51,7 @@ public: bool reconcile_txs{DEFAULT_TXRECONCILIATION_ENABLE}; uint32_t max_orphan_txs{DEFAULT_MAX_ORPHAN_TRANSACTIONS}; size_t max_extra_txs{DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN}; + bool capture_messages{false}; }; static std::unique_ptr<PeerManager> make(CConnman& connman, AddrMan& addrman, diff --git a/src/node/peerman_args.cpp b/src/node/peerman_args.cpp index 4a000de83f..e5868ead12 100644 --- a/src/node/peerman_args.cpp +++ b/src/node/peerman_args.cpp @@ -16,6 +16,8 @@ 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)); } + + if (auto value{argsman.GetBoolArg("-capturemessages")}) options.capture_messages = *value; } } // namespace node |