Changeset 10694

Timestamp:

May 26, 2010, 3:23:21 PM (12 years ago)

Author:

charles

Message:

(trunk libT) define MAX_BLOCK_SIZE once instead of in a handful of places

Location:

trunk/libtransmission

Files:

• peer-common.h (modified) (2 diffs)
• peer-io.c (modified) (2 diffs)
• peer-msgs.c (modified) (1 diff)
• torrent.c (modified) (2 diffs)

trunk/libtransmission/peer-common.h

@@ -12 +12 @@
 
 #ifndef __TRANSMISSION__
-#error only libtransmission should #include this header.
+ #error only libtransmission should #include this header.
 #endif
 
@@ -34 +34 @@
         batch them together to send enough requests to
         meet our bandwidth goals for the next N seconds */
-    REQUEST_BUF_SECS = 10
+    REQUEST_BUF_SECS = 10,
+
+    /** this is the maximum size of a block request.
+        most bittorrent clients will reject requests
+        larger than this size. */
+    MAX_BLOCK_SIZE = ( 1024 * 16 )
+    
 };
 

trunk/libtransmission/peer-io.c

@@ -32 +32 @@
 #include "list.h"
 #include "net.h"
+#include "peer-common.h" /* MAX_BLOCK_SIZE */
 #include "peer-io.h"
 #include "trevent.h" /* tr_runInEventThread() */
@@ -721 +722 @@
      * or a few blocks, whichever is bigger.
      * It's okay to tweak this as needed */
-    const double maxBlockSize = 16 * 1024; /* 16 KiB is from BT spec */
     const double currentSpeed = tr_bandwidthGetPieceSpeed( &io->bandwidth, now, TR_UP );
     const double period = 15; /* arbitrary */
     const double numBlocks = 3.5; /* the 3 is arbitrary; the .5 is to leave room for messages */
-    return MAX( maxBlockSize*numBlocks, currentSpeed*1024*period );
+    return MAX( MAX_BLOCK_SIZE*numBlocks, currentSpeed*1024*period );
 }
 

trunk/libtransmission/peer-msgs.c

@@ -82 +82 @@
 
     METADATA_REQQ           = 64,
-
-    MAX_BLOCK_SIZE          = ( 1024 * 16 ),
 
     /* used in lowering the outMessages queue period */

trunk/libtransmission/torrent.c

@@ -36 +36 @@
 #include "magnet.h"
 #include "metainfo.h"
+#include "peer-common.h" /* MAX_BLOCK_SIZE */
 #include "peer-mgr.h"
 #include "platform.h" /* TR_PATH_DELIMITER_STR */
@@ -46 +47 @@
 #include "verify.h"
 #include "version.h"
-
-enum
-{
-    MAX_BLOCK_SIZE = 1024 * 16
-};
 
 /***