From e1b880f73f13657d82309aa550697336dfcb7ec9 Mon Sep 17 00:00:00 2001 From: fsb4000 Date: Wed, 31 Dec 2014 04:12:48 +0600 Subject: [PATCH] Fix addnode "onetry": Connect with OpenNetworkConnection --- src/net.cpp | 2 -- src/net.h | 1 + src/rpcnet.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/net.cpp b/src/net.cpp index 821cff8..4f8b565 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -35,8 +35,6 @@ void ThreadOpenAddedConnections2(void* parg); void ThreadMapPort2(void* parg); #endif void ThreadDNSAddressSeed2(void* parg); -bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false); - struct LocalServiceInfo { int nScore; diff --git a/src/net.h b/src/net.h index 56a3391..a946210 100644 --- a/src/net.h +++ b/src/net.h @@ -39,6 +39,7 @@ void AddressCurrentlyConnected(const CService& addr); CNode* FindNode(const CNetAddr& ip); CNode* FindNode(const CService& ip); CNode* ConnectNode(CAddress addrConnect, const char *strDest = NULL, int64_t nTimeout=0); +bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false); void MapPort(); unsigned short GetListenPort(); bool BindListenPort(const CService &bindAddr, std::string& strError=REF(std::string())); diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index c2c22e2..604db0f 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -88,7 +88,7 @@ Value addnode(const Array& params, bool fHelp) if (strCommand == "onetry") { CAddress addr; - ConnectNode(addr, strNode.c_str()); + OpenNetworkConnection(addr, NULL, strNode.c_str()); return Value::null; } -- 1.7.1