diff options
author | fanquake <fanquake@gmail.com> | 2023-07-20 10:03:30 +0100 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2023-07-20 10:17:08 +0100 |
commit | 355bbcba01e1747f2099467b59cd0b438bddee38 (patch) | |
tree | 2e5fd4eea4a4eba5ad3ed67d976da1ebaa015fe6 /src | |
parent | 04afe55e29002a1d46d1cd9ed117229874840ae6 (diff) | |
parent | fa6245da6061050eb77ad07cd4caf8c596d89dc6 (diff) |
Merge bitcoin/bitcoin#28066: fuzz: Generate process_message targets individually
fa6245da6061050eb77ad07cd4caf8c596d89dc6 fuzz: Generate process_message targets individually (MarcoFalke)
fa1471e5754484f997ddf9db70888679dcd1d64a refactor: Remove duplicate allNetMessageTypesVec (MarcoFalke)
Pull request description:
Now that `LIMIT_TO_MESSAGE_TYPE` is a runtime setting after commit 927b001502a74a7224f04cfe6ffddc9a59409ba1, it shouldn't hurt to also generate each message type individually. Something similar was done for the `rpc` target in commit cf4da5ec29f9e8cd6cc6577e5ecbd87174edba62.
ACKs for top commit:
stickies-v:
re-crACK fa6245da6061050eb77ad07cd4caf8c596d89dc6
brunoerg:
reACK fa6245da6061050eb77ad07cd4caf8c596d89dc6
Tree-SHA512: 8f3ec71bab89781f10820a0e027fcde8949f3333eb19a30315aaad6f90f5167028113cea255b2d60b700da817c7eaac20b7b4c92f931052d7f5c2f148d33aa5a
Diffstat (limited to 'src')
-rw-r--r-- | src/protocol.cpp | 75 |
1 files changed, 37 insertions, 38 deletions
diff --git a/src/protocol.cpp b/src/protocol.cpp index 5ecaabec36..2105480c72 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -12,47 +12,47 @@ static std::atomic<bool> g_initial_block_download_completed(false); namespace NetMsgType { -const char *VERSION="version"; -const char *VERACK="verack"; -const char *ADDR="addr"; -const char *ADDRV2="addrv2"; -const char *SENDADDRV2="sendaddrv2"; -const char *INV="inv"; -const char *GETDATA="getdata"; -const char *MERKLEBLOCK="merkleblock"; -const char *GETBLOCKS="getblocks"; -const char *GETHEADERS="getheaders"; -const char *TX="tx"; -const char *HEADERS="headers"; -const char *BLOCK="block"; -const char *GETADDR="getaddr"; -const char *MEMPOOL="mempool"; -const char *PING="ping"; -const char *PONG="pong"; -const char *NOTFOUND="notfound"; -const char *FILTERLOAD="filterload"; -const char *FILTERADD="filteradd"; -const char *FILTERCLEAR="filterclear"; -const char *SENDHEADERS="sendheaders"; -const char *FEEFILTER="feefilter"; -const char *SENDCMPCT="sendcmpct"; -const char *CMPCTBLOCK="cmpctblock"; -const char *GETBLOCKTXN="getblocktxn"; -const char *BLOCKTXN="blocktxn"; -const char *GETCFILTERS="getcfilters"; -const char *CFILTER="cfilter"; -const char *GETCFHEADERS="getcfheaders"; -const char *CFHEADERS="cfheaders"; -const char *GETCFCHECKPT="getcfcheckpt"; -const char *CFCHECKPT="cfcheckpt"; -const char *WTXIDRELAY="wtxidrelay"; -const char *SENDTXRCNCL="sendtxrcncl"; +const char* VERSION = "version"; +const char* VERACK = "verack"; +const char* ADDR = "addr"; +const char* ADDRV2 = "addrv2"; +const char* SENDADDRV2 = "sendaddrv2"; +const char* INV = "inv"; +const char* GETDATA = "getdata"; +const char* MERKLEBLOCK = "merkleblock"; +const char* GETBLOCKS = "getblocks"; +const char* GETHEADERS = "getheaders"; +const char* TX = "tx"; +const char* HEADERS = "headers"; +const char* BLOCK = "block"; +const char* GETADDR = "getaddr"; +const char* MEMPOOL = "mempool"; +const char* PING = "ping"; +const char* PONG = "pong"; +const char* NOTFOUND = "notfound"; +const char* FILTERLOAD = "filterload"; +const char* FILTERADD = "filteradd"; +const char* FILTERCLEAR = "filterclear"; +const char* SENDHEADERS = "sendheaders"; +const char* FEEFILTER = "feefilter"; +const char* SENDCMPCT = "sendcmpct"; +const char* CMPCTBLOCK = "cmpctblock"; +const char* GETBLOCKTXN = "getblocktxn"; +const char* BLOCKTXN = "blocktxn"; +const char* GETCFILTERS = "getcfilters"; +const char* CFILTER = "cfilter"; +const char* GETCFHEADERS = "getcfheaders"; +const char* CFHEADERS = "cfheaders"; +const char* GETCFCHECKPT = "getcfcheckpt"; +const char* CFCHECKPT = "cfcheckpt"; +const char* WTXIDRELAY = "wtxidrelay"; +const char* SENDTXRCNCL = "sendtxrcncl"; } // namespace NetMsgType /** All known message types. Keep this in the same order as the list of * messages above and in protocol.h. */ -const static std::string allNetMessageTypes[] = { +const static std::vector<std::string> g_all_net_message_types{ NetMsgType::VERSION, NetMsgType::VERACK, NetMsgType::ADDR, @@ -89,7 +89,6 @@ const static std::string allNetMessageTypes[] = { NetMsgType::WTXIDRELAY, NetMsgType::SENDTXRCNCL, }; -const static std::vector<std::string> allNetMessageTypesVec(std::begin(allNetMessageTypes), std::end(allNetMessageTypes)); CMessageHeader::CMessageHeader(const MessageStartChars& pchMessageStartIn, const char* pszCommand, unsigned int nMessageSizeIn) { @@ -182,7 +181,7 @@ std::string CInv::ToString() const const std::vector<std::string> &getAllNetMessageTypes() { - return allNetMessageTypesVec; + return g_all_net_message_types; } /** |