Browse Source

Merge pull request #4132

d4e1c61 add DEFAULT_UPNP constant in net (Philip Kaufmann)
tags/v0.15.1
Wladimir J. van der Laan 7 years ago
parent
commit
67f43a99ae
No account linked to committer's email address
3 changed files with 8 additions and 8 deletions
  1. 1
    3
      src/net.cpp
  2. 6
    0
      src/net.h
  3. 1
    5
      src/qt/optionsmodel.cpp

+ 1
- 3
src/net.cpp View File

@@ -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));

+ 6
- 0
src/net.h View File

@@ -38,6 +38,12 @@ namespace boost {

/** The maximum number of entries in an 'inv' protocol message */
static const unsigned int MAX_INV_SZ = 50000;
/** -upnp default */
#ifdef USE_UPNP
static const bool DEFAULT_UPNP = USE_UPNP;
#else
static const bool DEFAULT_UPNP = false;
#endif

inline unsigned int ReceiveFloodSize() { return 1000*GetArg("-maxreceivebuffer", 5*1000); }
inline unsigned int SendBufferSize() { return 1000*GetArg("-maxsendbuffer", 1*1000); }

+ 1
- 5
src/qt/optionsmodel.cpp View File

@@ -106,11 +106,7 @@ void OptionsModel::Init()

// Network
if (!settings.contains("fUseUPnP"))
#ifdef USE_UPNP
settings.setValue("fUseUPnP", true);
#else
settings.setValue("fUseUPnP", false);
#endif
settings.setValue("fUseUPnP", DEFAULT_UPNP);
if (!SoftSetBoolArg("-upnp", settings.value("fUseUPnP").toBool()))
addOverriddenOption("-upnp");


Loading…
Cancel
Save