fix the send hello

Author: lvs007

src/main/java/org/tron/common/overlay/server/Channel.java

@@ -128,7 +128,7 @@ public void init(ChannelPipeline pipeline, String remoteId, boolean discoveryMod
 
     }
 
-    public boolean publicHandshakeFinished(ChannelHandlerContext ctx, HelloMessage msg) {
+    public void publicHandshakeFinished(ChannelHandlerContext ctx, HelloMessage msg) {
         ctx.pipeline().remove(handshakeHandler);
         msgQueue.activate(ctx);
         ctx.pipeline().addLast("messageCodec", messageCodec);
@@ -138,7 +138,6 @@ public boolean publicHandshakeFinished(ChannelHandlerContext ctx, HelloMessage m
         setTronState(TronState.HANDSHAKE_FINISHED);
         getNodeStatistics().p2pHandShake.add();
         logger.info("Finish handshake with {}.", ctx.channel().remoteAddress());
-        return channelManager.addPeer(this);
     }
 
     /**

src/main/java/org/tron/common/overlay/server/ChannelManager.java

@@ -116,36 +116,30 @@ public boolean isRecentlyDisconnected(InetAddress peerAddr) {
     }
   }
 
-  public boolean addPeer(Channel peer) {
-    boolean result = procPeer(peer);
-    if (result) {
-      activePeers.put(peer.getNodeIdWrapper(), peer);
-      syncPool.onConnect(peer);
-      logger.info("Add active peer {}, total active peers: {}", peer, activePeers.size());
-    }
-    return result;
-  }
-
-  private boolean procPeer(Channel peer) {
+  public synchronized boolean procPeer(Channel peer) {
     if (peer.getNodeStatistics().isPenalized()) {
       disconnect(peer, peer.getNodeStatistics().getDisconnectReason());
       return false;
-    } else if (!peer.isActive() && activePeers.size() >= maxActivePeers) {
+    }
+
+    if (!peer.isActive() && activePeers.size() >= maxActivePeers) {
       disconnect(peer, TOO_MANY_PEERS);
       return false;
-    } else if (activePeers.containsKey(peer.getNodeIdWrapper())) {
+    }
+
+    if (activePeers.containsKey(peer.getNodeIdWrapper())) {
       Channel channel = activePeers.get(peer.getNodeIdWrapper());
       if (channel.getStartTime() > peer.getStartTime()) {
         logger.info("Disconnect connection established later, {}", channel.getNode());
         disconnect(channel, DUPLICATE_PEER);
-        return true;
       } else {
         disconnect(peer, DUPLICATE_PEER);
         return false;
       }
-    } else {
-      return true;
     }
+    logger.info("Add active peer {}, total active peers: {}", peer, activePeers.size());
+    activePeers.put(peer.getNodeIdWrapper(), peer);
+    return true;
   }
 
   public Collection<Channel> getActivePeers() {

src/main/java/org/tron/common/overlay/server/HandshakeHandler.java

@@ -52,6 +52,8 @@ public class HandshakeHandler extends ByteToMessageDecoder {
 
   private final NodeManager nodeManager;
 
+  private final ChannelManager channelManager;
+
   private Manager manager;
 
   private  P2pMessageFactory messageFactory = new P2pMessageFactory();
@@ -60,8 +62,13 @@ public class HandshakeHandler extends ByteToMessageDecoder {
   private NodeImpl node;
 
   @Autowired
-  public HandshakeHandler(final NodeManager nodeManager, final Manager manager) {
+  private SyncPool syncPool;
+
+  @Autowired
+  public HandshakeHandler(final NodeManager nodeManager, final ChannelManager channelManager,
+      final Manager manager) {
     this.nodeManager = nodeManager;
+    this.channelManager = channelManager;
     this.manager = manager;
   }
 
@@ -148,11 +155,15 @@ private void handleHelloMsg(ChannelHandlerContext ctx, HelloMessage msg) {
 
     channel.getNodeStatistics().p2pInHello.add();
 
-    boolean result = channel.publicHandshakeFinished(ctx, msg);
+    channel.publicHandshakeFinished(ctx, msg);
+    if (!channelManager.procPeer(channel)) {
+      return;
+    }
 
-    if (result && remoteId.length != 64) {
+    if (remoteId.length != 64) {
       sendHelloMsg(ctx, msg.getTimestamp());
-      node.onConnectPeer((PeerConnection) channel);
     }
+
+    syncPool.onConnect(channel);
   }
 }

src/main/java/org/tron/common/overlay/server/SyncPool.java

@@ -155,6 +155,7 @@ public void onConnect(Channel peer) {
     if (!activePeers.contains(peer)) {
       activePeers.add((PeerConnection) peer);
       activePeers.sort(Comparator.comparingDouble(c -> c.getPeerStats().getAvgLatency()));
+      peerDel.onConnectPeer((PeerConnection) peer);
     }
   }