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

[zothar at freenetproject.org]

Author: zothar
Date: 2008-01-06 19:13:24 +0000 (Sun, 06 Jan 2008)
New Revision: 16945

Modified:
   trunk/freenet/src/freenet/node/DarknetPeerNode.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Add method interface support for differential node references, to be actually implemented later

Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java	2008-01-06 18:48:57 UTC (rev 16944)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java	2008-01-06 19:13:24 UTC (rev 16945)
@@ -154,8 +154,8 @@
 		return true;
     }
     
-    protected synchronized boolean innerProcessNewNoderef(SimpleFieldSet fs, boolean forARK) throws FSParseException {
-    	boolean changedAnything = super.innerProcessNewNoderef(fs, forARK);
+    protected synchronized boolean innerProcessNewNoderef(SimpleFieldSet fs, boolean forARK, boolean forDiffNodeRef) throws FSParseException {
+    	boolean changedAnything = super.innerProcessNewNoderef(fs, forARK, forDiffNodeRef);
         String name = fs.get("myName");
         if(name != null && !name.equals(myName)) {
         	changedAnything = true;

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java	2008-01-06 18:48:57 UTC (rev 16944)
+++ trunk/freenet/src/freenet/node/PeerNode.java	2008-01-06 19:13:24 UTC (rev 16945)
@@ -1933,7 +1933,7 @@
 	*/
 	private void processNewNoderef(byte[] data, int offset, int length) throws FSParseException {
 		SimpleFieldSet fs = compressedNoderefToFieldSet(data, offset, length);
-		processNewNoderef(fs, false);
+		processNewNoderef(fs, false, false);
 	}
 
 	static SimpleFieldSet compressedNoderefToFieldSet(byte[] data, int offset, int length) throws FSParseException {
@@ -1989,10 +1989,10 @@
 	/**
 	* Process a new nodereference, as a SimpleFieldSet.
 	*/
-	private void processNewNoderef(SimpleFieldSet fs, boolean forARK) throws FSParseException {
+	private void processNewNoderef(SimpleFieldSet fs, boolean forARK, boolean forDiffNodeRef) throws FSParseException {
 		if(logMINOR)
 			Logger.minor(this, "Parsing: \n" + fs);
-		boolean changedAnything = innerProcessNewNoderef(fs, forARK);
+		boolean changedAnything = innerProcessNewNoderef(fs, forARK, forDiffNodeRef);
 		if(changedAnything)
 			node.peers.writePeers();
 	}
@@ -2001,7 +2001,7 @@
 	* The synchronized part of processNewNoderef 
 	* @throws FSParseException
 	*/
-	protected synchronized boolean innerProcessNewNoderef(SimpleFieldSet fs, boolean forARK) throws FSParseException {
+	protected synchronized boolean innerProcessNewNoderef(SimpleFieldSet fs, boolean forARK, boolean forDiffNodeRef) throws FSParseException {
 		boolean changedAnything = false;
 		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;
@@ -2608,7 +2608,7 @@
 				if(myARK.suggestedEdition < fetchedEdition + 1)
 					myARK = myARK.copy(fetchedEdition + 1);
 			}
-			processNewNoderef(fs, true);
+			processNewNoderef(fs, true, false);
 		} catch(FSParseException e) {
 			Logger.error(this, "Invalid ARK update: " + e, e);
 			// This is ok as ARKs are limited to 4K anyway.