[freenet-cvs] r15386 - branches/freenet-jfk/src/freenet/node

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-09-29 16:30:02 +0000 (Sat, 29 Sep 2007)
New Revision: 15386

Modified:
   branches/freenet-jfk/src/freenet/node/PeerNode.java
Log:
Assume that testnet is disabled so that we don't have to transfer that field in 
compressednoderefs

Modified: branches/freenet-jfk/src/freenet/node/PeerNode.java
===================================================================
--- branches/freenet-jfk/src/freenet/node/PeerNode.java 2007-09-29 13:24:41 UTC 
(rev 15385)
+++ branches/freenet-jfk/src/freenet/node/PeerNode.java 2007-09-29 16:30:02 UTC 
(rev 15386)
@@ -93,6 +93,7 @@
     //TODO: sync ?
     protected byte[] jfkKa;
     protected byte[] jfkKe;
+    protected byte[] jfkKs;

     /** My low-level address for SocketManager purposes */
     private Peer detectedPeer;
@@ -1718,7 +1719,7 @@
      * @throws FSParseException */
     protected synchronized boolean innerProcessNewNoderef(SimpleFieldSet fs, 
boolean forARK) throws FSParseException {
         boolean changedAnything = false;
-        if(node.testnetEnabled != Fields.stringToBool(fs.get("testnet"), 
true)) {
+        if(node.testnetEnabled != Fields.stringToBool(fs.get("testnet"), 
false)) {
                String err = "Preventing connection to node "+detectedPeer+" - 
peer.testnet="+!node.testnetEnabled+'(' +fs.get("testnet")+") but 
node.testnet="+node.testnetEnabled;
                Logger.error(this, err);
                throw new FSParseException(err);