Skip to content
Permalink
Browse files

Merge pull request #6153

8c35b6f Parameter interaction: disable upnp if -proxy set (Wladimir J. van der Laan)
  • Loading branch information...
laanwj committed May 27, 2015
2 parents df992b9 + 8c35b6f commit 0bcf04f0467cf27a9cf87ad68342c001ba07ad69
Showing with 4 additions and 0 deletions.
  1. +4 −0 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__);

0 comments on commit 0bcf04f

Please sign in to comment.
You can’t perform that action at this time.