Merge pull request tronprotocol#1389 from tronprotocol/fix-sycn-l

wubin12 · web-flow · commit 0a171841f2db · 2018-08-27T20:10:14.000+08:00
fix sycn bug
diff --git a/src/main/java/org/tron/core/net/node/NodeImpl.java b/src/main/java/org/tron/core/net/node/NodeImpl.java
@@ -727,16 +727,16 @@ private void onHandleBlockMessage(PeerConnection peer, BlockMessage blkMsg) {
           isFetchSyncActive = true;
         }
       }
-    }
-
-    if (advObjWeRequested.containsKey(item)) {
+    } else if (advObjWeRequested.containsKey(item)) {
       advObjWeRequested.remove(item);
       if (!syncFlag) {
         processAdvBlock(peer, blkMsg.getBlockCapsule());
         startFetchItem();
       }
     } else {
       if (!syncFlag) {//not we request and not sync,disconnect
+        logger.error("not we request and not sync, disconnect : {}, block : {}",
+            peer.getInetAddress(), blockId.getString());
         banTraitorPeer(peer, ReasonCode.BAD_PROTOCOL);
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -727,16 +727,16 @@ private void onHandleBlockMessage(PeerConnection peer, BlockMessage blkMsg) {`
`727`	`727`	`isFetchSyncActive = true;`
`728`	`728`	`}`
`729`	`729`	`}`
`730`		`- }`
`731`		`-`
`732`		`- if (advObjWeRequested.containsKey(item)) {`
	`730`	`+ } else if (advObjWeRequested.containsKey(item)) {`
`733`	`731`	`advObjWeRequested.remove(item);`
`734`	`732`	`if (!syncFlag) {`
`735`	`733`	`processAdvBlock(peer, blkMsg.getBlockCapsule());`
`736`	`734`	`startFetchItem();`
`737`	`735`	`}`
`738`	`736`	`} else {`
`739`	`737`	`if (!syncFlag) {//not we request and not sync,disconnect`
	`738`	`+ logger.error("not we request and not sync, disconnect : {}, block : {}",`
	`739`	`+ peer.getInetAddress(), blockId.getString());`
`740`	`740`	`banTraitorPeer(peer, ReasonCode.BAD_PROTOCOL);`
`741`	`741`	`}`
`742`	`742`	`}`