Author: toad
Date: 2008-11-13 19:42:01 +0000 (Thu, 13 Nov 2008)
New Revision: 23536
Modified:
branches/db4o/freenet/src/freenet/node/AnnounceSender.java
branches/db4o/freenet/src/freenet/node/Node.java
branches/db4o/freenet/src/freenet/node/NodeStarter.java
branches/db4o/freenet/src/freenet/node/PeerManager.java
branches/db4o/freenet/src/freenet/node/PeerNode.java
branches/db4o/freenet/src/freenet/node/Version.java
branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
branches/db4o/freenet/src/freenet/node/updater/UpdateDeployContext.java
Log:
Merge 1169 into db4o branch: 23166 to 23350.
Modified: branches/db4o/freenet/src/freenet/node/AnnounceSender.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/AnnounceSender.java 2008-11-13
19:37:41 UTC (rev 23535)
+++ branches/db4o/freenet/src/freenet/node/AnnounceSender.java 2008-11-13
19:42:01 UTC (rev 23536)
@@ -20,7 +20,7 @@
public class AnnounceSender implements PrioRunnable, ByteCounter {
// Constants
- static final int ACCEPTED_TIMEOUT = 5000;
+ static final int ACCEPTED_TIMEOUT = 10000;
static final int ANNOUNCE_TIMEOUT = 240000; // longer than a regular
request as have to transfer noderefs hop by hop etc
static final int END_TIMEOUT = 30000; // After received the completion
message, wait 30 seconds for any late reordered replies
Modified: branches/db4o/freenet/src/freenet/node/Node.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Node.java 2008-11-13 19:37:41 UTC
(rev 23535)
+++ branches/db4o/freenet/src/freenet/node/Node.java 2008-11-13 19:42:01 UTC
(rev 23536)
@@ -1570,7 +1570,7 @@
});
- nodeConfig.register("storeType", "bdb-index", sortOrder++,
true, true, "Node.storeType", "Node.storeTypeLong", new StoreTypeCallback());
+ nodeConfig.register("storeType", "salt-hash", sortOrder++,
true, true, "Node.storeType", "Node.storeTypeLong", new StoreTypeCallback());
storeType = nodeConfig.getString("storeType");
Modified: branches/db4o/freenet/src/freenet/node/NodeStarter.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeStarter.java 2008-11-13
19:37:41 UTC (rev 23535)
+++ branches/db4o/freenet/src/freenet/node/NodeStarter.java 2008-11-13
19:42:01 UTC (rev 23536)
@@ -33,7 +33,7 @@
private Node node;
private static LoggingConfigHandler logConfigHandler;
- public final static int RECOMMENDED_EXT_BUILD_NUMBER = 22;
+ public final static int RECOMMENDED_EXT_BUILD_NUMBER = 24;
/*
(File.separatorChar == '\\') &&
(System.getProperty("os.arch").toLowerCase().matches("(i?[x0-9]86_64|amd64)"))
? 6 : 2;
Modified: branches/db4o/freenet/src/freenet/node/PeerManager.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/PeerManager.java 2008-11-13
19:37:41 UTC (rev 23535)
+++ branches/db4o/freenet/src/freenet/node/PeerManager.java 2008-11-13
19:42:01 UTC (rev 23536)
@@ -31,6 +31,7 @@
import freenet.io.comm.ReferenceSignatureVerificationException;
import freenet.keys.Key;
import freenet.node.useralerts.PeerManagerUserAlert;
+import freenet.support.ByteArrayWrapper;
import freenet.support.Logger;
import freenet.support.ShortBuffer;
import freenet.support.SimpleFieldSet;
@@ -1647,7 +1648,7 @@
return (DarknetPeerNode[]) v.toArray(new
DarknetPeerNode[v.size()]);
}
- public Vector<SeedServerPeerNode>
getConnectedSeedServerPeersVector(HashSet exclude) {
+ public Vector<SeedServerPeerNode>
getConnectedSeedServerPeersVector(HashSet<ByteArrayWrapper> exclude) {
PeerNode[] peers;
synchronized(this) {
peers = myPeers;
@@ -1656,7 +1657,7 @@
Vector<SeedServerPeerNode> v = new
Vector<SeedServerPeerNode>(myPeers.length);
for(int i = 0; i < peers.length; i++) {
if(peers[i] instanceof SeedServerPeerNode) {
- if(exclude != null &&
exclude.contains(peers[i].getIdentity())) {
+ if(exclude != null && exclude.contains(new
ByteArrayWrapper(peers[i].getIdentity()))) {
if(logMINOR)
Logger.minor(this, "Not
including in getConnectedSeedServerPeersVector() as in exclude set: " +
peers[i].userToString());
continue;
Modified: branches/db4o/freenet/src/freenet/node/PeerNode.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/PeerNode.java 2008-11-13
19:37:41 UTC (rev 23535)
+++ branches/db4o/freenet/src/freenet/node/PeerNode.java 2008-11-13
19:42:01 UTC (rev 23536)
@@ -3913,7 +3913,7 @@
public static boolean shouldThrottle(Peer peer, Node node) {
if(node.throttleLocalData) return true;
if(peer == null) return true; // presumably
- InetAddress addr = peer.getAddress();
+ InetAddress addr = peer.getAddress(false);
if(addr == null) return true; // presumably
return IPUtil.isValidAddress(addr, false);
}
Modified: branches/db4o/freenet/src/freenet/node/Version.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Version.java 2008-11-13 19:37:41 UTC
(rev 23535)
+++ branches/db4o/freenet/src/freenet/node/Version.java 2008-11-13 19:42:01 UTC
(rev 23536)
@@ -24,17 +24,17 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 1167;
+ private static final int buildNumber = 1169;
/** Oldest build of Fred we will talk to */
- private static final int oldLastGoodBuild = 1165;
- private static final int newLastGoodBuild = 1166;
+ private static final int oldLastGoodBuild = 1168;
+ private static final int newLastGoodBuild = 1169;
static final long transitionTime;
static {
final Calendar _cal =
Calendar.getInstance(TimeZone.getTimeZone("GMT"));
// year, month - 1 (or constant), day, hour, minute, second
- _cal.set( 2008, Calendar.OCTOBER, 29, 0, 0, 0 );
+ _cal.set( 2008, Calendar.NOVEMBER, 10, 0, 0, 0 );
transitionTime = _cal.getTimeInMillis();
}
Modified: branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
2008-11-13 19:37:41 UTC (rev 23535)
+++ branches/db4o/freenet/src/freenet/node/updater/NodeUpdater.java
2008-11-13 19:42:01 UTC (rev 23536)
@@ -181,6 +181,7 @@
synchronized(this) {
writtenVersion = fetched;
}
+ System.err.println("Written "+(extUpdate ? "ext" : "main")+"
jar to "+fNew);
}
public void onSuccess(FetchResult result, ClientGetter state,
ObjectContainer container) {
Modified:
branches/db4o/freenet/src/freenet/node/updater/UpdateDeployContext.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/updater/UpdateDeployContext.java
2008-11-13 19:37:41 UTC (rev 23535)
+++ branches/db4o/freenet/src/freenet/node/updater/UpdateDeployContext.java
2008-11-13 19:42:01 UTC (rev 23536)
@@ -152,9 +152,11 @@
if(line.startsWith("wrapper.java.classpath.")) {
if(writtenNewJar &&
line.startsWith("wrapper.java.classpath."+mainClasspathNo+'=')) {
bw.write("wrapper.java.classpath."+mainClasspathNo+'='+newMain+'\n');
+ System.err.println("Rewritten
wrapper.conf for main jar");
writtenMain = true;
} else if(writtenNewExt &&
line.startsWith("wrapper.java.classpath."+extClasspathNo+'=')) {
bw.write("wrapper.java.classpath."+extClasspathNo+'='+newExt+'\n');
+ System.err.println("Rewritten
wrapper.conf for ext jar");
writtenExt = true;
} else {
bw.write(line+'\n');
@@ -189,7 +191,9 @@
}
// New config installed.
-
+
+ System.err.println("Rewritten wrapper.conf for"+(writtenNewJar
? (" new main jar: "+newMainJar) : "")+(writtenNewExt ? (" new ext jar:
"+newExtJar): ""));
+
}
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
