Merge pull request #46 from akomelj/master

Fixed IRI negotiation bug #5

Author: romansemko

dist/node/node.js

@@ -537,14 +537,14 @@ var Node = function (_Base) {
                         UDPPort = head.UDPPort,
                         remoteKey = head.remoteKey,
                         name = head.name,
-                        wishedProtocol = head.protocol;
+                        protocol = head.protocol;
 
-                    var protocol = _this9._negotiateProtocol(wishedProtocol);
-                    _this9.list.update(peer, { port: port, nelsonID: nelsonID, TCPPort: TCPPort, UDPPort: UDPPort, remoteKey: remoteKey, name: name, protocol: protocol }).then(function () {
-                        if (protocol) {
+                    var IRIProtocol = _this9._negotiateProtocol(protocol);
+                    _this9.list.update(peer, { port: port, nelsonID: nelsonID, TCPPort: TCPPort, UDPPort: UDPPort, remoteKey: remoteKey, name: name, IRIProtocol: IRIProtocol }).then(function () {
+                        if (IRIProtocol) {
                             _this9._ready && _this9.iri.addNeighbors([peer]);
                         } else {
-                            _this9.log(('Couldn\'t negotiate protocol with ' + peer.data.hostname + ': my ' + _this9.opts.IRIProtocol + ' vs remote ' + wishedProtocol).yellow);
+                            _this9.log(('Couldn\'t negotiate protocol with ' + peer.data.hostname + ': my ' + _this9.opts.IRIProtocol + ' vs remote ' + IRIProtocol).yellow);
                             removeNeighbor();
                         }
                     });

src/node/node.js

@@ -399,13 +399,13 @@ class Node extends Base {
                     this.log('!!', 'wrong headers received', head);
                     return removeNeighbor();
                 }
-                const { port, nelsonID, TCPPort, UDPPort, remoteKey, name, protocol: wishedProtocol } = head;
-                const protocol = this._negotiateProtocol(wishedProtocol);
-                this.list.update(peer, { port, nelsonID, TCPPort, UDPPort, remoteKey, name, protocol }).then(() => {
-                    if (protocol) {
+                const { port, nelsonID, TCPPort, UDPPort, remoteKey, name, protocol } = head;
+                const IRIProtocol = this._negotiateProtocol(protocol);
+                this.list.update(peer, { port, nelsonID, TCPPort, UDPPort, remoteKey, name, IRIProtocol }).then(() => {
+                    if (IRIProtocol) {
                         this._ready && this.iri.addNeighbors([ peer ]);
                     } else {
-                        this.log(`Couldn't negotiate protocol with ${peer.data.hostname}: my ${this.opts.IRIProtocol} vs remote ${wishedProtocol}`.yellow);
+                        this.log(`Couldn't negotiate protocol with ${peer.data.hostname}: my ${this.opts.IRIProtocol} vs remote ${IRIProtocol}`.yellow);
                         removeNeighbor();
                     }
                 });