aboutsummaryrefslogtreecommitdiff
path: root/src/irc.cpp
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-01-03 10:14:22 -0500
committerGavin Andresen <gavinandresen@gmail.com>2012-01-03 10:17:28 -0500
commit0fcf91ea1e23697736032caadc8e487e0ba6cfef (patch)
tree4738fbd6c1d7061b58b8492423e3d2fdce48b7f9 /src/irc.cpp
parent4231eb217ca06e93cfb0875924b4383f92baf134 (diff)
Fix issue #659, and cleanup wallet/command-line argument handling a bit
Diffstat (limited to 'src/irc.cpp')
-rw-r--r--src/irc.cpp17
1 files changed, 4 insertions, 13 deletions
diff --git a/src/irc.cpp b/src/irc.cpp
index 5278488dcd..fe96a90a1c 100644
--- a/src/irc.cpp
+++ b/src/irc.cpp
@@ -264,19 +264,14 @@ void ThreadIRCSeed2(void* parg)
int nErrorWait = 10;
int nRetryWait = 10;
bool fNameInUse = false;
- bool fTOR = (fUseProxy && addrProxy.port == htons(9050));
while (!fShutdown)
{
- //CAddress addrConnect("216.155.130.130:6667"); // chat.freenode.net
CAddress addrConnect("92.243.23.21", 6667); // irc.lfnet.org
- if (!fTOR)
- {
- //struct hostent* phostent = gethostbyname("chat.freenode.net");
- CAddress addrIRC("irc.lfnet.org", 6667, true);
- if (addrIRC.IsValid())
- addrConnect = addrIRC;
- }
+
+ CAddress addrIRC("irc.lfnet.org", 6667, true);
+ if (addrIRC.IsValid())
+ addrConnect = addrIRC;
SOCKET hSocket;
if (!ConnectSocket(addrConnect, hSocket))
@@ -406,10 +401,6 @@ void ThreadIRCSeed2(void* parg)
closesocket(hSocket);
hSocket = INVALID_SOCKET;
- // IRC usually blocks TOR, so only try once
- if (fTOR)
- return;
-
if (GetTime() - nStart > 20 * 60)
{
nErrorWait /= 3;