aboutsummaryrefslogtreecommitdiff
path: root/src/net.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2011-08-06 18:45:15 +0200
committerWladimir J. van der Laan <[email protected]>2011-08-06 18:45:15 +0200
commit330c190958a31a126de7a7b12124070300b1567b (patch)
treef5a43d970c66709ea15ed44b0b5a7e63f880c82c /src/net.cpp
parentreorganize transaction model data function, and transaction tooltip (diff)
parentMerge branch 'tmp2' (diff)
downloaddiscoin-330c190958a31a126de7a7b12124070300b1567b.tar.xz
discoin-330c190958a31a126de7a7b12124070300b1567b.zip
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/net.cpp')
-rw-r--r--src/net.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/net.cpp b/src/net.cpp
index 2a90f6d0c..d69778821 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1092,13 +1092,14 @@ void ThreadMapPort2(void* parg)
{
char intClient[16];
char intPort[6];
+ string strDesc = "Bitcoin " + FormatFullVersion();
#ifndef __WXMSW__
r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
- port, port, lanaddr, 0, "TCP", 0);
+ port, port, lanaddr, strDesc.c_str(), "TCP", 0);
#else
r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
- port, port, lanaddr, 0, "TCP", 0, "0");
+ 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",