mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 10:38:42 +01:00
Code Issues Projects Releases Wiki Activity

Merge #18937: refactor: s/command/msg_type/ in CNetMsgMaker and CSerializedNetMsg

Browse Source 
51e9393c1f refactor: s/command/msg_type/ in CNetMsgMaker and CSerializedNetMsg (Sebastian Falbesoner)

Pull request description:

  Follow-up PR for #18533 -- another small step towards getting rid of the confusing "command" terminology. Also see PR #18610 which tackled the functional tests.

ACKs for top commit:
  MarcoFalke:
    ACK 51e9393c1f

Tree-SHA512: bb6f05a7be6823d5c4eab1d05b31fee944e700946827ad9425d59a3957fd879776c88c606319cbe9832d9451b275baedf913b71429ea3e01e4e82bf2d419e819
This commit is contained in:
MarcoFalke 2020-06-19 06:54:20 -04:00
commit 62948caf44
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/net.cpp
View File

@ -737,7 +737,7 @@ void V1TransportSerializer::prepareForTransport(CSerializedNetMsg& msg, std::vec
uint256 hash = Hash(msg.data.begin(), msg.data.end()); uint256 hash = Hash(msg.data.begin(), msg.data.end());
// create header // create header
CMessageHeader hdr(Params().MessageStart(), msg.command.c_str(), msg.data.size()); CMessageHeader hdr(Params().MessageStart(), msg.m_type.c_str(), msg.data.size());
memcpy(hdr.pchChecksum, hash.begin(), CMessageHeader::CHECKSUM_SIZE); memcpy(hdr.pchChecksum, hash.begin(), CMessageHeader::CHECKSUM_SIZE);
// serialize header // serialize header
@ -2794,7 +2794,7 @@ bool CConnman::NodeFullyConnected(const CNode* pnode)
void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg) void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
{ {
size_t nMessageSize = msg.data.size(); size_t nMessageSize = msg.data.size();
LogPrint(BCLog::NET, "sending %s (%d bytes) peer=%d\n", SanitizeString(msg.command), nMessageSize, pnode->GetId()); LogPrint(BCLog::NET, "sending %s (%d bytes) peer=%d\n", SanitizeString(msg.m_type), nMessageSize, pnode->GetId());
// make sure we use the appropriate network transport format // make sure we use the appropriate network transport format
std::vector<unsigned char> serializedHeader; std::vector<unsigned char> serializedHeader;
@ -2806,8 +2806,8 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
LOCK(pnode->cs_vSend); LOCK(pnode->cs_vSend);
bool optimisticSend(pnode->vSendMsg.empty()); bool optimisticSend(pnode->vSendMsg.empty());
//log total amount of bytes per command //log total amount of bytes per message type
pnode->mapSendBytesPerMsgCmd[msg.command] += nTotalSize; pnode->mapSendBytesPerMsgCmd[msg.m_type] += nTotalSize;
pnode->nSendSize += nTotalSize; pnode->nSendSize += nTotalSize;
if (pnode->nSendSize > nSendBufferMaxSize) if (pnode->nSendSize > nSendBufferMaxSize)

2
src/net.h
View File

@ -110,7 +110,7 @@ struct CSerializedNetMsg
CSerializedNetMsg& operator=(const CSerializedNetMsg&) = delete; CSerializedNetMsg& operator=(const CSerializedNetMsg&) = delete;
std::vector<unsigned char> data; std::vector<unsigned char> data;
std::string command; std::string m_type;
}; };

8
src/netmessagemaker.h
View File

@ -15,18 +15,18 @@ public:
explicit CNetMsgMaker(int nVersionIn) : nVersion(nVersionIn){} explicit CNetMsgMaker(int nVersionIn) : nVersion(nVersionIn){}
template <typename... Args> template <typename... Args>
CSerializedNetMsg Make(int nFlags, std::string sCommand, Args&&... args) const CSerializedNetMsg Make(int nFlags, std::string msg_type, Args&&... args) const
{ {
CSerializedNetMsg msg; CSerializedNetMsg msg;
msg.command = std::move(sCommand); msg.m_type = std::move(msg_type);
CVectorWriter{ SER_NETWORK, nFlags | nVersion, msg.data, 0, std::forward<Args>(args)... }; CVectorWriter{ SER_NETWORK, nFlags | nVersion, msg.data, 0, std::forward<Args>(args)... };
return msg; return msg;
} }
template <typename... Args> template <typename... Args>
CSerializedNetMsg Make(std::string sCommand, Args&&... args) const CSerializedNetMsg Make(std::string msg_type, Args&&... args) const
{ {
return Make(0, std::move(sCommand), std::forward<Args>(args)...); return Make(0, std::move(msg_type), std::forward<Args>(args)...);
} }
private: private:

2
src/test/fuzz/process_messages.cpp
View File

@ -62,7 +62,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
const std::string random_message_type{fuzzed_data_provider.ConsumeBytesAsString(CMessageHeader::COMMAND_SIZE).c_str()}; const std::string random_message_type{fuzzed_data_provider.ConsumeBytesAsString(CMessageHeader::COMMAND_SIZE).c_str()};
CSerializedNetMsg net_msg; CSerializedNetMsg net_msg;
net_msg.command = random_message_type; net_msg.m_type = random_message_type;
net_msg.data = ConsumeRandomLengthByteVector(fuzzed_data_provider); net_msg.data = ConsumeRandomLengthByteVector(fuzzed_data_provider);
CNode& random_node = *peers.at(fuzzed_data_provider.ConsumeIntegralInRange<int>(0, peers.size() - 1)); CNode& random_node = *peers.at(fuzzed_data_provider.ConsumeIntegralInRange<int>(0, peers.size() - 1));