@@ -840,7 +840,7 @@ namespace { // Variables internal to initialization process only
840
840
841
841
int nMaxConnections;
842
842
int available_fds;
843
- ServiceFlags nLocalServices = ServiceFlags(NODE_NETWORK_LIMITED | NODE_WITNESS);
843
+ ServiceFlags g_local_services = ServiceFlags(NODE_NETWORK_LIMITED | NODE_WITNESS);
844
844
int64_t peer_connect_timeout;
845
845
std::set<BlockFilterType> g_enabled_filter_types;
846
846
@@ -955,7 +955,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
955
955
956
956
// Signal NODE_P2P_V2 if BIP324 v2 transport is enabled.
957
957
if (args.GetBoolArg (" -v2transport" , DEFAULT_V2_TRANSPORT)) {
958
- nLocalServices = ServiceFlags (nLocalServices | NODE_P2P_V2);
958
+ g_local_services = ServiceFlags (g_local_services | NODE_P2P_V2);
959
959
}
960
960
961
961
// Signal NODE_COMPACT_FILTERS if peerblockfilters and basic filters index are both enabled.
@@ -964,7 +964,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
964
964
return InitError (_ (" Cannot set -peerblockfilters without -blockfilterindex." ));
965
965
}
966
966
967
- nLocalServices = ServiceFlags (nLocalServices | NODE_COMPACT_FILTERS);
967
+ g_local_services = ServiceFlags (g_local_services | NODE_COMPACT_FILTERS);
968
968
}
969
969
970
970
if (args.GetIntArg (" -prune" , 0 )) {
@@ -1049,7 +1049,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
1049
1049
SetMockTime (args.GetIntArg (" -mocktime" , 0 )); // SetMockTime(0) is a no-op
1050
1050
1051
1051
if (args.GetBoolArg (" -peerbloomfilters" , DEFAULT_PEERBLOOMFILTERS))
1052
- nLocalServices = ServiceFlags (nLocalServices | NODE_BLOOM);
1052
+ g_local_services = ServiceFlags (g_local_services | NODE_BLOOM);
1053
1053
1054
1054
if (args.IsArgSet (" -test" )) {
1055
1055
if (chainparams.GetChainType () != ChainType::REGTEST) {
@@ -1724,7 +1724,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
1724
1724
// Prior to setting NODE_NETWORK, check if we can provide historical blocks.
1725
1725
if (!WITH_LOCK (chainman.GetMutex (), return chainman.BackgroundSyncInProgress ())) {
1726
1726
LogPrintf (" Setting NODE_NETWORK on non-prune mode\n " );
1727
- nLocalServices = ServiceFlags (nLocalServices | NODE_NETWORK);
1727
+ g_local_services = ServiceFlags (g_local_services | NODE_NETWORK);
1728
1728
} else {
1729
1729
LogPrintf (" Running node in NODE_NETWORK_LIMITED mode until snapshot background sync completes\n " );
1730
1730
}
@@ -1856,7 +1856,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
1856
1856
StartMapPort (args.GetBoolArg (" -upnp" , DEFAULT_UPNP), args.GetBoolArg (" -natpmp" , DEFAULT_NATPMP));
1857
1857
1858
1858
CConnman::Options connOptions;
1859
- connOptions.nLocalServices = nLocalServices ;
1859
+ connOptions.m_local_services = g_local_services ;
1860
1860
connOptions.m_max_automatic_connections = nMaxConnections;
1861
1861
connOptions.uiInterface = &uiInterface;
1862
1862
connOptions.m_banman = node.banman .get ();
0 commit comments