diff options
| author | Giel van Schijndel <[email protected]> | 2012-06-17 14:30:37 +0200 |
|---|---|---|
| committer | Giel van Schijndel <[email protected]> | 2012-06-17 14:30:37 +0200 |
| commit | 07368a9e3c60bbef8452501d34bb8d3688cbca13 (patch) | |
| tree | 963f2e56176451bfeb84e54d14bf726388407b7d /src/irc.cpp | |
| parent | Use the QueueShutdown signal to stop accepting new RPC connections (diff) | |
| parent | Document how to build/run unit tests (diff) | |
| download | discoin-07368a9e3c60bbef8452501d34bb8d3688cbca13.tar.xz discoin-07368a9e3c60bbef8452501d34bb8d3688cbca13.zip | |
Merge branch 'master' into async-ipv6-rpc
Conflicts:
src/bitcoinrpc.cpp
Signed-off-by: Giel van Schijndel <[email protected]>
Diffstat (limited to 'src/irc.cpp')
| -rw-r--r-- | src/irc.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/irc.cpp b/src/irc.cpp index 104918841..185be02f2 100644 --- a/src/irc.cpp +++ b/src/irc.cpp @@ -176,8 +176,6 @@ bool GetIPFromIRC(SOCKET hSocket, string strMyName, CNetAddr& ipRet) // Hybrid IRC used by lfnet always returns IP when you userhost yourself, // but in case another IRC is ever used this should work. printf("GetIPFromIRC() got userhost %s\n", strHost.c_str()); - if (fUseProxy) - return false; CNetAddr addr(strHost, true); if (!addr.IsValid()) return false; @@ -281,7 +279,7 @@ void ThreadIRCSeed2(void* parg) if (GetIPFromIRC(hSocket, strMyName, addrFromIRC)) { printf("GetIPFromIRC() returned %s\n", addrFromIRC.ToString().c_str()); - if (!fUseProxy && addrFromIRC.IsRoutable()) + if (addrFromIRC.IsRoutable()) { // IRC lets you to re-nick AddLocal(addrFromIRC, LOCAL_IRC); @@ -291,8 +289,8 @@ void ThreadIRCSeed2(void* parg) } if (fTestNet) { - Send(hSocket, "JOIN #bitcoinTEST\r"); - Send(hSocket, "WHO #bitcoinTEST\r"); + Send(hSocket, "JOIN #bitcoinTEST3\r"); + Send(hSocket, "WHO #bitcoinTEST3\r"); } else { // randomly join #bitcoin00-#bitcoin99 int channel_number = GetRandInt(100); |