Author: toad
Date: 2006-05-12 14:57:26 +0000 (Fri, 12 May 2006)
New Revision: 8676
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/Version.java
Log:
697: More ARK insert fixes.
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-05-12 14:04:52 UTC (rev
8675)
+++ trunk/freenet/src/freenet/node/Node.java 2006-05-12 14:57:26 UTC (rev
8676)
@@ -124,9 +124,15 @@
public void update() {
Logger.minor(this, "update()");
- if(lastIPAddress == null) return; // no point inserting
+ if(lastIPAddress == null) {
+ Logger.minor(this, "Not inserting because no IP
address");
+ return; // no point inserting
+ }
Peer p = new Peer(lastIPAddress, Node.this.portNumber);
- if(p.strictEquals(lastInsertedAddress)) return;
+ if(p.strictEquals(lastInsertedAddress)) {
+ Logger.minor(this, "Not inserting ARK because
"+p+" equals "+lastInsertedAddress);
+ return;
+ }
Logger.minor(this, "Inserting ARK because "+p+" !=
"+lastInsertedAddress);
synchronized(this) {
if(inserter != null) {
@@ -804,18 +810,19 @@
// Set to null
overrideIPAddress = null;
lastIPAddress = null;
+ redetectAddress();
shouldInsertARK();
return;
}
InetAddress addr;
try {
addr = InetAddress.getByName(val);
- shouldInsertARK();
} catch (UnknownHostException e) {
throw new
InvalidConfigValueException("Unknown host: "+e.getMessage());
}
overrideIPAddress = addr;
lastIPAddress = null;
+ redetectAddress();
shouldInsertARK();
}
@@ -1276,6 +1283,7 @@
persistentTempBucketFactory.completedInit();
+ redetectAddress();
shouldInsertARK();
Thread t = new Thread(ipDetector, "IP address re-detector");
@@ -1782,6 +1790,7 @@
InetAddress detectPrimaryIPAddress() {
if(overrideIPAddress != null) {
Logger.minor(this, "Returning overridden address:
"+overrideIPAddress);
+ lastIPAddress = overrideIPAddress;
return overrideIPAddress;
}
Logger.minor(this, "IP address not overridden");
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-12 14:04:52 UTC (rev
8675)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-12 14:57:26 UTC (rev
8676)
@@ -3,8 +3,6 @@
import freenet.support.Fields;
import freenet.support.Logger;
-import java.util.StringTokenizer;
-
/**
* Central spot for stuff related to the versioning of the codebase.
*/
@@ -20,7 +18,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 696;
+ private static final int buildNumber = 697;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 591;
