[freenet-cvs] r17689 - trunk/freenet/src/freenet/io/xfer

[t...@freenetproject.org]

Author: toad
Date: 2008-02-07 23:36:30 +0000 (Thu, 07 Feb 2008)
New Revision: 17689

Modified:
   trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
Log:
Move constants around for clarity

Modified: trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockReceiver.java        2008-02-07 
23:35:40 UTC (rev 17688)
+++ trunk/freenet/src/freenet/io/xfer/BlockReceiver.java        2008-02-07 
23:36:30 UTC (rev 17689)
@@ -40,9 +40,6 @@
  */
 public class BlockReceiver implements AsyncMessageFilterCallback {

-       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;
        /*
         * FIXME: Is this a good idea?
         * RECEIPT_TIMEOUT must be less than 60 seconds because 
BlockTransmitter times out after not
@@ -50,6 +47,9 @@
         * 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.
         */
+       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_SEND_INTERVAL = 500;
        public static final int CLEANUP_TIMEOUT = 5000;