Skip to content

Instantly share code, notes, and snippets.

@jonatack
Created September 25, 2019 15:58
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jonatack/d6a228878e6ef5f582ff75c974f2d6c3 to your computer and use it in GitHub Desktop.
Save jonatack/d6a228878e6ef5f582ff75c974f2d6c3 to your computer and use it in GitHub Desktop.
~/projects/bitcoin/bitcoin (pr/16202)$ git diff
diff --git a/src/net.cpp b/src/net.cpp
index d5e74d928f..d7371d80df 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -596,6 +596,9 @@ bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete
if (i == mapRecvBytesPerMsgCmd.end())
i = mapRecvBytesPerMsgCmd.find(NET_MESSAGE_COMMAND_OTHER);
assert(i != mapRecvBytesPerMsgCmd.end());
+
+ LogPrintf("net.cpp::600 msg.m_raw_message_size: %s\n", msg.m_raw_message_size);
+
i->second += msg.m_raw_message_size;
// push the message to the process queue,
@@ -710,6 +713,11 @@ CNetMessage V1TransportDeserializer::GetMessage(const CMessageHeader::MessageSta
msg.m_command = hdr.GetCommand();
msg.m_message_size = hdr.nMessageSize;
msg.m_raw_message_size = hdr.nMessageSize + CMessageHeader::HEADER_SIZE;
+ LogPrintf("net.cpp::713 msg.m_comand: %s\n", msg.m_command);
+ LogPrintf("net.cpp::714 msg.m_message_size: %s\n", msg.m_message_size);
+ LogPrintf("net.cpp::715 hdr.nMessageSize: %s\n", hdr.nMessageSize);
+ // LogPrintf("net.cpp::715 CMessageHeader::HEADER_SIZE: %s\n", CMessageHeader::HEADER_SIZE);
+ LogPrintf("net.cpp::715 msg.m_raw_message_size: %s\n", msg.m_raw_message_size);
// store receive time
msg.m_time = time;
@@ -1372,7 +1380,10 @@ void CConnman::SocketHandler()
for (; it != pnode->vRecvMsg.end(); ++it) {
// vRecvMsg contains only completed CNetMessage
// the single possible partially deserialized message are held by TransportDeserializer
+ LogPrintf("net.cpp::1384 it->m_raw_message_size: %s\n", it->m_raw_message_size);
nSizeAdded += it->m_raw_message_size;
+ LogPrintf("net.cpp::1384 nSizeAdded: %s\n", nSizeAdded);
+
}
{
LOCK(pnode->cs_vProcessMsg);
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 1f651fc25d..524b718935 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -3316,6 +3316,7 @@ bool PeerLogicValidation::ProcessMessages(CNode* pfrom, std::atomic<bool>& inter
return false;
// Just take one message
msgs.splice(msgs.begin(), pfrom->vProcessMsg, pfrom->vProcessMsg.begin());
+ LogPrintf("net_processing.cpp::3319 msgs.front().m_raw_message_size: %s\n", msgs.front().m_raw_message_size);
pfrom->nProcessQueueSize -= msgs.front().m_raw_message_size;
pfrom->fPauseRecv = pfrom->nProcessQueueSize > connman->GetReceiveFloodSize();
fMoreWork = !pfrom->vProcessMsg.empty();
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment