Add blkretryinterval and txretryinterval arguments.

Fixes bitcoin#649

Author: Neil Booth

src/allowed_args.cpp

@@ -14,6 +14,7 @@
 #include "net.h"
 #include "policy/policy.h"
 #include "qt/guiconstants.h"
+#include "requestManager.h"
 #include "script/sigcache.h"
 #include "tinyformat.h"
 #include "torcontrol.h"
@@ -282,6 +283,9 @@ static void addConnectionOptions(AllowedArgs &allowedArgs)
             _("Bind to given address and always listen on it. Use [host]:port notation for IPv6"))
         .addArg("bitnodes", optionalBool,
             _("Query for peer addresses via Bitnodes API, if low on addresses (default: 1 unless -connect)"))
+        .addArg("blkretryinterval", requiredInt,
+            strprintf(_("Time to wait before requesting a block from a different peer, in microseconds (default: %u)"),
+                    DEFAULT_MIN_BLK_REQUEST_RETRY_INTERVAL))
         .addArg("connect=<ip>", optionalStr, _("Connect only to the specified node(s)"))
         .addArg("connect-thinblock=<ip:port>", requiredStr,
             _("Connect to a thinblock node(s). Blocks will only be downloaded from a thinblock peer.  If no "
@@ -341,6 +345,9 @@ static void addConnectionOptions(AllowedArgs &allowedArgs)
         .addArg("torcontrol=<ip>:<port>", requiredStr,
             strprintf(_("Tor control port to use if onion listening enabled (default: %s)"), DEFAULT_TOR_CONTROL))
         .addArg("torpassword=<pass>", requiredStr, _("Tor control port password (default: empty)"))
+        .addArg("txretryinterval", requiredInt,
+            strprintf(_("Time to wait before requesting a tx from a different peer, in microseconds (default: %u)"),
+                    DEFAULT_MIN_TX_REQUEST_RETRY_INTERVAL))
 #ifdef USE_UPNP
 #if USE_UPNP
         .addArg("upnp", optionalBool, _("Use UPnP to map the listening port (default: 1 when listening and no -proxy)"))

src/requestManager.cpp

@@ -45,9 +45,9 @@ extern CRequestManager requester;
 unsigned int ACCEPTABLE_PING_USEC = 25*1000;
 
 // When should I request an object from someone else (in microseconds)
-unsigned int MIN_TX_REQUEST_RETRY_INTERVAL = 5 * 1000 * 1000;
+unsigned int MIN_TX_REQUEST_RETRY_INTERVAL = DEFAULT_MIN_TX_REQUEST_RETRY_INTERVAL;
 // When should I request a block from someone else (in microseconds)
-unsigned int MIN_BLK_REQUEST_RETRY_INTERVAL = 5 * 1000 * 1000;
+unsigned int MIN_BLK_REQUEST_RETRY_INTERVAL = DEFAULT_MIN_BLK_REQUEST_RETRY_INTERVAL;
 
 // defined in main.cpp.  should be moved into a utilities file but want to make rebasing easier
 extern bool CanDirectFetch(const Consensus::Params &consensusParams);

src/requestManager.h

@@ -30,8 +30,10 @@ successful receipt, "requester.Rejected(...)" to indicate a bad object (request
 #include "stat.h"
 // When should I request a tx from someone else (in microseconds). cmdline/bitcoin.conf: -txretryinterval
 extern unsigned int MIN_TX_REQUEST_RETRY_INTERVAL;
+static const unsigned int DEFAULT_MIN_TX_REQUEST_RETRY_INTERVAL = 5 * 1000 * 1000;
 // When should I request a block from someone else (in microseconds). cmdline/bitcoin.conf: -blkretryinterval
 extern unsigned int MIN_BLK_REQUEST_RETRY_INTERVAL;
+static const unsigned int DEFAULT_MIN_BLK_REQUEST_RETRY_INTERVAL = 5 * 1000 * 1000;
 
 // How long in seconds we wait for a xthin request to be fullfilled before disconnecting the node.
 static const unsigned int THINBLOCK_DOWNLOAD_TIMEOUT = 30;

src/unlimited.cpp

@@ -382,8 +382,8 @@ void settingsToUserAgentString()
 
 void UnlimitedSetup(void)
 {
-    MIN_TX_REQUEST_RETRY_INTERVAL = GetArg("-txretryinterval", MIN_TX_REQUEST_RETRY_INTERVAL);
-    MIN_BLK_REQUEST_RETRY_INTERVAL = GetArg("-blkretryinterval", MIN_BLK_REQUEST_RETRY_INTERVAL);
+    MIN_TX_REQUEST_RETRY_INTERVAL = GetArg("-txretryinterval", DEFAULT_MIN_TX_REQUEST_RETRY_INTERVAL);
+    MIN_BLK_REQUEST_RETRY_INTERVAL = GetArg("-blkretryinterval", DEFAULT_MIN_BLK_REQUEST_RETRY_INTERVAL);
     maxGeneratedBlock = GetArg("-blockmaxsize", maxGeneratedBlock);
     blockVersion = GetArg("-blockversion", blockVersion);
     excessiveBlockSize = GetArg("-excessiveblocksize", excessiveBlockSize);