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

[Florent Daignière]

* zothar at freenetproject.org <zothar at freenetproject.org> [2008-01-06 18:10:45]:

> Author: zothar
> Date: 2008-01-06 18:10:45 +0000 (Sun, 06 Jan 2008)
> New Revision: 16942
> 
> Modified:
>    trunk/freenet/src/freenet/node/Node.java
> Log:
> Refactor N2NTM dependence on the peer being a darknet peer
> 
> Modified: trunk/freenet/src/freenet/node/Node.java
> ===================================================================
> --- trunk/freenet/src/freenet/node/Node.java	2008-01-06 16:53:08 UTC (rev 16941)
> +++ trunk/freenet/src/freenet/node/Node.java	2008-01-06 18:10:45 UTC (rev 16942)
> @@ -2529,15 +2529,18 @@
>  	}
>  	
>  	public void receivedNodeToNodeMessage(PeerNode src, int type, ShortBuffer messageData, boolean partingMessage) {
> -	  if(!(src instanceof DarknetPeerNode)) {
> -		Logger.error(this, "Got N2NTM from opennet node ?!?!?!: from "+src);
> -		return;
> +	  boolean fromDarknet = false;
> +	  if(src instanceof DarknetPeerNode) {
> +	    fromDarknet = true;
>  	  }
> -	  DarknetPeerNode source = (DarknetPeerNode)src;
> +	  DarknetPeerNode darkSource = (DarknetPeerNode)src;
>  	  
>  	  if(type == Node.N2N_MESSAGE_TYPE_FPROXY) {
> -		
> -		Logger.normal(this, "Received N2NM from '"+source.getPeer()+"'");
> +	    if(!fromDarknet) {
> +	  		Logger.error(this, "Got N2NTM from non-darknet node ?!?!?!: from "+src);
> +	  		return;
> +		}
> +		Logger.normal(this, "Received N2NTM from '"+darkSource.getPeer()+"'");

That's gonna throw a classcast exception if fromDarknet is false

NextGen$
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://emu.freenetproject.org/pipermail/devl/attachments/20080106/3e56b601/attachment.pgp