From feeb761ba07af74a7cd78b8c8f7c2a961fd9ea1c Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Thu, 12 Apr 2012 21:26:35 -0400 Subject: Testnet, Mark III --- src/irc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/irc.cpp') diff --git a/src/irc.cpp b/src/irc.cpp index 104918841..c0b3b7478 100644 --- a/src/irc.cpp +++ b/src/irc.cpp @@ -291,8 +291,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); -- cgit v1.2.3 From 587f929c6462698a674fe8add2f301161219d05a Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Thu, 24 May 2012 19:02:21 +0200 Subject: Rework network config settings --- src/irc.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/irc.cpp') diff --git a/src/irc.cpp b/src/irc.cpp index c0b3b7478..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); -- cgit v1.2.3