aboutsummaryrefslogtreecommitdiff
path: root/src/init.cpp
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2016-04-19 00:04:58 -0400
committerCory Fields <cory-nospam-@coryfields.com>2016-09-08 12:24:06 -0400
commitbd72937dc462b86f0e84184b270a232f7bfaa8db (patch)
tree7d36243302d3001bb36b9fdb27e8642568e814ac /src/init.cpp
parentbe9c796dc51c05cab0b84d2e66c928973c6e5ed6 (diff)
downloadbitcoin-bd72937dc462b86f0e84184b270a232f7bfaa8db.tar.xz
net: move nLocalServices/nRelevantServices to CConnman
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).
Diffstat (limited to 'src/init.cpp')
-rw-r--r--src/init.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp
index a7f893c24f..644d6721e4 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -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