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

[toad at freenetproject.org]

Author: toad
Date: 2007-07-06 18:50:26 +0000 (Fri, 06 Jul 2007)
New Revision: 13961

Modified:
   trunk/freenet/src/freenet/node/DarknetPeerNode.java
   trunk/freenet/src/freenet/node/OpennetPeerNode.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Include opennet=true/false on noderef as saved/exported by PeerNode

Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java	2007-07-06 18:31:29 UTC (rev 13960)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java	2007-07-06 18:50:26 UTC (rev 13961)
@@ -1481,4 +1481,8 @@
 	public PeerNodeStatus getStatus() {
 		return new DarknetPeerNodeStatus(this);
 	}
+
+	public boolean isOpennet() {
+		return false;
+	}
 }

Modified: trunk/freenet/src/freenet/node/OpennetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetPeerNode.java	2007-07-06 18:31:29 UTC (rev 13960)
+++ trunk/freenet/src/freenet/node/OpennetPeerNode.java	2007-07-06 18:50:26 UTC (rev 13961)
@@ -18,4 +18,8 @@
 		if(!node.isOpennetEnabled()) return false;
 		return super.isRoutingCompatible();
 	}
+
+	public boolean isOpennet() {
+		return true;
+	}
 }

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java	2007-07-06 18:31:29 UTC (rev 13960)
+++ trunk/freenet/src/freenet/node/PeerNode.java	2007-07-06 18:50:26 UTC (rev 13961)
@@ -1919,10 +1919,13 @@
 			fs.putSingle("ark.number", Long.toString(myARK.suggestedEdition - 1));
 			fs.putSingle("ark.pubURI", myARK.getBaseSSK().toString(false, false));
 		}
+		fs.put("opennet", isOpennet());
         return fs;
     }
 
-    /**
+    public abstract boolean isOpennet();
+
+	/**
      * @return The time at which we last connected (or reconnected).
      */
     public synchronized long timeLastConnectionCompleted() {