aboutsummaryrefslogtreecommitdiff
path: root/irc.cpp
diff options
context:
space:
mode:
authors_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-10-09 19:33:35 +0000
committers_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-10-09 19:33:35 +0000
commit103849419a9c014a69c76b6f96e48b66cbc838ca (patch)
tree73bce9b5c3d96304138b25d1e714222ea3d4a384 /irc.cpp
parent0a27bd065e4803a35e436c610bedb06fe39123c6 (diff)
downloadbitcoin-103849419a9c014a69c76b6f96e48b66cbc838ca.tar.xz
key pool for safer wallet backup
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@163 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'irc.cpp')
-rw-r--r--irc.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/irc.cpp b/irc.cpp
index a520173f1b..0675d18617 100644
--- a/irc.cpp
+++ b/irc.cpp
@@ -126,7 +126,7 @@ bool RecvLineIRC(SOCKET hSocket, string& strLine)
}
}
-int RecvUntil(SOCKET hSocket, const char* psz1, const char* psz2=NULL, const char* psz3=NULL)
+int RecvUntil(SOCKET hSocket, const char* psz1, const char* psz2=NULL, const char* psz3=NULL, const char* psz4=NULL)
{
loop
{
@@ -141,6 +141,8 @@ int RecvUntil(SOCKET hSocket, const char* psz1, const char* psz2=NULL, const cha
return 2;
if (psz3 && strLine.find(psz3) != -1)
return 3;
+ if (psz4 && strLine.find(psz4) != -1)
+ return 4;
}
}
@@ -210,7 +212,7 @@ void ThreadIRCSeed2(void* parg)
return;
}
- if (!RecvUntil(hSocket, "Found your hostname", "using your IP address instead", "Couldn't look up your hostname"))
+ if (!RecvUntil(hSocket, "Found your hostname", "using your IP address instead", "Couldn't look up your hostname", "ignoring hostname"))
{
closesocket(hSocket);
hSocket = INVALID_SOCKET;