[freenet-cvs] r16862 - trunk/freenet/src/freenet/node

[robert at freenetproject.org]

Author: robert
Date: 2008-01-03 18:06:15 +0000 (Thu, 03 Jan 2008)
New Revision: 16862

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
revert r16833 & r16834: ark is now always fetched (r16861)


Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java	2008-01-03 17:51:33 UTC (rev 16861)
+++ trunk/freenet/src/freenet/node/PeerNode.java	2008-01-03 18:06:15 UTC (rev 16862)
@@ -348,7 +348,7 @@
 		disableRoutingHasBeenSetRemotely = false; // Assume so
 		
 		lastGoodVersion = fs.get("lastGoodVersion");
-		//updateShouldDisconnectNow();
+		updateShouldDisconnectNow();
 
 		testnetEnabled = fs.getBoolean("testnet", false);
 		if(node.testnetEnabled != testnetEnabled) {
@@ -2781,11 +2781,8 @@
 	}
 
 	synchronized void updateShouldDisconnectNow() {
-		//FIXME: We should not update VERIFIED unless we HANDSHAKE WITH THE NODE
-		if (isConnected() || verifiedIncompatibleOlderVersion || verifiedIncompatibleNewerVersion) {
 			verifiedIncompatibleOlderVersion = forwardInvalidVersion();
 			verifiedIncompatibleNewerVersion = reverseInvalidVersion();
-		}
 	}
 
 	/**