highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-03 22:03:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

net: move nLocalServices/nRelevantServices to CConnman

Browse Source 
These are in-turn passed to CNode at connection time. This allows us to offer
different services to different peers (or test the effects of doing so).
This commit is contained in:
Cory Fields
2016-04-19 00:04:58 -04:00
parent be9c796dc5
commit bd72937dc4
7 changed files with 54 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/init.cpp
View File

@@ -982,6 +982,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
// Option to startup with mocktime set (used for regression testing):
SetMockTime(GetArg("-mocktime", 0)); // SetMockTime(0) is a no-op
ServiceFlags nLocalServices = NODE_NETWORK;
ServiceFlags nRelevantServices = NODE_NETWORK;
if (GetBoolArg("-peerbloomfilters", DEFAULT_PEERBLOOMFILTERS))
nLocalServices = ServiceFlags(nLocalServices | NODE_BLOOM);
@@ -1506,7 +1509,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
StartTorControl(threadGroup, scheduler);
std::string strNodeError;
if(!StartNode(connman, threadGroup, scheduler, strNodeError))
if(!StartNode(connman, threadGroup, scheduler, nLocalServices, nRelevantServices, strNodeError))
return InitError(strNodeError);
// ********************************************************* Step 12: finished