Introduce REQUIRED_SERVICES constant

sipa · sipa · commit ecd7fd37c888 · 2016-06-13T17:40:16.000+02:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -4787,7 +4787,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         {
             boost::this_thread::interruption_point();
 
-            if (!(addr.nServices & NODE_NETWORK))
+            if ((addr.nServices & REQUIRED_SERVICES) != REQUIRED_SERVICES)
                 continue;
 
             if (addr.nTime <= 100000000 || addr.nTime > nNow + 10 * 60)
diff --git a/src/net.cpp b/src/net.cpp
@@ -1596,7 +1596,7 @@ void ThreadOpenConnections()
                 continue;
 
             // only connect to full nodes
-            if (!(addr.nServices & NODE_NETWORK))
+            if ((addr.nServices & REQUIRED_SERVICES) != REQUIRED_SERVICES)
                 continue;
 
             // only consider very recently tried nodes after 30 failed attempts
diff --git a/src/net.h b/src/net.h
@@ -72,6 +72,8 @@ static const bool DEFAULT_FORCEDNSSEED = false;
 static const size_t DEFAULT_MAXRECEIVEBUFFER = 5 * 1000;
 static const size_t DEFAULT_MAXSENDBUFFER    = 1 * 1000;
 
+static const ServiceFlags REQUIRED_SERVICES = NODE_NETWORK;
+
 // NOTE: When adjusting this, update rpcnet:setban's help ("24h")
 static const unsigned int DEFAULT_MISBEHAVING_BANTIME = 60 * 60 * 24;  // Default 24-hour ban
 

Original file line number	Diff line number	Diff line change
`@@ -4787,7 +4787,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,`
`4787`	`4787`	`{`
`4788`	`4788`	`boost::this_thread::interruption_point();`
`4789`	`4789`
`4790`		`- if (!(addr.nServices & NODE_NETWORK))`
	`4790`	`+ if ((addr.nServices & REQUIRED_SERVICES) != REQUIRED_SERVICES)`
`4791`	`4791`	`continue;`
`4792`	`4792`
`4793`	`4793`	`if (addr.nTime <= 100000000 \|\| addr.nTime > nNow + 10 * 60)`