aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Maxwell <greg@xiph.org>2012-06-14 09:48:10 -0700
committerGregory Maxwell <greg@xiph.org>2012-06-14 09:48:10 -0700
commit194ea3186a3331768650629826a9c6db6db84e82 (patch)
treeab94565245c3e97c40165109c0dc8b445bad32ae
parentd59bce21e5dbb0a15051e40d5dd717fd7bf982d8 (diff)
parentc971112dfaeab836d8b626c862ede0059f5325b8 (diff)
downloadbitcoin-194ea3186a3331768650629826a9c6db6db84e82.tar.xz
Merge pull request #1463 from sipa/fix_1455
Use a 64-bit nonce in ping
-rw-r--r--src/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index fa3eb592a9..be2733192e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3013,8 +3013,9 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
// Keep-alive ping. We send a nonce of zero because we don't use it anywhere
// right now.
if (pto->nLastSend && GetTime() - pto->nLastSend > 30 * 60 && pto->vSend.empty()) {
+ uint64 nonce = 0;
if (pto->nVersion > BIP0031_VERSION)
- pto->PushMessage("ping", 0);
+ pto->PushMessage("ping", nonce);
else
pto->PushMessage("ping");
}