diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-05-27 09:32:44 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-05-27 09:33:01 +0200 |
| commit | 0bcf04f0467cf27a9cf87ad68342c001ba07ad69 (patch) | |
| tree | ef646a47e0cb2b64c77504ce0338e79e705ba347 /src/init.cpp | |
| parent | Merge pull request #6174 (diff) | |
| parent | Parameter interaction: disable upnp if -proxy set (diff) | |
| download | discoin-0bcf04f0467cf27a9cf87ad68342c001ba07ad69.tar.xz discoin-0bcf04f0467cf27a9cf87ad68342c001ba07ad69.zip | |
Merge pull request #6153
8c35b6f Parameter interaction: disable upnp if -proxy set (Wladimir J. van der Laan)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp index dc9080fec..b8e095c12 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -667,6 +667,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) // to protect privacy, do not listen by default if a default proxy server is specified if (SoftSetBoolArg("-listen", false)) LogPrintf("%s: parameter interaction: -proxy set -> setting -listen=0\n", __func__); + // to protect privacy, do not use UPNP when a proxy is set. The user may still specify -listen=1 + // to listen locally, so don't rely on this happening through -listen below. + if (SoftSetBoolArg("-upnp", false)) + LogPrintf("%s: parameter interaction: -proxy set -> setting -upnp=0\n", __func__); // to protect privacy, do not discover addresses by default if (SoftSetBoolArg("-discover", false)) LogPrintf("%s: parameter interaction: -proxy set -> setting -discover=0\n", __func__); |