[freenet-cvs] r8313 - in trunk/freenet/src/freenet: client/async node

[t...@freenetproject.org]

Author: toad
Date: 2006-03-25 16:56:53 +0000 (Sat, 25 Mar 2006)
New Revision: 8313

Modified:
   trunk/freenet/src/freenet/client/async/USKInserter.java
   trunk/freenet/src/freenet/node/TextModeClientInterface.java
   trunk/freenet/src/freenet/node/Version.java
Log:
572:
- Allow inserts of USKs from TMCI.
- USK inserts: Never use an earlier slot than that suggested.

Modified: trunk/freenet/src/freenet/client/async/USKInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKInserter.java     2006-03-25 
16:36:47 UTC (rev 8312)
+++ trunk/freenet/src/freenet/client/async/USKInserter.java     2006-03-25 
16:56:53 UTC (rev 8313)
@@ -131,7 +131,6 @@
        public USKInserter(BaseClientPutter parent, Bucket data, short 
compressionCodec, FreenetURI uri, 
                        InserterContext ctx, PutCompletionCallback cb, boolean 
isMetadata, int sourceLength, int token, 
                        boolean getCHKOnly, boolean addToParent) throws 
MalformedURLException {
-               edition = -1;
                this.parent = parent;
                this.data = data;
                this.compressionCodec = compressionCodec;
@@ -148,6 +147,7 @@
                }
                privUSK = InsertableUSK.create(uri);
                pubUSK = privUSK.getUSK();
+               edition = pubUSK.suggestedEdition;
        }

        public BaseClientPutter getParent() {

Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-03-25 
16:36:47 UTC (rev 8312)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-03-25 
16:56:53 UTC (rev 8313)
@@ -13,6 +13,7 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.MalformedURLException;
+import java.net.SocketException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.HashMap;
@@ -95,7 +96,7 @@
         while(true) {
             try {
                 processLine(reader,out);
-            } catch (IOException e) {
+            } catch (SocketException e) {
                Logger.error(this, "Socket error: "+e, e);
                return;
             } catch (Throwable t) {
@@ -484,11 +485,9 @@
                outsb.append("Target URI: "+targetURI);
                FreenetURI insert = new FreenetURI(insertURI);
                FreenetURI target = new FreenetURI(targetURI);
-               InsertableClientSSK key = InsertableClientSSK.create(insert);
-               outsb.append("Fetch URI: "+key.getURI());
                try {
                                FreenetURI result = 
client.insertRedirect(insert, target);
-                               outsb.append("Successfully inserted to fetch 
URI: "+key.getURI());
+                               outsb.append("Successfully inserted to fetch 
URI: "+result);
                        } catch (InserterException e) {
                outsb.append("Finished insert but: "+e.getMessage());
                Logger.normal(this, "Error: "+e, e);

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-25 16:36:47 UTC (rev 
8312)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-25 16:56:53 UTC (rev 
8313)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 507;