aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2012-10-08 18:14:15 -0400
committerJeff Garzik <jgarzik@redhat.com>2012-10-08 18:14:15 -0400
commitb855abb8db3bd980312274d7b5276c9efba6a5c1 (patch)
treea41c410e8fe04edd5e01d714979b1ef09b44cd42 /src/main.cpp
parent56caa38a6719e133a2f1c17275eb596ab8f1c463 (diff)
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.
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 0e22a4c36c..da1072970c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2404,14 +2404,6 @@ bool static AlreadyHave(CTxDB& txdb, const CInv& inv)
-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 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
}
}
- // 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 &&