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

[t...@freenetproject.org]

Author: toad
Date: 2005-12-07 22:06:20 +0000 (Wed, 07 Dec 2005)
New Revision: 7689

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/Version.java
Log:
288: (mandatory)
Fix connecting to other peers. :)

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2005-12-07 21:56:38 UTC 
(rev 7688)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2005-12-07 22:06:20 UTC 
(rev 7689)
@@ -198,10 +198,11 @@
         if(name == null) throw new FSParseException("No name");
         myName = name;
         String testnet = fs.get("testnet");
-        testnetEnabled = Boolean.getBoolean(testnet);
+        testnetEnabled = Boolean.parseBoolean(testnet);
         if(testnetEnabled != node.testnetEnabled) {
-               Logger.error(this, "Ignoring incompatible node "+peer+" - 
peer.testnet="+testnetEnabled+" but node.testnet="+node.testnetEnabled);
-               throw new PeerParseException("Ignoring incompatible node 
"+peer+" - peer.testnet="+testnetEnabled+" but 
node.testnet="+node.testnetEnabled);
+               String err = "Ignoring incompatible node "+peer+" - 
peer.testnet="+testnetEnabled+"("+testnet+") but 
node.testnet="+node.testnetEnabled;
+               Logger.error(this, err);
+               throw new PeerParseException(err);
         }

         // Setup incoming and outgoing setup ciphers

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-12-07 21:56:38 UTC (rev 
7688)
+++ trunk/freenet/src/freenet/node/Version.java 2005-12-07 22:06:20 UTC (rev 
7689)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 287;
+       public static final int buildNumber = 288;

        /** Oldest build of Fred we will talk to */
-       public static final int lastGoodBuild = 287;
+       public static final int lastGoodBuild = 288;

        /** The highest reported build of fred */
        public static int highestSeenBuild = buildNumber;