Browse Source

add m_added_nodes to connman options

0.16
Marko Bencun 7 years ago
parent
commit
605918272c
  1. 1
      src/init.cpp
  2. 5
      src/net.cpp
  3. 2
      src/net.h

1
src/init.cpp

@ -1656,6 +1656,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) @@ -1656,6 +1656,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
connOptions.m_msgproc = peerLogic.get();
connOptions.nSendBufferMaxSize = 1000*gArgs.GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER);
connOptions.nReceiveFloodSize = 1000*gArgs.GetArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER);
connOptions.m_added_nodes = gArgs.GetArgs("-addnode");
connOptions.nMaxOutboundTimeframe = nMaxOutboundTimeframe;
connOptions.nMaxOutboundLimit = nMaxOutboundLimit;

5
src/net.cpp

@ -1897,11 +1897,6 @@ std::vector<AddedNodeInfo> CConnman::GetAddedNodeInfo() @@ -1897,11 +1897,6 @@ std::vector<AddedNodeInfo> CConnman::GetAddedNodeInfo()
void CConnman::ThreadOpenAddedConnections()
{
{
LOCK(cs_vAddedNodes);
vAddedNodes = gArgs.GetArgs("-addnode");
}
while (true)
{
CSemaphoreGrant grant(*semAddnode);

2
src/net.h

@ -147,6 +147,7 @@ public: @@ -147,6 +147,7 @@ public:
std::vector<CService> vBinds, vWhiteBinds;
bool m_use_addrman_outgoing = true;
std::vector<std::string> m_specified_outgoing;
std::vector<std::string> m_added_nodes;
};
void Init(const Options& connOptions) {
@ -164,6 +165,7 @@ public: @@ -164,6 +165,7 @@ public:
nMaxOutboundTimeframe = connOptions.nMaxOutboundTimeframe;
nMaxOutboundLimit = connOptions.nMaxOutboundLimit;
vWhitelistedRange = connOptions.vWhitelistedRange;
vAddedNodes = connOptions.m_added_nodes;
}
CConnman(uint64_t seed0, uint64_t seed1);

Loading…
Cancel
Save