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

[toad at freenetproject.org]

Author: toad
Date: 2007-02-09 01:39:40 +0000 (Fri, 09 Feb 2007)
New Revision: 11700

Modified:
   trunk/freenet/src/freenet/node/NodeARKInserter.java
Log:
Insert both ARKs

Modified: trunk/freenet/src/freenet/node/NodeARKInserter.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeARKInserter.java	2007-02-09 01:36:55 UTC (rev 11699)
+++ trunk/freenet/src/freenet/node/NodeARKInserter.java	2007-02-09 01:39:40 UTC (rev 11700)
@@ -17,6 +17,7 @@
 import freenet.io.comm.Peer;
 import freenet.io.comm.PeerParseException;
 import freenet.keys.FreenetURI;
+import freenet.keys.InsertableClientSSK;
 import freenet.support.Logger;
 import freenet.support.SimpleFieldSet;
 import freenet.support.SimpleReadOnlyArrayBucket;
@@ -30,6 +31,7 @@
 	private final Node node;
 	private final NodeIPDetector detector;
 	private static boolean logMINOR;
+	private final boolean old;
 
 	/**
 	 * @param node
@@ -38,6 +40,7 @@
 	NodeARKInserter(Node node, NodeIPDetector detector, boolean old) {
 		this.node = node;
 		this.detector = detector;
+		this.old = old;
 		logMINOR = Logger.shouldLog(Logger.MINOR, this);
 	}
 
@@ -127,7 +130,9 @@
 		
 		Bucket b = new SimpleReadOnlyArrayBucket(buf);
 		
-		FreenetURI uri = this.node.myARK.getInsertURI().setKeyType("USK").setSuggestedEdition(this.node.myARKNumber);
+		long number = old ? node.myOldARKNumber : node.myARKNumber;
+		InsertableClientSSK ark = old ? node.myOldARK : node.myARK;
+		FreenetURI uri = ark.getInsertURI().setKeyType("USK").setSuggestedEdition(number);
 		
 		if(logMINOR) Logger.minor(this, "Inserting ARK: "+uri);