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

net: bip150 - do not attempt handshake if bip151 handshake failed.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-08-25 17:33:16 -07:00
parent 7b61e32a70
commit aa7f105f38
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/sample.conf
View File

@ -44,7 +44,7 @@ bip151: true
listen: true listen: true
max-peers: 8 max-peers: 8
max-leeches: 30 max-leeches: 30
bip150: true bip150: false
identity-key: 74b4147957813b62cc8987f2b711ddb31f8cb46dcbf71502033da66053c8780a identity-key: 74b4147957813b62cc8987f2b711ddb31f8cb46dcbf71502033da66053c8780a
auth-peers: ./authorized-peers auth-peers: ./authorized-peers
known-peers: ./known-peers known-peers: ./known-peers

15
lib/net/peer.js
View File

@ -292,7 +292,7 @@ Peer.prototype._onConnect = function _onConnect() {
assert(!this.bip151.completed); assert(!this.bip151.completed);
this.logger.info('Attempting BIP151 handshake (%s).', this.hostname); this.logger.info('Attempting BIP151 handshake (%s).', this.hostname);
this.write(this.framer.encinit(this.bip151.toEncinit())); this.write(this.framer.encinit(this.bip151.toEncinit()));
return this.bip151.wait(5000, function(err) { return this.bip151.wait(3000, function(err) {
if (err) if (err)
self._error(err, true); self._error(err, true);
self._onBIP151(); self._onBIP151();
@ -320,10 +320,19 @@ Peer.prototype._onBIP151 = function _onBIP151() {
if (this.bip150) { if (this.bip150) {
assert(!this.bip150.completed); assert(!this.bip150.completed);
if (!this.bip151.handshake)
return this._error('BIP151 handshake was not completed for BIP150.');
this.logger.info('Attempting BIP150 handshake (%s).', this.hostname); this.logger.info('Attempting BIP150 handshake (%s).', this.hostname);
if (this.bip150.outbound && this.bip150.peerIdentity)
if (this.bip150.outbound) {
if (!this.bip150.peerIdentity)
return this._error('No known identity for peer.');
this.write(this.framer.authChallenge(this.bip150.toChallenge())); this.write(this.framer.authChallenge(this.bip150.toChallenge()));
return this.bip150.wait(5000, function(err) { }
return this.bip150.wait(3000, function(err) {
if (err) if (err)
return self._error(err); return self._error(err);
self._onHandshake(); self._onHandshake();