From cd3a801704c405eee6b6f4cc97dbc48ae14660b6 Mon Sep 17 00:00:00 2001 From: Christian Basler Date: Tue, 9 Aug 2016 19:50:11 +0200 Subject: [PATCH] Used wrong nonce for version message --- .../bitmessage/networking/AbstractConnection.java | 12 ++++++------ .../ch/dissem/bitmessage/networking/Connection.java | 2 +- .../bitmessage/networking/nio/ConnectionInfo.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java index 411a57a..f3900b1 100644 --- a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java +++ b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java @@ -146,7 +146,7 @@ public abstract class AbstractConnection { List missing = ctx.getInventory().getMissing(inv.getInventory(), streams); missing.removeAll(commonRequestedObjects); LOG.debug("Received inventory with " + originalSize + " elements, of which are " - + missing.size() + " missing."); + + missing.size() + " missing."); send(new GetData.Builder().inventory(missing).build()); } @@ -197,8 +197,8 @@ public abstract class AbstractConnection { public void offer(InventoryVector iv) { sendingQueue.offer(new Inv.Builder() - .addInventoryVector(iv) - .build()); + .addInventoryVector(iv) + .build()); updateIvCache(Collections.singletonList(iv)); } @@ -235,7 +235,7 @@ public abstract class AbstractConnection { break; default: throw new NodeException("Command 'version' or 'verack' expected, but was '" - + payload.getCommand() + "'"); + + payload.getCommand() + "'"); } } @@ -259,8 +259,8 @@ public abstract class AbstractConnection { List inventory = ctx.getInventory().getInventory(streams); for (int i = 0; i < inventory.size(); i += 50000) { sendingQueue.offer(new Inv.Builder() - .inventory(inventory.subList(i, Math.min(inventory.size(), i + 50000))) - .build()); + .inventory(inventory.subList(i, Math.min(inventory.size(), i + 50000))) + .build()); } } diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java index bb5f370..e2c1856 100644 --- a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java +++ b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java @@ -162,7 +162,7 @@ class Connection extends AbstractConnection { try (Socket socket = Connection.this.socket) { initSocket(socket); if (mode == CLIENT || mode == SYNC) { - send(new Version.Builder().defaults(peerNonce).addrFrom(host).addrRecv(node).build()); + send(new Version.Builder().defaults(ctx.getClientNonce()).addrFrom(host).addrRecv(node).build()); } while (state != DISCONNECTED) { if (mode != SYNC) { diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java index 217743e..e416da5 100644 --- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java +++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java @@ -52,7 +52,7 @@ public class ConnectionInfo extends AbstractConnection { super(context, mode, node, listener, commonRequestedObjects, syncTimeout); headerOut.flip(); if (mode == CLIENT || mode == SYNC) { - send(new Version.Builder().defaults(peerNonce).addrFrom(host).addrRecv(node).build()); + send(new Version.Builder().defaults(ctx.getClientNonce()).addrFrom(host).addrRecv(node).build()); } }