aboutsummaryrefslogtreecommitdiff
path: root/src/netbase.h
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2014-06-11 13:20:59 +0200
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2014-07-07 08:15:14 +0200
commit0127a9be14089b3f352ec349b2ecf4488234a4d8 (patch)
tree4c19601bbc128767efd76f731a0f3c45bf75ade9 /src/netbase.h
parent4ed2315e86621cf547fbc3649fcbe39c793a7eb3 (diff)
downloadbitcoin-0127a9be14089b3f352ec349b2ecf4488234a4d8.tar.xz
remove SOCKS4 support from core and GUI
- now we support SOCKS5 only
Diffstat (limited to 'src/netbase.h')
-rw-r--r--src/netbase.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/netbase.h b/src/netbase.h
index 40a3d25676..ad1e230834 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -161,14 +161,14 @@ class CService : public CNetAddr
)
};
-typedef std::pair<CService, int> proxyType;
+typedef CService proxyType;
enum Network ParseNetwork(std::string net);
void SplitHostPort(std::string in, int &portOut, std::string &hostOut);
-bool SetProxy(enum Network net, CService addrProxy, int nSocksVersion = 5);
+bool SetProxy(enum Network net, CService addrProxy);
bool GetProxy(enum Network net, proxyType &proxyInfoOut);
bool IsProxy(const CNetAddr &addr);
-bool SetNameProxy(CService addrProxy, int nSocksVersion = 5);
+bool SetNameProxy(CService addrProxy);
bool HaveNameProxy();
bool LookupHost(const char *pszName, std::vector<CNetAddr>& vIP, unsigned int nMaxSolutions = 0, bool fAllowLookup = true);
bool Lookup(const char *pszName, CService& addr, int portDefault = 0, bool fAllowLookup = true);