Merge pull request #5568 from ethereum/p2p-logging

Clean up RLPX handshake logging

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Added: [#5557](https://github.com/ethereum/aleth/pull/5557) Improved debug logging of full sync.
 - Changed: [#5559](https://github.com/ethereum/aleth/pull/5559) Update peer validation error messages.
 - Fixed: [#5562](https://github.com/ethereum/aleth/pull/5562) Don't send header request messages to peers that haven't sent us Status yet.
+- Changed: [#5568](https://github.com/ethereum/aleth/pull/5568) Improve rlpx handshake log messages and create new rlpx log channel.
 
 ## [1.6.0] - Unreleased
 

libp2p/Common.cpp

@@ -15,6 +15,27 @@ using namespace std;
 const NodeIPEndpoint UnspecifiedNodeIPEndpoint = NodeIPEndpoint{{}, 0, 0};
 const Node UnspecifiedNode = Node{{}, UnspecifiedNodeIPEndpoint};
 
+char const* packetTypeToString(PacketType _packetType)
+{
+    switch (_packetType)
+    {
+    case HelloPacket:
+        return "HelloPacket";
+    case DisconnectPacket:
+        return "DisconnectPacket";
+    case PingPacket:
+        return "PingPacket";
+    case PongPacket:
+        return "PongPacket";
+    case GetPeersPacket:
+        return "GetPeersPacket";
+    case PeersPacket:
+        return "PeersPacket";
+    default:
+        return "UnknownPacket";
+    }
+}
+
 bool isPublicAddress(string const& _addressToCheck)
 {
     return _addressToCheck.empty() ? false :

libp2p/Common.h

@@ -89,6 +89,8 @@ enum PacketType
     UserPacket = 0x10
 };
 
+char const* packetTypeToString(PacketType _packetType);
+
 enum DisconnectReason
 {
     DisconnectRequested = 0,
@@ -259,6 +261,11 @@ inline boost::log::formatting_ostream& operator<<(
     return _strm;
 }
 
+inline std::ostream& operator<<(std::ostream& _strm, NodeID const& _id)
+{
+    _strm << "##" << _id.abridged();
+    return _strm;
+}
 
 /// Simple stream output for a NodeIPEndpoint.
 std::ostream& operator<<(std::ostream& _out, NodeIPEndpoint const& _ep);