Mercurial > hg > bitcoin

changeset 3544:65ce9104d89b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Send 'mempool' P2P command at the start of each P2P session to query remote node mempool contents.
author Jeff Garzik <jgarzik@exmulti.com>
date Mon, 24 Sep 2012 13:53:44 -0400 (2012-09-24)
parents f52aad65e8c7
children a29a6ec61f72
files src/init.cpp src/main.cpp
diffstat 2 files changed, 18 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -25,6 +25,7 @@
 
 CWallet* pwalletMain;
 CClientUIInterface uiInterface;
+int64 nTimeNodeStart;
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -469,8 +470,10 @@
     printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
     printf("Bitcoin version %s (%s)\n", FormatFullVersion().c_str(), CLIENT_DATE.c_str());
     printf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION));
+
+    nTimeNodeStart = GetTime();
     if (!fLogTimestamps)
-        printf("Startup time: %s\n", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str());
+        printf("Startup time: %s\n", DateTimeStrFormat("%x %H:%M:%S", nTimeNodeStart).c_str());
     printf("Default data directory %s\n", GetDefaultDataDir().string().c_str());
     printf("Used data directory %s\n", GetDataDir().string().c_str());
     std::ostringstream strErrors;
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2404,6 +2404,14 @@
 
 
 
+static bool NodeRecentlyStarted()
+{
+    extern int64 nTimeNodeStart;
+    int64 timediff = GetTime() - nTimeNodeStart;
+
+    return (timediff < (2 * 60 * 60));
+}
+
 
 // The message start string is designed to be unlikely to occur in normal data.
 // The characters are rarely used upper ASCII, not valid as UTF-8, and produce
@@ -2510,6 +2518,12 @@
             }
         }
 
+        // Trigger download of remote node's memory pool
+        if (!IsInitialBlockDownload() && !pfrom->fInbound &&
+            !pfrom->fClient && NodeRecentlyStarted() &&
+            pfrom->nVersion >= MEMPOOL_GD_VERSION)
+            pfrom->PushMessage("mempool");
+
         // Ask the first connected node for block updates
         static int nAskedForBlocks = 0;
         if (!pfrom->fClient && !pfrom->fOneShot &&