From b1a5f4320878e34eb998737dce333270dd83e436 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Sat, 16 Apr 2016 15:59:10 -0400 Subject: net: move OpenNetworkConnection into CConnman --- src/net.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/net.h') diff --git a/src/net.h b/src/net.h index 4d87408e32..e0c317ae46 100644 --- a/src/net.h +++ b/src/net.h @@ -93,7 +93,6 @@ CNode* FindNode(const CSubNet& subNet); CNode* FindNode(const std::string& addrName); CNode* FindNode(const CService& ip); CNode* FindNode(const NodeId id); //TODO: Remove this -bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false); class CConnman { @@ -103,6 +102,7 @@ public: bool Start(boost::thread_group& threadGroup, std::string& strNodeError); void Stop(); bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false); + bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false); private: struct ListenSocket { @@ -120,6 +120,8 @@ private: void ThreadSocketHandler(); void ThreadDNSAddressSeed(); + CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure); + std::vector vhListenSocket; }; extern std::unique_ptr g_connman; -- cgit v1.2.3