add m_added_nodes to connman options

Marko Bencun · Marko Bencun · commit 605918272cd8 · 2017-09-11T16:17:01.000+02:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -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;
diff --git a/src/net.cpp b/src/net.cpp
@@ -1897,11 +1897,6 @@ std::vector<AddedNodeInfo> CConnman::GetAddedNodeInfo()
 
 void CConnman::ThreadOpenAddedConnections()
 {
-    {
-        LOCK(cs_vAddedNodes);
-        vAddedNodes = gArgs.GetArgs("-addnode");
-    }
-
     while (true)
     {
         CSemaphoreGrant grant(*semAddnode);
diff --git a/src/net.h b/src/net.h
@@ -147,6 +147,7 @@ class CConnman
         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 @@ class CConnman
         nMaxOutboundTimeframe = connOptions.nMaxOutboundTimeframe;
         nMaxOutboundLimit = connOptions.nMaxOutboundLimit;
         vWhitelistedRange = connOptions.vWhitelistedRange;
+        vAddedNodes = connOptions.m_added_nodes;
     }
 
     CConnman(uint64_t seed0, uint64_t seed1);

Original file line number	Diff line number	Diff line change
`@@ -1897,11 +1897,6 @@ std::vector<AddedNodeInfo> CConnman::GetAddedNodeInfo()`
`1897`	`1897`
`1898`	`1898`	`void CConnman::ThreadOpenAddedConnections()`
`1899`	`1899`	`{`
`1900`		`- {`
`1901`		`- LOCK(cs_vAddedNodes);`
`1902`		`- vAddedNodes = gArgs.GetArgs("-addnode");`
`1903`		`- }`
`1904`		`-`
`1905`	`1900`	`while (true)`
`1906`	`1901`	`{`
`1907`	`1902`	`CSemaphoreGrant grant(*semAddnode);`