Merge pull request socketio#329 from 3rd-Eden/remoteAddress

rauchg · rauchg · commit 7257e1ec3688 · 2011-07-03T05:43:48.000-07:00
.address() returned server ip &gt;_&lt;, solved with this patch and adjusted th
diff --git a/lib/manager.js b/lib/manager.js
@@ -1,3 +1,4 @@
+
 /*!
  * socket.io-node
  * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
@@ -819,10 +820,16 @@ Manager.prototype.handshakeData = function (data) {
   var connection = data.request.connection
     , connectionAddress;
 
-  if (connection.address) {
-    connectionAddress = connection.remoteAddress; // Bug fix, returns client IP instead of .address() which was returning server IP
-  } else if (connection.socket && connection.socket.address) {
-    connectionAddress = connection.socket.address(); // Do we need .remoteAddress here too?
+  if (connection.remoteAddress) {
+    connectionAddress = {
+        address: connection.remoteAddress
+      , port: connection.remotePort
+    }; 
+  } else if (connection.socket && connection.socket.remoteAddress) {
+    connectionAddress = {
+        address: connection.socket.remoteAddress
+      , port: connection.socket.remotePort
+    }; 
   }
 
   return {
diff --git a/test/namespace.test.js b/test/namespace.test.js
@@ -80,8 +80,8 @@ module.exports = {
         fn(null, true);
       })
       .on('connection', function (socket) {
-        socket.handshake.address.address.should.equal('127.0.0.1');
-        socket.handshake.address.port.should.equal(ports);
+        (!!socket.handshake.address.address).should.be.true;
+        (!!socket.handshake.address.port).should.be.true;
         socket.handshake.headers.host.should.equal('localhost');
         socket.handshake.headers.connection.should.equal('keep-alive');
         socket.handshake.time.should.match(/GMT/);
diff --git a/test/transports.websocket.test.js b/test/transports.websocket.test.js
@@ -1493,8 +1493,8 @@ module.exports = {
       , ws;
 
     io.sockets.on('connection', function (socket) {
-      socket.handshake.address.address.should.equal('127.0.0.1');
-      socket.handshake.address.port.should.equal(ports);
+      (!!socket.handshake.address.address).should.be.true;
+      (!!socket.handshake.address.port).should.be.true;
       socket.handshake.headers.host.should.equal('localhost');
       socket.handshake.headers.connection.should.equal('keep-alive');
       socket.handshake.time.should.match(/GMT/);
