diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-12 07:54:09 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-13 12:00:30 +0200 |
| commit | c33b983903c64d88a2aef24da1827b86aadce596 (patch) | |
| tree | ddaf464dd527cec5080baed33051f509b90d8117 /src/net.cpp | |
| parent | 8b11d3de7aa4fc3f6c4e7bf292495850034ded2c (diff) | |
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.
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/net.cpp b/src/net.cpp index 62124514c8..ec58f84b06 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -368,7 +368,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 @@ -393,25 +393,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; |