Merge pull request #1164 from JMdoubleU/patch-1

Only process neighbors when they were requested

Author: mkalinin

ethereumj-core/src/main/java/org/ethereum/net/rlpx/discover/NodeHandler.java

@@ -126,6 +126,7 @@ public enum State {
     boolean waitForPong = false;
     long pingSent;
     int pingTrials = 3;
+    boolean waitForNeighbors = false;
     NodeHandler replaceCandidate;
 
     public NodeHandler(Node node, NodeManager nodeManager) {
@@ -240,9 +241,12 @@ void handlePong(PongMessage msg) {
     void handleNeighbours(NeighborsMessage msg) {
         logMessage(msg, true);
 //        logMessage(" ===> [NEIGHBOURS] " + this + ", Count: " + msg.getNodes().size());
-        getNodeStatistics().discoverInNeighbours.add();
-        for (Node n : msg.getNodes()) {
-            nodeManager.getNodeHandler(n);
+        if (waitForNeighbors) {
+            waitForNeighbors = false;
+            getNodeStatistics().discoverInNeighbours.add();
+            for (Node n : msg.getNodes()) {
+                nodeManager.getNodeHandler(n);
+            }
         }
     }
 
@@ -322,6 +326,7 @@ void sendFindNode(byte[] target) {
 //        logMessage("<===  [FIND_NODE] " + this);
         Message findNode = FindNodeMessage.create(target, nodeManager.key);
         logMessage(findNode, false);
+        waitForNeighbors = true;
         sendMessage(findNode);
         getNodeStatistics().discoverOutFind.add();
     }