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

pool: fix destroyed race condition.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-11-23 17:59:05 -08:00
parent 1f22013ce0
commit 9c48cc9333
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/net/peer.js
View File

@ -126,7 +126,7 @@ function Peer(pool, addr, socket) {
this.banScore = 0; this.banScore = 0;
this.pingTimeout = null; this.pingTimeout = null;
this.pingInterval = 120000; this.pingInterval = 30000;
this.requestTimeout = 10000; this.requestTimeout = 10000;
this.requestMap = {}; this.requestMap = {};
@ -658,6 +658,9 @@ Peer.prototype.sendVersion = function sendVersion() {
*/ */
Peer.prototype.sendPing = function sendPing() { Peer.prototype.sendPing = function sendPing() {
if (this.maybeStall())
return Promise.resolve();
if (!this.version) if (!this.version)
return Promise.resolve(); return Promise.resolve();
@ -1018,6 +1021,9 @@ Peer.prototype.getData = function getData(items) {
Peer.prototype._onPacket = co(function* onPacket(packet) { Peer.prototype._onPacket = co(function* onPacket(packet) {
var unlock; var unlock;
if (this.destroyed)
throw new Error('Destroyed peer sent a packet.');
switch (packet.type) { switch (packet.type) {
case packetTypes.VERSION: case packetTypes.VERSION:
case packetTypes.CMPCTBLOCK: case packetTypes.CMPCTBLOCK:

5
lib/net/pool.js
View File

@ -1562,6 +1562,9 @@ Pool.prototype.getData = co(function* getData(peer, type, hash) {
if (exists) if (exists)
return true; return true;
if (peer.destroyed)
throw new Errror('Peer is already destroyed (getdata).');
item = new LoadRequest(this, peer, type, hash); item = new LoadRequest(this, peer, type, hash);
if (type === this.txType) { if (type === this.txType) {
@ -2359,7 +2362,7 @@ LoadRequest.prototype.start = function start() {
*/ */
LoadRequest.prototype.finish = function finish() { LoadRequest.prototype.finish = function finish() {
if (this.pool.requestMap[this.hash]) { if (this.pool.requestMap[this.hash] === this) {
delete this.pool.requestMap[this.hash]; delete this.pool.requestMap[this.hash];
if (this.active) { if (this.active) {
this.active = false; this.active = false;