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

[nextgens at freenetproject.org]

Author: nextgens
Date: 2006-12-02 18:59:30 +0000 (Sat, 02 Dec 2006)
New Revision: 11196

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
implement #944: Check testnet flag on connect ; It needs testing though

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java	2006-12-02 16:48:30 UTC (rev 11195)
+++ trunk/freenet/src/freenet/node/PeerNode.java	2006-12-02 18:59:30 UTC (rev 11196)
@@ -1692,6 +1692,12 @@
         		throw new FSParseException(e);
         	}
         }
+        String testnet = fs.get("testnet");
+        if(node.testnetEnabled != (testnet == null ? false : (testnet.equalsIgnoreCase("true") || testnet.equalsIgnoreCase("yes")))) {
+        	String err = "Preventing connection to node "+detectedPeer+" - peer.testnet="+!node.testnetEnabled+'(' +testnet+") but node.testnet="+node.testnetEnabled;
+        	Logger.error(this, err);
+        	throw new FSParseException(err);
+        }
         String newVersion = fs.get("version");
         if(newVersion == null) {
         	// Version may be ommitted for an ARK.