diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-11 21:26:11 -0500 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-11 21:26:11 -0500 |
commit | 8ad6996cc38c7e5e21698db91759fcc3e8900545 (patch) | |
tree | 2b3ef6daafbbbfdca0d461ebcccedb913e8aaa04 /src/net.h | |
parent | b5d9c7d9fb2ddf66e414e22e1d599fb0ef0abb07 (diff) | |
parent | 888ac4e7a326986945ca91668c47a3d8fa981d49 (diff) | |
download | bitcoin-8ad6996cc38c7e5e21698db91759fcc3e8900545.tar.xz |
Merge branch '0.4.x' into 0.5.0.x
Diffstat (limited to 'src/net.h')
-rw-r--r-- | src/net.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -362,7 +362,7 @@ public: /// when NTP implemented, change to just nTime = GetAdjustedTime() int64 nTime = (fInbound ? GetAdjustedTime() : GetTime()); CAddress addrYou = (fUseProxy ? CAddress("0.0.0.0") : addr); - CAddress addrMe = (fUseProxy ? CAddress("0.0.0.0") : addrLocalHost); + CAddress addrMe = (fUseProxy || !addrLocalHost.IsRoutable() ? CAddress("0.0.0.0") : addrLocalHost); RAND_bytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce)); PushMessage("version", VERSION, nLocalServices, nTime, addrYou, addrMe, nLocalHostNonce, std::string(pszSubVer), nBestHeight); |