From 76764005ad1b37115f4b2218cdd110980a36b9f9 Mon Sep 17 00:00:00 2001
From: jiangyuanshu <317787106@qq.com>
Date: Tue, 30 Sep 2025 16:21:23 +0800
Subject: [PATCH 1/3] format hellomessage with hex
---
.../message/handshake/HelloMessage.java | 16 ++++++-
src/main/resources/logback.xml | 42 +++++++++++++++++++
2 files changed, 57 insertions(+), 1 deletion(-)
create mode 100644 src/main/resources/logback.xml
diff --git a/src/main/java/org/tron/p2p/connection/message/handshake/HelloMessage.java b/src/main/java/org/tron/p2p/connection/message/handshake/HelloMessage.java
index fc42116..ef54ae5 100644
--- a/src/main/java/org/tron/p2p/connection/message/handshake/HelloMessage.java
+++ b/src/main/java/org/tron/p2p/connection/message/handshake/HelloMessage.java
@@ -7,6 +7,7 @@
import org.tron.p2p.discover.Node;
import org.tron.p2p.protos.Connect;
import org.tron.p2p.protos.Discover;
+import org.tron.p2p.utils.ByteArray;
import org.tron.p2p.utils.NetUtil;
public class HelloMessage extends Message {
@@ -52,7 +53,7 @@ public Node getFrom() {
@Override
public String toString() {
- return "[HelloMessage: " + helloMessage;
+ return "[HelloMessage: " + format();
}
@Override
@@ -60,4 +61,17 @@ public boolean valid() {
return NetUtil.validNode(getFrom());
}
+ public String format() {
+ String[] lines = helloMessage.toString().split("\n");
+ StringBuilder sb = new StringBuilder();
+ for (String line : lines) {
+ if (line.contains("nodeId")) {
+ String nodeId = ByteArray.toHexString(helloMessage.getFrom().getNodeId().toByteArray());
+ line = " nodeId: \"" + nodeId + "\"";
+ }
+ sb.append(line).append("\n");
+ }
+ return sb.toString().trim();
+ }
+
}
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
new file mode 100644
index 0000000..ef52dc1
--- /dev/null
+++ b/src/main/resources/logback.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+ %d{HH:mm:ss.SSS} %-5level [%t] [%c{1}]\(%F:%L\) %m%n
+
+
+ INFO
+
+
+
+
+ ./logs/server.log
+
+
+ ./logs/server-%d{yyyy-MM-dd}.%i.log.gz
+
+ 500MB
+ 7
+ 50GB
+
+
+ %d{HH:mm:ss.SSS} %-5level [%t] [%c{1}]\(%F:%L\) %m%n
+
+
+ TRACE
+
+
+
+
+
+
+
+
+
+
+
From 4515bee9e238410575a9e5b3b6a2561ed8730b92 Mon Sep 17 00:00:00 2001
From: 317787106 <317787106@qq.com>
Date: Wed, 1 Oct 2025 11:06:02 +0800
Subject: [PATCH 2/3] Delete src/main/resources/logback.xml
---
src/main/resources/logback.xml | 42 ----------------------------------
1 file changed, 42 deletions(-)
delete mode 100644 src/main/resources/logback.xml
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
deleted file mode 100644
index ef52dc1..0000000
--- a/src/main/resources/logback.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
- %d{HH:mm:ss.SSS} %-5level [%t] [%c{1}]\(%F:%L\) %m%n
-
-
- INFO
-
-
-
-
- ./logs/server.log
-
-
- ./logs/server-%d{yyyy-MM-dd}.%i.log.gz
-
- 500MB
- 7
- 50GB
-
-
- %d{HH:mm:ss.SSS} %-5level [%t] [%c{1}]\(%F:%L\) %m%n
-
-
- TRACE
-
-
-
-
-
-
-
-
-
-
-
From e50a240329cfa1ac4898f3c26308c09f4f55209b Mon Sep 17 00:00:00 2001
From: jiangyuanshu <317787106@qq.com>
Date: Thu, 9 Oct 2025 16:48:01 +0800
Subject: [PATCH 3/3] revert trim of hellomessage
---
.../org/tron/p2p/connection/message/handshake/HelloMessage.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/tron/p2p/connection/message/handshake/HelloMessage.java b/src/main/java/org/tron/p2p/connection/message/handshake/HelloMessage.java
index ef54ae5..a3727d2 100644
--- a/src/main/java/org/tron/p2p/connection/message/handshake/HelloMessage.java
+++ b/src/main/java/org/tron/p2p/connection/message/handshake/HelloMessage.java
@@ -71,7 +71,7 @@ public String format() {
}
sb.append(line).append("\n");
}
- return sb.toString().trim();
+ return sb.toString();
}
}