Mercurial > hg > bitcoin

changeset 3608:1a9fe03c4f6b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert "Send 'mempool' P2P command at the start of each P2P session" Fat-fingered on github, and merged this too early. This reverts commit 22f9b069035c9ba0416a62714db167eea5ba762f.
author Jeff Garzik <jeff@garzik.org>
date Mon, 08 Oct 2012 18:14:15 -0400
parents a29a6ec61f72
children 2efc7e0a7ad7
files src/init.cpp src/main.cpp
diffstat 2 files changed, 1 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -25,7 +25,6 @@
 
 CWallet* pwalletMain;
 CClientUIInterface uiInterface;
-int64 nTimeNodeStart;
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -471,10 +470,8 @@
     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", nTimeNodeStart).c_str());
+        printf("Startup time: %s\n", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str());
     printf("Default data directory %s\n", GetDefaultDataDir().string().c_str());
     printf("Used data directory %s\n", pszDataDir);
     std::ostringstream strErrors;
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2404,14 +2404,6 @@
 
 
 
-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
@@ -2518,12 +2510,6 @@
             }
         }
 
-        // 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 &&