diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2011-12-12 14:34:47 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2011-12-12 14:34:47 -0500 |
| commit | 12c69167e367a2c7653af6a3c9565c7bde7c9f43 (patch) | |
| tree | d60600931cf605630a686b81ecaac13e127029b6 /src/net.cpp | |
| parent | 16e7c05de71a2c215e3b74522bf34d8e0da3381e (diff) | |
| parent | b379bc5eefb2bd0091c4b016e24a406d36454bfa (diff) | |
| download | bitcoin-12c69167e367a2c7653af6a3c9565c7bde7c9f43.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/net.cpp b/src/net.cpp index 199fb407f2..e0ac2abef0 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1132,11 +1132,17 @@ void ThreadMapPort2(void* parg) const char * rootdescurl = 0; const char * multicastif = 0; const char * minissdpdpath = 0; - int error = 0; struct UPNPDev * devlist = 0; char lanaddr[64]; +#ifndef UPNPDISCOVER_SUCCESS + /* miniupnpc 1.5 */ + devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0); +#else + /* miniupnpc 1.6 */ + int error = 0; devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error); +#endif struct UPNPUrls urls; struct IGDdatas data; @@ -1148,8 +1154,15 @@ void ThreadMapPort2(void* parg) char intClient[16]; char intPort[6]; string strDesc = "Bitcoin " + FormatFullVersion(); +#ifndef UPNPDISCOVER_SUCCESS + /* miniupnpc 1.5 */ + r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, + port, port, lanaddr, strDesc.c_str(), "TCP", 0); +#else + /* miniupnpc 1.6 */ r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, port, port, lanaddr, strDesc.c_str(), "TCP", 0, "0"); +#endif if(r!=UPNPCOMMAND_SUCCESS) printf("AddPortMapping(%s, %s, %s) failed with code %d (%s)\n", |