@@ -840,7 +840,7 @@ namespace { // Variables internal to initialization process only
840840
841841int nMaxConnections;
842842int available_fds;
843- ServiceFlags nLocalServices = ServiceFlags(NODE_NETWORK_LIMITED | NODE_WITNESS);
843+ ServiceFlags g_local_services = ServiceFlags(NODE_NETWORK_LIMITED | NODE_WITNESS);
844844int64_t peer_connect_timeout;
845845std::set<BlockFilterType> g_enabled_filter_types;
846846
@@ -955,7 +955,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
955955
956956 // Signal NODE_P2P_V2 if BIP324 v2 transport is enabled.
957957 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);
959959 }
960960
961961 // Signal NODE_COMPACT_FILTERS if peerblockfilters and basic filters index are both enabled.
@@ -964,7 +964,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
964964 return InitError (_ (" Cannot set -peerblockfilters without -blockfilterindex." ));
965965 }
966966
967- nLocalServices = ServiceFlags (nLocalServices | NODE_COMPACT_FILTERS);
967+ g_local_services = ServiceFlags (g_local_services | NODE_COMPACT_FILTERS);
968968 }
969969
970970 if (args.GetIntArg (" -prune" , 0 )) {
@@ -1049,7 +1049,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
10491049 SetMockTime (args.GetIntArg (" -mocktime" , 0 )); // SetMockTime(0) is a no-op
10501050
10511051 if (args.GetBoolArg (" -peerbloomfilters" , DEFAULT_PEERBLOOMFILTERS))
1052- nLocalServices = ServiceFlags (nLocalServices | NODE_BLOOM);
1052+ g_local_services = ServiceFlags (g_local_services | NODE_BLOOM);
10531053
10541054 if (args.IsArgSet (" -test" )) {
10551055 if (chainparams.GetChainType () != ChainType::REGTEST) {
@@ -1724,7 +1724,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
17241724 // Prior to setting NODE_NETWORK, check if we can provide historical blocks.
17251725 if (!WITH_LOCK (chainman.GetMutex (), return chainman.BackgroundSyncInProgress ())) {
17261726 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);
17281728 } else {
17291729 LogPrintf (" Running node in NODE_NETWORK_LIMITED mode until snapshot background sync completes\n " );
17301730 }
@@ -1856,7 +1856,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
18561856 StartMapPort (args.GetBoolArg (" -upnp" , DEFAULT_UPNP), args.GetBoolArg (" -natpmp" , DEFAULT_NATPMP));
18571857
18581858 CConnman::Options connOptions;
1859- connOptions.nLocalServices = nLocalServices ;
1859+ connOptions.m_local_services = g_local_services ;
18601860 connOptions.m_max_automatic_connections = nMaxConnections;
18611861 connOptions.uiInterface = &uiInterface;
18621862 connOptions.m_banman = node.banman .get ();
0 commit comments