aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-08-12 07:54:09 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-08-18 15:11:15 +0200
commit5332b0a429f42c49c4b70e71870f2202c0cfa844 (patch)
tree5d39ac18dd20fac2b82a1e9cd8fdd64df794890a
parent6862c8ba997462b6ff327acb2577b00a79d39bd5 (diff)
downloadbitcoin-5332b0a429f42c49c4b70e71870f2202c0cfa844.tar.xz
Don't poll showmyip.com, it doesn't exist anymore
Fixes #4679. This leaves us with only one candidate, checkip.dyndns.org. GetMyExternalIP should be phased out as soon as possible. Rebased-From: c33b983
-rw-r--r--src/net.cpp21
1 files changed, 1 insertions, 20 deletions
diff --git a/src/net.cpp b/src/net.cpp
index a63625051b..f979538927 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -350,7 +350,7 @@ bool GetMyExternalIP(CNetAddr& ipRet)
const char* pszKeyword;
for (int nLookup = 0; nLookup <= 1; nLookup++)
- for (int nHost = 1; nHost <= 2; nHost++)
+ for (int nHost = 1; nHost <= 1; nHost++)
{
// We should be phasing out our use of sites like these. If we need
// replacements, we should ask for volunteers to put this simple
@@ -375,25 +375,6 @@ bool GetMyExternalIP(CNetAddr& ipRet)
pszKeyword = "Address:";
}
- else if (nHost == 2)
- {
- addrConnect = CService("74.208.43.192", 80); // www.showmyip.com
-
- if (nLookup == 1)
- {
- CService addrIP("www.showmyip.com", 80, true);
- if (addrIP.IsValid())
- addrConnect = addrIP;
- }
-
- pszGet = "GET /simple/ HTTP/1.1\r\n"
- "Host: www.showmyip.com\r\n"
- "User-Agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)\r\n"
- "Connection: close\r\n"
- "\r\n";
-
- pszKeyword = NULL; // Returns just IP address
- }
if (GetMyExternalIP2(addrConnect, pszGet, pszKeyword, ipRet))
return true;