diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-18 11:21:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-27 09:35:40 +0200 |
| commit | ebd7d8d78c2d89ceaf40894cedd6b21fb8bebe96 (patch) | |
| tree | 782f00725efa4e28204d0bbf1e550774abb3b2cb | |
| parent | ae3d8f371ab2e6886e1ffab8d16495ffccbfc5e4 (diff) | |
Parameter interaction: disable upnp if -proxy set
To protect privacy, do not use UPNP when a proxy is set. The user may
still specify -listen=1 to listen locally (for a hidden service), so
don't rely on this happening through -listen.
Fixes #2927.
Conflicts:
src/init.cpp
Rebased-From: 8c35b6f3be218101630101806300cfd75be23f58
Github-Pull: #6153
| -rw-r--r-- | src/init.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index 9ff87ad1e6..00c8e399e8 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -593,7 +593,11 @@ bool AppInit2(boost::thread_group& threadGroup) if (mapArgs.count("-proxy")) { // to protect privacy, do not listen by default if a default proxy server is specified if (SoftSetBoolArg("-listen", false)) - LogPrintf("AppInit2 : parameter interaction: -proxy set -> setting -listen=0\n"); + 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("AppInit2 : parameter interaction: -proxy set -> setting -discover=0\n"); |