Author: toad
Date: 2008-11-29 19:29:20 +0000 (Sat, 29 Nov 2008)
New Revision: 23984
Modified:
branches/db4o/freenet/
branches/db4o/freenet/src/freenet/keys/FreenetURI.java
branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
branches/db4o/freenet/src/freenet/node/KeyTracker.java
branches/db4o/freenet/src/freenet/node/PacketSender.java
branches/db4o/freenet/src/freenet/node/Version.java
branches/db4o/freenet/src/freenet/support/BinaryBloomFilter.java
branches/db4o/freenet/src/freenet/support/BloomFilter.java
branches/db4o/freenet/src/freenet/support/CountingBloomFilter.java
branches/db4o/freenet/test/freenet/support/io/MockInputStream.java
Log:
Merge 1179
Property changes on: branches/db4o/freenet
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet:19964-23592
+ /trunk/freenet:19964-23606
Modified: branches/db4o/freenet/src/freenet/keys/FreenetURI.java
===================================================================
--- branches/db4o/freenet/src/freenet/keys/FreenetURI.java 2008-11-29
19:26:48 UTC (rev 23983)
+++ branches/db4o/freenet/src/freenet/keys/FreenetURI.java 2008-11-29
19:29:20 UTC (rev 23984)
@@ -143,6 +143,13 @@
return true;
}
}
+
+ public boolean equalsKeypair(FreenetURI u2) {
+ if((routingKey != null) && (cryptoKey != null))
+ return Arrays.equals(routingKey, u2.routingKey) &&
Arrays.equals(cryptoKey, u2.cryptoKey);
+
+ return false;
+ }
@Override
public final Object clone() {
Modified: branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
2008-11-29 19:26:48 UTC (rev 23983)
+++ branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
2008-11-29 19:29:20 UTC (rev 23984)
@@ -7,9 +7,11 @@
import java.math.BigInteger;
import java.security.MessageDigest;
import java.util.Arrays;
+import java.util.Calendar;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
+import java.util.TimeZone;
import net.i2p.util.NativeBigInteger;
import freenet.crypt.BlockCipher;
@@ -2563,13 +2565,24 @@
return ret;
}
+ static long bugValidTime;
+ static {
+ final Calendar _cal =
Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+ // year, month - 1 (or constant), day, hour, minute, second
+ _cal.set( 2008, Calendar.NOVEMBER, 17, 0, 0, 0 );
+ long bugValidTime = _cal.getTimeInMillis();
+ }
+
private HashSet<Peer> peersWithProblems = new HashSet<Peer>();
private void disconnectedStillNotAcked(KeyTracker tracker) {
+ if(System.currentTimeMillis() < bugValidTime) return;
synchronized(peersWithProblems) {
peersWithProblems.add(tracker.pn.getPeer());
if(peersWithProblems.size() > 1) return;
}
+ if(node.clientCore == null || node.clientCore.alerts == null)
+ return;
node.clientCore.alerts.register(disconnectedStillNotAckedAlert);
}
Modified: branches/db4o/freenet/src/freenet/node/KeyTracker.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/KeyTracker.java 2008-11-29
19:26:48 UTC (rev 23983)
+++ branches/db4o/freenet/src/freenet/node/KeyTracker.java 2008-11-29
19:29:20 UTC (rev 23984)
@@ -745,8 +745,8 @@
return true;
} else {
if(timeWouldBlock != -1) {
+ long delta = now - timeWouldBlock;
timeWouldBlock = -1;
- long delta = now - timeWouldBlock;
if(delta >
PacketSender.MAX_COALESCING_DELAY) {
Logger.error(this, "Waking
PacketSender: have been blocking for packet ack for
"+TimeUtil.formatTime(delta));
} else return false;
Modified: branches/db4o/freenet/src/freenet/node/PacketSender.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/PacketSender.java 2008-11-29
19:26:48 UTC (rev 23983)
+++ branches/db4o/freenet/src/freenet/node/PacketSender.java 2008-11-29
19:29:20 UTC (rev 23984)
@@ -4,8 +4,10 @@
package freenet.node;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.HashSet;
import java.util.List;
+import java.util.TimeZone;
import java.util.TreeMap;
import java.util.Vector;
@@ -421,14 +423,25 @@
return brokeAt;
}
+ static long bugValidTime;
+ static {
+ final Calendar _cal =
Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+ // year, month - 1 (or constant), day, hour, minute, second
+ _cal.set( 2008, Calendar.NOVEMBER, 17, 0, 0, 0 );
+ long bugValidTime = _cal.getTimeInMillis();
+ }
+
private HashSet<Peer> peersDumpedBlockedTooLong = new HashSet<Peer>();
private void onForceDisconnectBlockTooLong(PeerNode pn,
BlockedTooLongException e) {
+ if(System.currentTimeMillis() < bugValidTime) return;
Peer p = pn.getPeer();
synchronized(peersDumpedBlockedTooLong) {
peersDumpedBlockedTooLong.add(p);
if(peersDumpedBlockedTooLong.size() > 1) return;
}
+ if(node.clientCore == null || node.clientCore.alerts == null)
+ return;
node.clientCore.alerts.register(peersDumpedBlockedTooLongAlert);
}
Modified: branches/db4o/freenet/src/freenet/node/Version.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Version.java 2008-11-29 19:26:48 UTC
(rev 23983)
+++ branches/db4o/freenet/src/freenet/node/Version.java 2008-11-29 19:29:20 UTC
(rev 23984)
@@ -24,7 +24,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 1178;
+ private static final int buildNumber = 1179;
/** Oldest build of Fred we will talk to */
private static final int oldLastGoodBuild = 1175;
Property changes on:
branches/db4o/freenet/src/freenet/support/BinaryBloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-23592
+ /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-23606
Property changes on: branches/db4o/freenet/src/freenet/support/BloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/BloomFilter.java:22002-23592
+ /trunk/freenet/src/freenet/support/BloomFilter.java:22002-23606
Property changes on:
branches/db4o/freenet/src/freenet/support/CountingBloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-23592
+ /trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-23606
Property changes on:
branches/db4o/freenet/test/freenet/support/io/MockInputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-23592
+ /trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-23606
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
