Browse Source

correct addresses to detect own IP

pull/26/head v0.8.5.10
orignal 7 years ago
parent
commit
11c6766095
  1. 69
      src/net.cpp

69
src/net.cpp

@ -377,45 +377,38 @@ bool GetMyExternalIP(CNetAddr& ipRet)
// replacements, we should ask for volunteers to put this simple // replacements, we should ask for volunteers to put this simple
// php file on their web server that prints the client IP: // php file on their web server that prints the client IP:
// <?php echo $_SERVER["REMOTE_ADDR"]; ?> // <?php echo $_SERVER["REMOTE_ADDR"]; ?>
if (nHost == 1) switch(nHost) {
{ case 1 :
addrConnect = CService("91.198.22.70", 80); // checkip.dyndns.org addrConnect = CService("66.171.248.178", 80); // whatismyipaddress.com has a bot too
if (nLookup == 1) {
if (nLookup == 1) CService addrIP("bot.whatismyipaddress.com", 80, true);
{ if (addrIP.IsValid())
CService addrIP("checkip.dyndns.org", 80, true); addrConnect = addrIP;
if (addrIP.IsValid()) }
addrConnect = addrIP; pszGet = "GET / HTTP/1.1\r\n"
} "Host: bot.whatismyipaddress.com\r\n"
"User-Agent: Mozilla/4.0\r\n"
pszGet = "GET / HTTP/1.1\r\n" "Connection: close\r\n"
"Host: checkip.dyndns.org\r\n" "\r\n";
"User-Agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)\r\n" pszKeyword = NULL;
"Connection: close\r\n" break;
"\r\n"; case 2 :
addrConnect = CService("216.146.43.71", 80); // checkip.dyndns.org
pszKeyword = "Address:"; if (nLookup == 1) {
} CService addrIP("checkip.dyndns.org", 80, true);
else if (nHost == 2) if (addrIP.IsValid())
{ addrConnect = addrIP;
addrConnect = CService("74.208.43.192", 80); // www.showmyip.com }
pszGet = "GET / HTTP/1.1\r\n"
if (nLookup == 1) "Host: checkip.dyndns.org\r\n"
{ "User-Agent: Mozilla/4.0\r\n"
CService addrIP("www.showmyip.com", 80, true); "Connection: close\r\n"
if (addrIP.IsValid()) "\r\n";
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
}
pszKeyword = "Address:";
break;
}
if (GetMyExternalIP2(addrConnect, pszGet, pszKeyword, ipRet)) if (GetMyExternalIP2(addrConnect, pszGet, pszKeyword, ipRet))
return true; return true;
} }

Loading…
Cancel
Save