Merge pull request #323 from tronprotocol/p2p_hellp_msg

Solve message encapsulation and send message exception problems

Author: olenheim

src/main/java/org/tron/common/overlay/message/DisconnectMessage.java

@@ -25,8 +25,8 @@ public DisconnectMessage(ReasonCode reasonCode) {
         .newBuilder()
         .setReason(Protocol.ReasonCode.forNumber(reasonCode.asByte()))
         .build();
-    unpacked = true;
     this.type = MessageTypes.P2P_DISCONNECT.asByte();
+    this.data = this.disconnectMessage.toByteArray();
   }
 
   private void unPack() {

src/main/java/org/tron/common/overlay/message/HelloMessage.java

@@ -67,7 +67,7 @@ public byte[] getData() {
   /**
    * Get the version of p2p protocol.
    */
-  public byte getVersion() {
+  public int getVersion() {
     return (byte) this.helloMessage.getVersion();
   }
 

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

@@ -83,7 +83,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> ou
     final HelloMessage helloMessage = (HelloMessage) msg;
 
     if (helloMessage.getVersion() != Args.getInstance().getNodeP2pVersion()) {
-      channelManager.disconnect(channel, ReasonCode.INCOMPATIBLE_PROTOCOL);
+      ctx.close();
       return;
     }