diff options
| author | Gavin Andresen <[email protected]> | 2012-06-04 14:15:19 -0400 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2012-06-04 14:15:19 -0400 |
| commit | 46e06b875d861661c4a3002e8ae3d080b5893053 (patch) | |
| tree | a22d1310831e7cd5494141a4e07e6e8182854d6f /src/main.cpp | |
| parent | Merge pull request #1411 from TheBlueMatt/debian (diff) | |
| parent | Rework network config settings (diff) | |
| download | discoin-46e06b875d861661c4a3002e8ae3d080b5893053.tar.xz discoin-46e06b875d861661c4a3002e8ae3d080b5893053.zip | |
Merge branch 'netopt' of https://github.com/sipa/bitcoin
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 981de6265..50a740d16 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2377,7 +2377,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) if (!pfrom->fInbound) { // Advertise our address - if (!fNoListen && !fUseProxy && !IsInitialBlockDownload()) + if (!fNoListen && !IsInitialBlockDownload()) { CAddress addr = GetLocalAddress(&pfrom->addr); if (addr.IsRoutable()) @@ -3035,7 +3035,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle) pnode->setAddrKnown.clear(); // Rebroadcast our address - if (!fNoListen && !fUseProxy) + if (!fNoListen) { CAddress addr = GetLocalAddress(&pnode->addr); if (addr.IsRoutable()) |