[freenet-dev] [freenet-cvs] r16833 - trunk/freenet/src/freenet/node

[Matthew Toseland]

On Saturday 29 December 2007 01:41, robert at freenetproject.org wrote:
> Author: robert
> Date: 2007-12-29 01:41:06 +0000 (Sat, 29 Dec 2007)
> New Revision: 16833
> 
> Modified:
>    trunk/freenet/src/freenet/node/PeerNode.java
> Log:
> maybe help wont-fetch-ark deadlock
> 
> 
> Modified: trunk/freenet/src/freenet/node/PeerNode.java
> ===================================================================
> --- trunk/freenet/src/freenet/node/PeerNode.java	2007-12-29 01:37:31 UTC 
(rev 16832)
> +++ trunk/freenet/src/freenet/node/PeerNode.java	2007-12-29 01:41:06 UTC 
(rev 16833)
> @@ -348,7 +348,7 @@
>  		disableRoutingHasBeenSetRemotely = false; // Assume so
>  		
>  		lastGoodVersion = fs.get("lastGoodVersion");
> -		updateShouldDisconnectNow();
> +		//updateShouldDisconnectNow();
>  
>  		testnetEnabled = fs.getBoolean("testnet", false);
>  		if(node.testnetEnabled != testnetEnabled) {
> @@ -2781,8 +2781,11 @@
>  	}
>  
>  	synchronized void updateShouldDisconnectNow() {
> -		verifiedIncompatibleOlderVersion = forwardInvalidVersion();
> -		verifiedIncompatibleNewerVersion = reverseInvalidVersion();
> +		//FIXME: We should not update VERIFIED unless we HANDSHAKE WITH THE NODE
> +		if (isConnected()) {
> +			verifiedIncompatibleOlderVersion = forwardInvalidVersion();
> +			verifiedIncompatibleNewerVersion = reverseInvalidVersion();
> +		}
>  	}

Please restore the original version. It looks like it was correct after all, 
and the problem is not fetching ARKs when verified*=true.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://emu.freenetproject.org/pipermail/devl/attachments/20080103/cec91a45/attachment.pgp