diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-11 21:26:11 -0500 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-11 21:26:11 -0500 |
commit | 8ad6996cc38c7e5e21698db91759fcc3e8900545 (patch) | |
tree | 2b3ef6daafbbbfdca0d461ebcccedb913e8aaa04 | |
parent | b5d9c7d9fb2ddf66e414e22e1d599fb0ef0abb07 (diff) | |
parent | 888ac4e7a326986945ca91668c47a3d8fa981d49 (diff) | |
download | bitcoin-8ad6996cc38c7e5e21698db91759fcc3e8900545.tar.xz |
Merge branch '0.4.x' into 0.5.0.x
-rw-r--r-- | src/bitcoinrpc.cpp | 2 | ||||
-rw-r--r-- | src/net.cpp | 20 | ||||
-rw-r--r-- | src/net.h | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index b1d8514649..cf03666582 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1427,7 +1427,7 @@ void ThreadCleanWalletPassphrase(void* parg) if (nWalletUnlockTime < nMyWakeTime) nWalletUnlockTime = nMyWakeTime; } - free(parg); + delete (int*)parg; return; } diff --git a/src/net.cpp b/src/net.cpp index ad7007d1c2..b9597d92b9 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1154,6 +1154,26 @@ void ThreadMapPort2(void* parg) r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr)); if (r == 1) { + if (!addrLocalHost.IsRoutable()) + { + char externalIPAddress[40]; + r = UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIPAddress); + if(r != UPNPCOMMAND_SUCCESS) + printf("UPnP: GetExternalIPAddress() returned %d\n", r); + else + { + if(externalIPAddress[0]) + { + printf("UPnP: ExternalIPAddress = %s\n", externalIPAddress); + CAddress addrExternalFromUPnP(externalIPAddress, 0, false, nLocalServices); + if (addrExternalFromUPnP.IsRoutable()) + addrLocalHost = addrExternalFromUPnP; + } + else + printf("UPnP: GetExternalIPAddress failed.\n"); + } + } + string strDesc = "Bitcoin " + FormatFullVersion(); #ifndef UPNPDISCOVER_SUCCESS /* miniupnpc 1.5 */ @@ -362,7 +362,7 @@ public: /// when NTP implemented, change to just nTime = GetAdjustedTime() int64 nTime = (fInbound ? GetAdjustedTime() : GetTime()); CAddress addrYou = (fUseProxy ? CAddress("0.0.0.0") : addr); - CAddress addrMe = (fUseProxy ? CAddress("0.0.0.0") : addrLocalHost); + CAddress addrMe = (fUseProxy || !addrLocalHost.IsRoutable() ? CAddress("0.0.0.0") : addrLocalHost); RAND_bytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce)); PushMessage("version", VERSION, nLocalServices, nTime, addrYou, addrMe, nLocalHostNonce, std::string(pszSubVer), nBestHeight); |