From fb993f76047993b8de1b1bebef9ee1af759d59bc Mon Sep 17 00:00:00 2001 From: Vasil Dimov Date: Thu, 19 Feb 2026 12:03:18 +0100 Subject: [PATCH] tor, fuzz: reuse constants instead of duplicating `src/torcontrol.cpp` used to define some constants that are used explicitly in `src/torcontrol.cpp` and implicitly in `src/test/fuzz/torcontrol.cpp` by duplicating their values. Move the constants to `src/torcontrol.h` and reuse them in `src/test/fuzz/torcontrol.cpp` to avoid duplication and magic numbers. --- src/test/fuzz/torcontrol.cpp | 4 ++-- src/torcontrol.cpp | 3 --- src/torcontrol.h | 4 ++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/test/fuzz/torcontrol.cpp b/src/test/fuzz/torcontrol.cpp index 62c2ad57658..114bc524c20 100644 --- a/src/test/fuzz/torcontrol.cpp +++ b/src/test/fuzz/torcontrol.cpp @@ -49,10 +49,10 @@ FUZZ_TARGET(torcontrol, .init = initialize_torcontrol) CallOneOf( fuzzed_data_provider, [&] { - tor_control_reply.code = 250; + tor_control_reply.code = TOR_REPLY_OK; }, [&] { - tor_control_reply.code = 510; + tor_control_reply.code = TOR_REPLY_UNRECOGNIZED; }, [&] { tor_control_reply.code = fuzzed_data_provider.ConsumeIntegral(); diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index d37fc2dd4a3..04092639e8f 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -53,9 +53,6 @@ const std::string DEFAULT_TOR_CONTROL = "127.0.0.1:" + ToString(DEFAULT_TOR_CONT static const int TOR_COOKIE_SIZE = 32; /** Size of client/server nonce for SAFECOOKIE */ static const int TOR_NONCE_SIZE = 32; -/** Tor control reply code. Ref: https://spec.torproject.org/control-spec/replies.html */ -static const int TOR_REPLY_OK = 250; -static const int TOR_REPLY_UNRECOGNIZED = 510; /** For computing serverHash in SAFECOOKIE */ static const std::string TOR_SAFE_SERVERKEY = "Tor safe cookie authentication server-to-controller hash"; /** For computing clientHash in SAFECOOKIE */ diff --git a/src/torcontrol.h b/src/torcontrol.h index e64f9d38df0..f331e76a20f 100644 --- a/src/torcontrol.h +++ b/src/torcontrol.h @@ -24,6 +24,10 @@ constexpr int DEFAULT_TOR_CONTROL_PORT = 9051; extern const std::string DEFAULT_TOR_CONTROL; static const bool DEFAULT_LISTEN_ONION = true; +/** Tor control reply code. Ref: https://spec.torproject.org/control-spec/replies.html */ +constexpr int TOR_REPLY_OK{250}; +constexpr int TOR_REPLY_UNRECOGNIZED{510}; + void StartTorControl(CService onion_service_target); void InterruptTorControl(); void StopTorControl();