Skip to content
This repository was archived by the owner on Oct 28, 2021. It is now read-only.

Various network-related logging changes #5605

Merged
halfalicious merged 20 commits into from
May 24, 2019
Merged

Various network-related logging changes #5605

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8c03b73
Move RLPx handshake log messages
halfalicious May 15, 2019
289e415
Add boost log suffix and set suffix in RLPxHandshake
halfalicious May 17, 2019
6aa6520
Remove log scoped context and use member loggers
halfalicious May 17, 2019
7299167
Change PeerSessionInfos log message to debug level
halfalicious May 17, 2019
06324a3
Add boost log suffix to EthereumPeer
halfalicious May 17, 2019
2209f70
Update license message in EthereumPeer.h
halfalicious May 17, 2019
cc0c5c6
Add peer node IDs to BlockChainSync logs
halfalicious May 18, 2019
76e060c
Log peer IDs in EthereumCapability
halfalicious May 18, 2019
43607b8
Log peer IDs in WarpCapability
halfalicious May 18, 2019
ec98d2f
Update license messages in Log.*
halfalicious May 19, 2019
20a1810
Move WarpCapability logs to new log channel
halfalicious May 19, 2019
523fee0
Move rest of EthCap log messages to instance loggers
halfalicious May 19, 2019
67c0793
Move BlockChainSync logs to instance loggers
halfalicious May 19, 2019
b5c99ec
Remove redundant error logging from RLPxHandshake
halfalicious May 19, 2019
d1c8c8d
Log message tweaks
halfalicious May 20, 2019
c398911
Address PR feedback
halfalicious May 21, 2019
c523a4f
Add new warpcap channel to Aleth help output
halfalicious May 21, 2019
6fc1b80
Update changelog
halfalicious May 21, 2019
e7dc0b0
Address PR feedback
halfalicious May 23, 2019
fbad1f7
Addressed PR feedback
halfalicious May 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Move RLPx handshake log messages 
Move log statements so that logging occurs on data receipt, rather than before read is attempted from socket. This makes the messages reflect what has actually happened rather than what's expected to happen, which makes the logs more useful
  • Loading branch information
@halfalicious
halfalicious committed May 23, 2019
commit 8c03b7352f7696c72d4a53bfa3b3540ef40efb0a
18 changes: 10 additions & 8 deletions libp2p/RLPxHandshake.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ void RLPXHandshake::setAuthValues(Signature const& _sig, Public const& _remotePu

void RLPXHandshake::readAuth()
{
LOG(m_logger) << "auth from " << m_remote << "@" << m_socket->remoteEndpoint();
m_authCipher.resize(c_authCipherSizeBytes);
auto self(shared_from_this());
ba::async_read(m_socket->ref(), ba::buffer(m_authCipher, c_authCipherSizeBytes),
Expand All @@ -129,6 +128,7 @@ void RLPXHandshake::readAuth()
transition(ec);
else if (decryptECIES(m_host->m_alias.secret(), bytesConstRef(&m_authCipher), m_auth))
{
LOG(m_logger) << "auth from " << m_remote << "@" << m_socket->remoteEndpoint();
bytesConstRef data(&m_auth);
Signature sig(data.cropped(0, Signature::size));
Public pubk(data.cropped(Signature::size + h256::size, Public::size));
Expand Down Expand Up @@ -179,7 +179,6 @@ void RLPXHandshake::readAuthEIP8()

void RLPXHandshake::readAck()
{
LOG(m_logger) << "ack from " << m_remote << "@" << m_socket->remoteEndpoint();
m_ackCipher.resize(c_ackCipherSizeBytes);
auto self(shared_from_this());
ba::async_read(m_socket->ref(), ba::buffer(m_ackCipher, c_ackCipherSizeBytes),
Expand All @@ -188,6 +187,7 @@ void RLPXHandshake::readAck()
transition(ec);
else if (decryptECIES(m_host->m_alias.secret(), bytesConstRef(&m_ackCipher), m_ack))
{
LOG(m_logger) << "ack from " << m_remote << "@" << m_socket->remoteEndpoint();
bytesConstRef(&m_ack).cropped(0, Public::size).copyTo(m_ecdheRemote.ref());
bytesConstRef(&m_ack).cropped(Public::size, h256::size).copyTo(m_remoteNonce.ref());
m_remoteVersion = c_rlpxVersion;
Expand Down Expand Up @@ -339,8 +339,6 @@ void RLPXHandshake::transition(boost::system::error_code _ech)
}
else if (m_nextState == ReadHello)
{
LOG(m_logger) << "Frame header from " << m_remote << "@" << m_socket->remoteEndpoint();

// Authenticate and decrypt initial hello frame with initial RLPXFrameCoder
// and request m_host to start session.
m_nextState = StartSession;
Expand All @@ -365,6 +363,9 @@ void RLPXHandshake::transition(boost::system::error_code _ech)
return;
}

LOG(m_logger) << "Frame header from " << m_remote << "@"
<< m_socket->remoteEndpoint();

/// authenticate and decrypt header
if (!m_io->authAndDecryptHeader(
bytesRef(m_handshakeInBuffer.data(), m_handshakeInBuffer.size())))
Expand Down Expand Up @@ -400,13 +401,13 @@ void RLPXHandshake::transition(boost::system::error_code _ech)
bytesConstRef(&header).cropped(3).copyTo(&headerRLP);

/// read padded frame and mac
LOG(m_logger) << "Frame body from " << m_remote << "@"
<< m_socket->remoteEndpoint();

constexpr size_t byteBoundary = 16;
m_handshakeInBuffer.resize(
frameSize + ((byteBoundary - (frameSize % byteBoundary)) % byteBoundary) +
h128::size);

LOG(m_logger) << "Frame header contents validated";

ba::async_read(m_socket->ref(),
boost::asio::buffer(m_handshakeInBuffer, m_handshakeInBuffer.size()),
[this, self, headerRLP](boost::system::error_code ec, std::size_t) {
Expand All @@ -425,7 +426,8 @@ void RLPXHandshake::transition(boost::system::error_code _ech)
transition();
return;
}

LOG(m_logger) << "Frame body from " << m_remote << "@"
<< m_socket->remoteEndpoint();
bytesRef frame(&m_handshakeInBuffer);
if (!m_io->authAndDecryptFrame(frame))
{
Expand Down