Author: robert
Date: 2008-02-08 17:05:30 +0000 (Fri, 08 Feb 2008)
New Revision: 17699
Modified:
trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
Log:
revert 17687 & comment
Modified: trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockReceiver.java 2008-02-08
15:59:42 UTC (rev 17698)
+++ trunk/freenet/src/freenet/io/xfer/BlockReceiver.java 2008-02-08
17:05:30 UTC (rev 17699)
@@ -41,16 +41,14 @@
public class BlockReceiver implements AsyncMessageFilterCallback {
/*
- * FIXME: Is this a good idea?
* RECEIPT_TIMEOUT must be less than 60 seconds because
BlockTransmitter times out after not
- * hearing from us in 60 seconds. I increased
MAX_CONSECUTIVE_PACKET_REPORTS to 8 to avoid
- * some timeouts, and on the theory that even though the request
handler will have already
- * timed out, we can still offer it after we've got the data completely.
+ * hearing from us in 60 seconds. Without contact from the transmitter,
we will try sending
+ * at most MAX_CONSECUTIVE_MISSING_PACKET_REPORTS every RECEIPT_TIMEOUT
to recover.
*/
public static final int RECEIPT_TIMEOUT = 30000;
// TODO: This should be proportional to the calculated round-trip-time,
not a constant
public static final int MAX_ROUND_TRIP_TIME = RECEIPT_TIMEOUT;
- public static final int MAX_CONSECUTIVE_MISSING_PACKET_REPORTS = 8;
+ public static final int MAX_CONSECUTIVE_MISSING_PACKET_REPORTS = 4;
public static final int MAX_SEND_INTERVAL = 500;
public static final int CLEANUP_TIMEOUT = 5000;
PartiallyReceivedBlock _prb;
