aboutsummaryrefslogtreecommitdiff
path: root/irc.cpp
diff options
context:
space:
mode:
authors_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2009-10-29 02:52:48 +0000
committers_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2009-10-29 02:52:48 +0000
commitdd519206a684c772a4a06ceecc87c665ad09d8be (patch)
tree08535edfd634944708c936fd596f3719ccf191d8 /irc.cpp
parentfa2a0338d3f8b1c3a1d75bff39ff42e436cee0dc (diff)
addr relaying fixes, proxy option and privacy patches, detect connect to self, non-final tx locktime changes, fix hide unconfirmed generated
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@18 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'irc.cpp')
-rw-r--r--irc.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/irc.cpp b/irc.cpp
index cfc9464aa7..707b4fe19f 100644
--- a/irc.cpp
+++ b/irc.cpp
@@ -163,6 +163,9 @@ void ThreadIRCSeed(void* parg)
int nErrorWait = 10;
int nRetryWait = 10;
+ if (fUseProxy && addrProxy.port == htons(9050))
+ return;
+
while (!fShutdown)
{
CAddress addrConnect("216.155.130.130:6667");
@@ -191,9 +194,10 @@ void ThreadIRCSeed(void* parg)
return;
}
- string strMyName = EncodeAddress(addrLocalHost);
-
- if (!addrLocalHost.IsRoutable())
+ string strMyName;
+ if (addrLocalHost.IsRoutable() && !fUseProxy)
+ strMyName = EncodeAddress(addrLocalHost);
+ else
strMyName = strprintf("x%u", GetRand(1000000000));