From 89a8329a7614ec696f216a65ef5d23e9c2c6e334 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Tue, 15 Mar 2016 14:59:17 -0700 Subject: [PATCH] fix port. packets. --- lib/bcoin/peer.js | 1 + lib/bcoin/pool.js | 2 +- lib/bcoin/protocol/framer.js | 4 ++-- lib/bcoin/protocol/parser.js | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/bcoin/peer.js b/lib/bcoin/peer.js index 803c4e65..efc30ada 100644 --- a/lib/bcoin/peer.js +++ b/lib/bcoin/peer.js @@ -56,6 +56,7 @@ function Peer(pool, options) { assert(this.port != null); } else if (options.seed) { options.seed = utils.parseHost(options.seed); + options.seed.port = options.seed.port || network.port; this.socket = this.createSocket(options.seed.port, options.seed.host); } diff --git a/lib/bcoin/pool.js b/lib/bcoin/pool.js index 99e574a6..371dee84 100644 --- a/lib/bcoin/pool.js +++ b/lib/bcoin/pool.js @@ -1836,7 +1836,7 @@ Pool.prototype.addSeed = function addSeed(seed) { this.seeds.push({ host: seed.host, - port: seed.port || bcoin.protocol.network.port + port: seed.port || network.port }); this.hosts[seed.host] = true; diff --git a/lib/bcoin/protocol/framer.js b/lib/bcoin/protocol/framer.js index 10375ab9..1cf4ae8f 100644 --- a/lib/bcoin/protocol/framer.js +++ b/lib/bcoin/protocol/framer.js @@ -208,14 +208,14 @@ Framer.version = function version(options, writer) { if (options.local.services == null) options.local.services = constants.bcoinServices; - p.writeU32(constants.version); + p.write32(constants.version); p.writeU64(constants.bcoinServices); p.write64(utils.now()); Framer.address(options.remote, false, p); Framer.address(options.local, false, p); p.writeU64(utils.nonce()); p.writeVarString(options.agent); - p.writeU32(options.height || 0); + p.write32(options.height || 0); p.writeU8(options.relay ? 1 : 0); if (!writer) diff --git a/lib/bcoin/protocol/parser.js b/lib/bcoin/protocol/parser.js index 770d94c7..36ac8048 100644 --- a/lib/bcoin/protocol/parser.js +++ b/lib/bcoin/protocol/parser.js @@ -186,10 +186,10 @@ Parser.parseVersion = function parseVersion(p) { ts = p.read64(); // Our address (recv) - recv = Parser.parseAddress(p); + recv = Parser.parseAddress(p, false); // Their Address (from) - from = Parser.parseAddress(p); + from = Parser.parseAddress(p, false); // Nonce, very dramatic nonce = p.readU64();