highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 06:58:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5161

Browse Source 
845c86d Do not use third party services for IP detection. (Gregory Maxwell)
This commit is contained in:
Wladimir J. van der Laan
2014-11-12 18:12:33 +01:00
parent 7ffb880775 845c86d128
commit 0c7862e968
4 changed files with 61 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/init.cpp
View File

@@ -574,6 +574,9 @@ bool AppInit2(boost::thread_group& threadGroup)
// 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");
// to protect privacy, do not discover addresses by default
if (SoftSetBoolArg("-discover", false))
LogPrintf("AppInit2 : parameter interaction: -proxy set -> setting -discover=0\n");
}
if (!GetBoolArg("-listen", true)) {