Merge pull request #78 from ss3344520/handshake_opt

optimize the duplicate peer scenario logic in handshake

Author: xxo1shine

README.md

@@ -43,7 +43,7 @@ repositories {
 Then add the required packages as dependencies. Please add dependencies locally.
 ```bash
 dependencies {
-    implementation group: 'io.github.tronprotocol', name: 'libp2p', version: '2.2.0'
+    implementation group: 'io.github.tronprotocol', name: 'libp2p', version: '2.2.1'
 }
 ```
 Or if you are using the jar files as your dependencies:
@@ -66,7 +66,7 @@ dependencies {
 <dependency>
     <groupId>io.github.tronprotocol</groupId>
     <artifactId>libp2p</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
 </dependency>
 ```
 

build.gradle

@@ -1,5 +1,5 @@
 group 'io.github.tronprotocol'
-version '2.2.0'
+version '2.2.1'
 
 buildscript {
     repositories {

src/main/java/org/tron/p2p/connection/business/handshake/HandshakeService.java

@@ -19,7 +19,7 @@ public class HandshakeService implements MessageProcess {
   private final int networkId = Parameter.p2pConfig.getNetworkId();
 
   public void startHandshake(Channel channel) {
-    sendHelloMsg(channel, DisconnectCode.NORMAL);
+    sendHelloMsg(channel, DisconnectCode.NORMAL, channel.getStartTime());
   }
 
   @Override
@@ -37,7 +37,9 @@ public void processMessage(Channel channel, Message message) {
 
     DisconnectCode code = ChannelManager.processPeer(channel);
     if (code != DisconnectCode.NORMAL) {
-      sendHelloMsg(channel, code);
+      if (!channel.isActive()) {
+        sendHelloMsg(channel, code, msg.getTimestamp());
+      }
       logDisconnectReason(channel, getDisconnectReason(code));
       channel.close();
       return;
@@ -68,20 +70,20 @@ public void processMessage(Channel channel, Message message) {
       if (msg.getNetworkId() != networkId) {
         log.info("Peer {} different network id, peer->{}, me->{}",
             channel.getInetSocketAddress(), msg.getNetworkId(), networkId);
-        sendHelloMsg(channel, DisconnectCode.DIFFERENT_VERSION);
+        sendHelloMsg(channel, DisconnectCode.DIFFERENT_VERSION, msg.getTimestamp());
         logDisconnectReason(channel, DisconnectReason.DIFFERENT_VERSION);
         channel.close();
         return;
       }
-      sendHelloMsg(channel, DisconnectCode.NORMAL);
+      sendHelloMsg(channel, DisconnectCode.NORMAL, msg.getTimestamp());
     }
     channel.setFinishHandshake(true);
     channel.updateAvgLatency(System.currentTimeMillis() - channel.getStartTime());
     Parameter.handlerList.forEach(h -> h.onConnect(channel));
   }
 
-  private void sendHelloMsg(Channel channel, DisconnectCode code) {
-    HelloMessage helloMessage = new HelloMessage(code);
+  private void sendHelloMsg(Channel channel, DisconnectCode code, long time) {
+    HelloMessage helloMessage = new HelloMessage(code, time);
     channel.send(helloMessage);
   }
 

src/main/java/org/tron/p2p/connection/message/handshake/HelloMessage.java

@@ -18,15 +18,15 @@ public HelloMessage(byte[] data) throws Exception {
     this.helloMessage = Connect.HelloMessage.parseFrom(data);
   }
 
-  public HelloMessage(DisconnectCode code) {
+  public HelloMessage(DisconnectCode code, long time) {
     super(MessageType.HANDSHAKE_HELLO, null);
     Discover.Endpoint endpoint = Parameter.getHomeNode();
     this.helloMessage = Connect.HelloMessage.newBuilder()
       .setFrom(endpoint)
       .setNetworkId(Parameter.p2pConfig.getNetworkId())
       .setCode(code.getValue())
       .setVersion(Parameter.version)
-      .setTimestamp(System.currentTimeMillis()).build();
+      .setTimestamp(time).build();
     this.data = helloMessage.toByteArray();
   }
 

src/test/java/org/tron/p2p/connection/MessageTest.java

@@ -52,7 +52,7 @@ public void testPong() {
 
   @Test
   public void testHandShakeHello() {
-    HelloMessage helloMessage = new HelloMessage(DisconnectCode.NORMAL);
+    HelloMessage helloMessage = new HelloMessage(DisconnectCode.NORMAL, 0);
     byte[] messageData = helloMessage.getSendData();
     try {
       Message message = Message.parse(messageData);

src/test/java/org/tron/p2p/connection/message/handshake/HelloMessageTest.java

@@ -14,7 +14,7 @@ public class HelloMessageTest {
   @Test
   public void testHelloMessage() throws Exception {
     p2pConfig = new P2pConfig();
-    HelloMessage m1 = new HelloMessage(DisconnectCode.NORMAL);
+    HelloMessage m1 = new HelloMessage(DisconnectCode.NORMAL, 0);
     Assert.assertEquals(0, m1.getCode());
 
     Assert.assertTrue(Arrays.equals(p2pConfig.getNodeID(), m1.getFrom().getId()));