Merge pull request #55 from braydonf/bug/addr-port

fixed bug with incoming connections not having a port on addr
bitpay · Mar 23, 2015 · fa06ce0 · fa06ce0
2 parents df632f3 + c555671
commit fa06ce0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/lib/pool.js b/lib/pool.js
@@ -366,6 +366,7 @@ Pool.prototype.listen = function() {
     } else {
       addr.ip.v4 = socket.remoteAddress;
     }
+    addr.port = socket.remotePort;
 
     addr = self._addAddr(addr);
     self._addConnectedPeer(socket, addr);

diff --git a/test/pool.js b/test/pool.js
@@ -486,6 +486,28 @@ describe('Pool', function() {
       pool.listen();
     });
 
+    it('include port for addr on incoming connections', function(done) {
+      var port = 12345;
+      sinon.stub(net, 'createServer', function(callback) {
+        callback({
+          remoteAddress: '127.0.0.1',
+          remotePort: port
+        });
+        return {
+          listen: sinon.stub()
+        };
+      });
+      var pool = new Pool({network: Networks.livenet, maxSize: 1});
+      pool._addAddr = function(addr) {
+        should.exist(addr.port);
+        addr.port.should.equal(port);
+        net.createServer.restore();
+        done();
+      };
+      pool._addConnectedPeer = sinon.stub();
+      pool.listen();
+    });
+
     it('should handle an ipv4 connection', function(done) {
       var ipv4 = '127.0.0.1';
       sinon.stub(net, 'createServer', function(callback) {