net: properly export remoteAddress to user land

Fixes failing test:
  test/simple/test-net-remote-address-port.js

2 files changed, 18 insertions, 1 deletions

diff --git a/lib/net_legacy.js b/lib/net_legacy.js
index 4221aa1146..2abe2cde7a 100644
--- a/lib/net_legacy.js
+++ b/lib/net_legacy.js
@@ -730,6 +730,12 @@ Socket.prototype.connect = function() {
       if (err) {
         self.emit('error', err);
       } else {
+        addressType = addressType || 4;
+
+        // node_net.cc handles null host names graciously but user land
+        // expects remoteAddress to have a meaningful value
+        ip = ip || (addressType === 4 ? '127.0.0.1' : '0:0:0:0:0:0:0:1');
+
         timers.active(self);
         self.type = addressType == 4 ? 'tcp4' : 'tcp6';
         self.fd = socket(self.type);
diff --git a/lib/net_uv.js b/lib/net_uv.js
index c89c263bfa..e990cb9aa9 100644
--- a/lib/net_uv.js
+++ b/lib/net_uv.js
@@ -69,6 +69,11 @@ function initSocketHandle(self) {
   if (self._handle) {
     self._handle.socket = self;
     self._handle.onread = onread;
+
+    var sockname = self._handle.getsockname();
+    self.remoteAddress = sockname.address;
+    self.remotePort = sockname.port;
+    // also export sockname.family?
   }
 }
 
@@ -464,7 +469,13 @@ Socket.prototype.connect = function(port /* [host], [cb] */) {
       } else {
         timers.active(self);
 
-        connect(self, ip || '127.0.0.1', port, ip ? addressType : 4);
+        addressType = addressType || 4;
+
+        // node_net.cc handles null host names graciously but user land
+        // expects remoteAddress to have a meaningful value
+        ip = ip || (addressType === 4 ? '127.0.0.1' : '0:0:0:0:0:0:0:1');
+
+        connect(self, ip, port, addressType);
       }
     });