Skip to content

format hellomessage with hex #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
317787106 wants to merge 5 commits into
base: hotfix/add_log_support
Choose a base branch
from
Open

format hellomessage with hex #3

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7676400
format hellomessage with hex
317787106 Sep 30, 2025
4515bee
Delete src/main/resources/logback.xml
317787106 Oct 1, 2025
64c893b
Merge pull request #113 from 317787106/hotfix/add_log_support
kuny0707 Oct 9, 2025
24949a5
Merge branch 'release-v2.2.7' into hotfix/fix_print_hellomessage
317787106 Oct 9, 2025
e50a240
revert trim of hellomessage
317787106 Oct 9, 2025
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
16 changes: 15 additions & 1 deletion src/main/java/org/tron/p2p/connection/message/handshake/HelloMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -52,12 +53,25 @@ public Node getFrom() {

@Override
public String toString() {
return "[HelloMessage: " + helloMessage;
return "[HelloMessage: " + format();
}

@Override
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")) {
Copy link

@0xbigapple 0xbigapple Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible that using string matching may unintentionally replace unrelated content? I think it's not a good way for 3 reasons：1. If there are multiple fields containing "nodeId" in different contexts 2. If helloMessage add a new filed which name contains "nodeId" 3. If the proto toString() format changes in future?

String nodeId = ByteArray.toHexString(helloMessage.getFrom().getNodeId().toByteArray());
line = " nodeId: \"" + nodeId + "\"";
}
sb.append(line).append("\n");
}
return sb.toString();
}

}