ncfp10-a

Author: EggPool

src/main/java/co/nyzo/verifier/Message.java

@@ -212,7 +212,6 @@ public void run() {
                     if (socket == null) {
                         NodeManager.markFailedConnection(hostNameOrIp);
                     } else {
-                        NodeManager.markSuccessfulConnection(hostNameOrIp);
 
                         try {
                             OutputStream outputStream = socket.getOutputStream();
@@ -221,6 +220,7 @@ public void run() {
                             socket.setSoTimeout(1000);
                             response = readFromStream(socket.getInputStream(), socket.getInetAddress().getAddress(),
                                     message.getType());
+                            NodeManager.markSuccessfulConnection(hostNameOrIp);
                         } catch (Exception reportOnly) {
                             System.err.println("Exception sending message " + message.getType() + " to " +
                                     hostNameOrIp + ":" + port + ": " + PrintUtil.printException(reportOnly));

src/main/java/co/nyzo/verifier/NodeManager.java

@@ -68,7 +68,12 @@ public static void updateNode(Message message) {
             // typically made when a node comes back online after a temporary network issue.
             Node node = ipAddressToNodeMap.get(ByteBuffer.wrap(message.getSourceIpAddress()));
             if (node != null) {
-                node.markSuccessfulConnection();
+                ByteBuffer identifierBuffer = ByteBuffer.wrap(node.getIdentifier());
+                if (BlockManager.verifierInCurrentCycle(identifierBuffer)) {
+                    node.markSuccessfulConnection();
+                } else {
+                    LogUtil.println("Missing block request from out of cycle in updateNode(): " + NicknameManager.get(node.getIdentifier()));
+                }
             }
         } else {
             LogUtil.println("unrecognized message type in updateNode(): " + message.getType());
@@ -96,7 +101,9 @@ private static void updateNode(byte[] identifier, byte[] ipAddress, int portTcp,
                 if (portUdp > 0) {
                     existingNode.setPortUdp(portUdp);
                 }
-                existingNode.markSuccessfulConnection();
+                if (isNodeJoinResponse) {
+                    existingNode.markSuccessfulConnection();
+                }
             } else {
                 // If the existing node is not null, remove it.
                 if (existingNode != null) {

src/main/java/co/nyzo/verifier/Version.java

@@ -2,7 +2,7 @@
 
 public class Version {
 
-    private static final int version = 595;
+    private static final int version = 595001;
 
     public static int getVersion() {