neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't poll showmyip.com, it doesn't exist anymore

Browse Source 
Fixes #4679.

This leaves us with only one candidate, checkip.dyndns.org.
GetMyExternalIP should be phased out as soon as possible.
This commit is contained in:
Wladimir J. van der Laan 2014-08-12 07:54:09 +02:00
parent 8b11d3de7a
commit c33b983903
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/net.cpp
View File

@ -368,7 +368,7 @@ bool GetMyExternalIP(CNetAddr& ipRet)
const char* pszKeyword; const char* pszKeyword;
for (int nLookup = 0; nLookup <= 1; nLookup++) 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 // We should be phasing out our use of sites like these. If we need
// replacements, we should ask for volunteers to put this simple // replacements, we should ask for volunteers to put this simple
@ -393,25 +393,6 @@ bool GetMyExternalIP(CNetAddr& ipRet)
pszKeyword = "Address:"; 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)) if (GetMyExternalIP2(addrConnect, pszGet, pszKeyword, ipRet))
return true; return true;