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

[t...@freenetproject.org]

Author: toad
Date: 2006-03-29 22:38:52 +0000 (Wed, 29 Mar 2006)
New Revision: 8358

Modified:
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/Version.java
Log:
588: Fix connection problems.

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java        2006-03-29 
20:24:57 UTC (rev 8357)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java        2006-03-29 
22:38:52 UTC (rev 8358)
@@ -1275,7 +1275,7 @@
         Logger.minor(this, "Possibly sending handshake to "+pn);
         DiffieHellmanContext ctx;
         synchronized(pn) {
-            if(!pn.shouldSendHandshake() || pn.getHandshakeIPs().length == 0) {
+            if((!pn.shouldSendHandshake()) || pn.getHandshakeIPs().length == 
0) {
                 return;
             } else {
                 ctx = DiffieHellman.generateContext();

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-03-29 20:24:57 UTC (rev 
8357)
+++ trunk/freenet/src/freenet/node/Node.java    2006-03-29 22:38:52 UTC (rev 
8358)
@@ -1912,6 +1912,7 @@
         }
         try {
             osw.flush();
+            gis.close();
         } catch (IOException e1) {
             throw new Error(e1);
         }

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2006-03-29 20:24:57 UTC 
(rev 8357)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2006-03-29 22:38:52 UTC 
(rev 8358)
@@ -809,7 +809,7 @@
             Inflater i = new Inflater();
             i.setInput(data, offset+1, length-1);
             byte[] output = new byte[4096];
-            int outputPointer = 0;
+            int outputPointer = 1;
             while(true) {
                 try {
                     int x = i.inflate(output, outputPointer, 
output.length-outputPointer);
@@ -830,6 +830,7 @@
                 }
             }
         }
+        Logger.minor(this, "Reference: "+new String(data, offset, 
length)+"("+length+")");
         // Now decode it
         ByteArrayInputStream bais = new ByteArrayInputStream(data, offset+1, 
length-1);
         InputStreamReader isr;

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-29 20:24:57 UTC (rev 
8357)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-29 22:38:52 UTC (rev 
8358)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 587;
+       private static final int buildNumber = 588;

        /** Oldest build of Fred we will talk to */
-       private static final int lastGoodBuild = 587;
+       private static final int lastGoodBuild = 588;

        public static final int buildNumber() {
                return buildNumber;