Author: toad
Date: 2009-04-08 14:21:57 +0000 (Wed, 08 Apr 2009)
New Revision: 26650
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeARKInserter.java
trunk/freenet/src/freenet/node/OpennetManager.java
Log:
Write the opennet file when we find the URI for the opennet ARK. Not the node
file!
Saves a lot of USK polling on startup.
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2009-04-08 13:37:06 UTC (rev
26649)
+++ trunk/freenet/src/freenet/node/Node.java 2009-04-08 14:21:57 UTC (rev
26650)
@@ -598,6 +598,11 @@
}
}
+ public void writeOpennetFile() {
+ OpennetManager om = opennet;
+ if(om != null) om.writeFile();
+ }
+
private void writeNodeFile(File orig, File backup) {
SimpleFieldSet fs = darknetCrypto.exportPrivateFieldSet();
Modified: trunk/freenet/src/freenet/node/NodeARKInserter.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeARKInserter.java 2009-04-08 13:37:06 UTC
(rev 26649)
+++ trunk/freenet/src/freenet/node/NodeARKInserter.java 2009-04-08 14:21:57 UTC
(rev 26650)
@@ -231,7 +231,10 @@
} else if(l > crypto.myARKNumber) {
if(logMINOR) Logger.minor(this, darknetOpennetString +
" ARK number moving from "+crypto.myARKNumber+" to "+l);
crypto.myARKNumber = l;
- node.writeNodeFile();
+ if(crypto.isOpennet)
+ node.writeOpennetFile();
+ else
+ node.writeNodeFile();
// We'll broadcast the new ARK edition to our connected
peers via a differential node reference
SimpleFieldSet fs = new SimpleFieldSet(true);
fs.putSingle("ark.number",
Long.toString(crypto.myARKNumber));
Modified: trunk/freenet/src/freenet/node/OpennetManager.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetManager.java 2009-04-08 13:37:06 UTC
(rev 26649)
+++ trunk/freenet/src/freenet/node/OpennetManager.java 2009-04-08 14:21:57 UTC
(rev 26650)
@@ -162,6 +162,12 @@
}
}
+ public void writeFile() {
+ File nodeFile = new File(node.nodeDir,
"opennet-"+crypto.portNumber);
+ File backupNodeFile = new
File("opennet-"+crypto.portNumber+".bak");
+ writeFile(nodeFile, backupNodeFile);
+ }
+
private void writeFile(File orig, File backup) {
logMINOR = Logger.shouldLog(Logger.MINOR, this);
SimpleFieldSet fs = crypto.exportPrivateFieldSet();
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
