aboutsummaryrefslogtreecommitdiff
path: root/src/net.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-05-29 11:45:54 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-05-29 11:46:28 +0200
commit67f43a99ae59e24a7f147a27f1d008b8c4e5fc69 (patch)
tree779d6ff45fa26c53d74a9dff73953108dfd8ac8f /src/net.cpp
parent10e3af352f70452dfc042759d4395ecda752f382 (diff)
parentd4e1c61212c3f28f80c7184aca81f5d118fad460 (diff)
downloadbitcoin-67f43a99ae59e24a7f147a27f1d008b8c4e5fc69.tar.xz
Merge pull request #4132
d4e1c61 add DEFAULT_UPNP constant in net (Philip Kaufmann)
Diffstat (limited to 'src/net.cpp')
-rw-r--r--src/net.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/net.cpp b/src/net.cpp
index 319f8e6b1c..c2dde97040 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1733,10 +1733,8 @@ void StartNode(boost::thread_group& threadGroup)
else
threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "dnsseed", &ThreadDNSAddressSeed));
-#ifdef USE_UPNP
// Map ports with UPnP
- MapPort(GetBoolArg("-upnp", USE_UPNP));
-#endif
+ MapPort(GetBoolArg("-upnp", DEFAULT_UPNP));
// Send and receive from sockets, accept connections
threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "net", &ThreadSocketHandler));