Author: toad
Date: 2008-11-29 19:26:48 +0000 (Sat, 29 Nov 2008)
New Revision: 23983
Modified:
branches/db4o/freenet/
branches/db4o/freenet/src/freenet/l10n/freenet.l10n.en.properties
branches/db4o/freenet/src/freenet/node/PacketSender.java
branches/db4o/freenet/src/freenet/node/PeerNode.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 1178
Property changes on: branches/db4o/freenet
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet:19964-23586
+ /trunk/freenet:19964-23592
Modified: branches/db4o/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- branches/db4o/freenet/src/freenet/l10n/freenet.l10n.en.properties
2008-11-29 19:24:27 UTC (rev 23982)
+++ branches/db4o/freenet/src/freenet/l10n/freenet.l10n.en.properties
2008-11-29 19:26:48 UTC (rev 23983)
@@ -474,8 +474,6 @@
FileOffer.succeededReceiveShort=Successfully received ${filename} from ${node}.
FNPPacketMangler.somePeersDisconnectedStillNotAcked=Probably a bug: please
report: ${count} peers forcibly disconnected due to not acknowledging packets.
FNPPacketMangler.somePeersDisconnectedStillNotAckedDetail=${count} of your
peers are having severe problems (not acknowledging packets even after 10
minutes). This is probably due to a bug in the code. Please report it to us at
the bug tracker at ${link}https://bugs.freenetproject.org/${/link} or at [EMAIL
PROTECTED] Please include this message and what version of the node you are
running. The affected peers (you may not want to include this in your bug
report if they are darknet peers) are:
-PacketSender.somePeersDisconnectedStillNotAcked=Probably a bug: please report:
${count} peers forcibly disconnected due to blocking for a packet number for
over 10 minutes.
-PacketSender.somePeersDisconnectedStillNotAckedDetail=${count} of your peers
are having severe problems (failing to allocate a packet number after 10
minutes). This is probably due to a bug in the code. Please report it to us at
the bug tracker at ${link}https://bugs.freenetproject.org/${/link} or at [EMAIL
PROTECTED] Please include this message and what version of the node you are
running. The affected peers (you may not want to include this in your bug
report if they are darknet peers) are:
GIFFilter.invalidHeader=The file does not contain a valid GIF header.
GIFFilter.invalidHeaderTitle=Invalid header
GIFFilter.notGif=The file you tried to fetch is not a GIF. It might be some
other file format, and your browser may do something dangerous with it,
therefore we have blocked it.
@@ -825,6 +823,8 @@
OpennetConnectionsToadlet.successTime=Last time there was a successful CHK
fetch from the node
OpennetConnectionsToadlet.fullTitle=${counts} Strangers (Untrusted Peers) of
${name}
OpennetConnectionsToadlet.peersListTitle=My Opennet Peers (untrusted peers
added by the node in low/normal network security level)
+PacketSender.somePeersDisconnectedBlockedTooLong=Probably a bug: please
report: ${count} peers forcibly disconnected due to blocking for a packet
number for over 10 minutes.
+PacketSender.somePeersDisconnectedBlockedTooLongDetail=${count} of your peers
are having severe problems (failing to allocate a packet number after 10
minutes). This is probably due to a bug in the code. Please report it to us at
the bug tracker at ${link}https://bugs.freenetproject.org/${/link} or at [EMAIL
PROTECTED] Please include this message and what version of the node you are
running. The affected peers (you may not want to include this in your bug
report if they are darknet peers) are:
PNGFilter.invalidHeader=The file you tried to fetch is not a PNG. It does not
include a valid PNG header. It might be some other file format, and your
browser may do something dangerous with it, therefore we have blocked it.
PNGFilter.invalidHeaderTitle=Not a PNG - invalid header
PeerManagerUserAlert.connErrorTitle=Some peers cannot connect
Modified: branches/db4o/freenet/src/freenet/node/PacketSender.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/PacketSender.java 2008-11-29
19:24:27 UTC (rev 23982)
+++ branches/db4o/freenet/src/freenet/node/PacketSender.java 2008-11-29
19:26:48 UTC (rev 23983)
@@ -460,7 +460,7 @@
synchronized(peersDumpedBlockedTooLong) {
peers = peersDumpedBlockedTooLong.toArray(new
Peer[peersDumpedBlockedTooLong.size()]);
}
- L10n.addL10nSubstitution(div,
"FNPPacketMangler.somePeersDisconnectedBlockedTooLongDetail",
+ L10n.addL10nSubstitution(div,
"PacketSender.somePeersDisconnectedBlockedTooLongDetail",
new String[] { "count", "link", "/link"
}
, new String[] {
Integer.toString(peers.length), "<a
href=\"/?_CHECKED_HTTP_=https://bugs.freenetproject.org/\";>", "</a>" });
HTMLNode list = div.addChild("ul");
Modified: branches/db4o/freenet/src/freenet/node/PeerNode.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/PeerNode.java 2008-11-29
19:24:27 UTC (rev 23982)
+++ branches/db4o/freenet/src/freenet/node/PeerNode.java 2008-11-29
19:26:48 UTC (rev 23983)
@@ -1279,8 +1279,9 @@
if(kt.hasPacketsToResend()) return now;
}
try {
- if(!cur.wouldBlock(false))
+ if(cur != null && !cur.wouldBlock(false))
t = messageQueue.getNextUrgentTime(t, now);
+ // If there isn't a current tracker, no point worrying
about it as we won't be able to send it anyway...
} catch (BlockedTooLongException e) {
// Ignore for now, it will come back around
}
Modified: branches/db4o/freenet/src/freenet/node/Version.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Version.java 2008-11-29 19:24:27 UTC
(rev 23982)
+++ branches/db4o/freenet/src/freenet/node/Version.java 2008-11-29 19:26:48 UTC
(rev 23983)
@@ -24,11 +24,11 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 1177;
+ private static final int buildNumber = 1178;
/** Oldest build of Fred we will talk to */
private static final int oldLastGoodBuild = 1175;
- private static final int newLastGoodBuild = 1177;
+ private static final int newLastGoodBuild = 1178;
static final long transitionTime;
static {
Property changes on:
branches/db4o/freenet/src/freenet/support/BinaryBloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-23586
+ /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-23592
Property changes on: branches/db4o/freenet/src/freenet/support/BloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/BloomFilter.java:22002-23586
+ /trunk/freenet/src/freenet/support/BloomFilter.java:22002-23592
Property changes on:
branches/db4o/freenet/src/freenet/support/CountingBloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-23586
+ /trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-23592
Property changes on:
branches/db4o/freenet/test/freenet/support/io/MockInputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-23586
+ /trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-23592
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
