RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pool: fix inv. do not hold lock for bip151 msgs.

Browse Source
This commit is contained in:
Christopher Jeffrey 2017-01-20 17:23:14 -08:00
parent cdcdb7bd52
commit f0f9f798c5
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
2 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/net/peer.js
View File

@ -669,7 +669,7 @@ Peer.prototype.announceBlock = function announceBlock(blocks) {
return; return;
} }
this.sendInv(inv); this.queueInv(inv);
}; };
/** /**
@ -722,7 +722,7 @@ Peer.prototype.announceTX = function announceTX(txs) {
inv.push(tx.toInv()); inv.push(tx.toInv());
} }
this.sendInv(inv); this.queueInv(inv);
}; };
/** /**
@ -730,7 +730,7 @@ Peer.prototype.announceTX = function announceTX(txs) {
* @param {InvItem[]} items * @param {InvItem[]} items
*/ */
Peer.prototype.sendInv = function sendInv(items) { Peer.prototype.queueInv = function queueInv(items) {
var hasBlock = false; var hasBlock = false;
var i, item; var i, item;
@ -792,11 +792,30 @@ Peer.prototype.flushInv = function flushInv() {
* @param {InvItem[]} items * @param {InvItem[]} items
*/ */
Peer.prototype.forceInv = function forceInv(items) { Peer.prototype.sendInv = function sendInv(items) {
var i, item, chunk;
if (!this.handshake)
return;
if (this.destroyed)
return;
if (!Array.isArray(items)) if (!Array.isArray(items))
items = [items]; items = [items];
this.send(new packets.InvPacket(items)); for (i = 0; i < items.length; i++) {
item = items[i];
this.invFilter.add(item.hash, 'hex');
}
if (items.length === 0)
return;
for (i = 0; i < items.length; i += 1000) {
chunk = items.slice(i, i + 1000);
this.send(new packets.InvPacket(chunk));
}
}; };
/** /**
@ -1378,13 +1397,22 @@ Peer.prototype.getTX = function getTX(hashes) {
*/ */
Peer.prototype.readPacket = co(function* readPacket(packet) { Peer.prototype.readPacket = co(function* readPacket(packet) {
var unlock = yield this.locker.lock(); var unlock;
try {
this.socket.pause(); switch (packet.type) {
return yield this.handlePacket(packet); case packetTypes.ENCINIT:
} finally { case packetTypes.ENCACK:
this.socket.resume(); return yield this.handlePacket(packet);
unlock(); default:
unlock = yield this.locker.lock();
try {
this.socket.pause();
return yield this.handlePacket(packet);
} finally {
this.socket.resume();
unlock();
}
break;
} }
}); });

4
lib/net/pool.js
View File

@ -1356,7 +1356,7 @@ Pool.prototype.handleGetData = co(function* handleGetData(peer, packet) {
} }
if (item.hash === peer.hashContinue) { if (item.hash === peer.hashContinue) {
peer.forceInv([new InvItem(invTypes.BLOCK, this.chain.tip.hash)]); peer.sendInv([new InvItem(invTypes.BLOCK, this.chain.tip.hash)]);
peer.hashContinue = null; peer.hashContinue = null;
} }
} }
@ -1943,7 +1943,7 @@ Pool.prototype.handleMempool = co(function* handleMempool(peer, packet) {
this.logger.debug('Sending mempool snapshot (%s).', peer.hostname); this.logger.debug('Sending mempool snapshot (%s).', peer.hostname);
peer.sendInv(items); peer.queueInv(items);
this.emit('mempool', packet, peer); this.emit('mempool', packet, peer);
}); });