BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Send 'mempool' P2P command at the start of each P2P session" 

Fat-fingered on github, and merged this too early.

This reverts commit 22f9b06903.
This commit is contained in:
Jeff Garzik 2012-10-08 18:14:15 -04:00 committed by Jeff Garzik
parent 56caa38a67
commit b855abb8db
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/init.cpp
View File

@ -25,7 +25,6 @@ using namespace boost;
CWallet* pwalletMain;
CClientUIInterface uiInterface;
int64 nTimeNodeStart;
//////////////////////////////////////////////////////////////////////////////
//
@ -471,10 +470,8 @@ bool AppInit2()
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;

14
src/main.cpp
View File

@ -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 &&