Merge pull request #4166

b641c9c Fix addnode "onetry": Connect with OpenNetworkConnection (Cozz Lovan)
This commit is contained in:
Wladimir J. van der Laan 2014-05-23 10:03:07 +02:00
commit 1b7bcba1c1
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
3 changed files with 2 additions and 4 deletions

View file

@ -41,9 +41,6 @@ using namespace boost;
static const int MAX_OUTBOUND_CONNECTIONS = 8; static const int MAX_OUTBOUND_CONNECTIONS = 8;
bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false);
// //
// Global state variables // Global state variables
// //

View file

@ -49,6 +49,7 @@ void AddressCurrentlyConnected(const CService& addr);
CNode* FindNode(const CNetAddr& ip); CNode* FindNode(const CNetAddr& ip);
CNode* FindNode(const CService& ip); CNode* FindNode(const CService& ip);
CNode* ConnectNode(CAddress addrConnect, const char *strDest = NULL); CNode* ConnectNode(CAddress addrConnect, const char *strDest = NULL);
bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false);
void MapPort(bool fUseUPnP); void MapPort(bool fUseUPnP);
unsigned short GetListenPort(); unsigned short GetListenPort();
bool BindListenPort(const CService &bindAddr, std::string& strError=REF(std::string())); bool BindListenPort(const CService &bindAddr, std::string& strError=REF(std::string()));

View file

@ -166,7 +166,7 @@ Value addnode(const Array& params, bool fHelp)
if (strCommand == "onetry") if (strCommand == "onetry")
{ {
CAddress addr; CAddress addr;
ConnectNode(addr, strNode.c_str()); OpenNetworkConnection(addr, NULL, strNode.c_str());
return Value::null; return Value::null;
} }