diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-11 21:26:22 -0500 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-11 21:26:22 -0500 |
commit | 9ab932b76988d41ea83d4c5cfb9353e06922ccaa (patch) | |
tree | fd208a144c793435a5cd09727845763348f7e319 /src/net.cpp | |
parent | 84d228ed839e527f8638db5f451e05bd58905f52 (diff) | |
parent | 8ad6996cc38c7e5e21698db91759fcc3e8900545 (diff) | |
download | bitcoin-9ab932b76988d41ea83d4c5cfb9353e06922ccaa.tar.xz |
Merge branch '0.5.0.x' into 0.5.x
Diffstat (limited to 'src/net.cpp')
-rw-r--r-- | src/net.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
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 */ |