aboutsummaryrefslogtreecommitdiff
path: root/src/net.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-06-12 12:27:01 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2011-06-12 12:27:01 +0200
commit18cf214528d14692941311be154214cab1772ed5 (patch)
treef3525c858aadbff78832fb9a4198077fbbc27b1f /src/net.h
parent0424613ba24de94b58f6fa7bf1627fd4e2807208 (diff)
downloadbitcoin-18cf214528d14692941311be154214cab1772ed5.tar.xz
update bitcoin core to git ce148944c776ae8e91cc058f44ddce356c7cebc9
Diffstat (limited to 'src/net.h')
-rw-r--r--src/net.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net.h b/src/net.h
index d1ded87232..8a55856eed 100644
--- a/src/net.h
+++ b/src/net.h
@@ -19,6 +19,7 @@ class CRequestTracker;
class CNode;
class CBlockIndex;
extern int nBestHeight;
+extern int nConnectTimeout;
@@ -32,7 +33,7 @@ enum
-bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet);
+bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet, int nTimeout=nConnectTimeout);
bool Lookup(const char *pszName, std::vector<CAddress>& vaddr, int nServices, int nMaxSolutions, bool fAllowLookup = false, int portDefault = 0, bool fAllowPort = false);
bool Lookup(const char *pszName, CAddress& addr, int nServices, bool fAllowLookup = false, int portDefault = 0, bool fAllowPort = false);
bool GetMyExternalIP(unsigned int& ipRet);