From 3f76419a04da48b92b50b51450685b8565886200 Mon Sep 17 00:00:00 2001
From: James Hight <james@zavoo.com>
Date: Mon, 31 Dec 2012 21:01:42 -0500
Subject: [PATCH] net: add localAddress and localPort to Socket

---
 doc/api/net.markdown                       | 11 +++++
 lib/net.js                                 | 24 +++++++++++
 test/simple/test-net-local-address-port.js | 47 ++++++++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100644 test/simple/test-net-local-address-port.js

diff --git a/doc/api/net.markdown b/doc/api/net.markdown
index b829a47e7dd1ef..2b54dbeb0f5f2d 100644
--- a/doc/api/net.markdown
+++ b/doc/api/net.markdown
@@ -419,6 +419,17 @@ The string representation of the remote IP address. For example,
 The numeric representation of the remote port. For example,
 `80` or `21`.
 
+### socket.localAddress
+
+The string representation of the local IP address the remote client is
+connecting on. For example, if you are listening on `'0.0.0.0'` and the
+client connects on `'192.168.1.1'`, the value would be `'192.168.1.1'`.
+
+### socket.localPort
+
+The numeric representation of the local port. For example,
+`80` or `21`.
+
 ### socket.bytesRead
 
 The amount of received bytes.
diff --git a/lib/net.js b/lib/net.js
index fc56918eba9aa8..a347c08507c31e 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -526,6 +526,30 @@ Socket.prototype.__defineGetter__('remotePort', function() {
 });
 
 
+Socket.prototype._getsockname = function() {
+  if (!this._handle || !this._handle.getsockname) {
+    return {};
+  }
+  if (!this._sockname) {
+    this._sockname = this._handle.getsockname();
+    if (this._sockname === null) {
+      return {};
+    }
+  }
+  return this._sockname;
+};
+
+
+Socket.prototype.__defineGetter__('localAddress', function() {
+  return this._getsockname().address;
+});
+
+
+Socket.prototype.__defineGetter__('localPort', function() {
+  return this._getsockname().port;
+});
+
+
 Socket.prototype.write = function(chunk, encoding, cb) {
   if (typeof chunk !== 'string' && !Buffer.isBuffer(chunk))
     throw new TypeError('invalid data');
diff --git a/test/simple/test-net-local-address-port.js b/test/simple/test-net-local-address-port.js
new file mode 100644
index 00000000000000..0f59cec9b6fa97
--- /dev/null
+++ b/test/simple/test-net-local-address-port.js
@@ -0,0 +1,47 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+var net = require('net');
+
+var conns = 0, conns_closed = 0;
+
+var server = net.createServer(function(socket) {
+  conns++;
+  assert.equal('127.0.0.1', socket.localAddress);
+  assert.equal(socket.localPort, common.PORT);
+  socket.on('end', function() {
+    server.close();
+  });
+  socket.resume();
+});
+
+server.listen(common.PORT, '127.0.0.1', function() {
+  var client = net.createConnection(common.PORT, '127.0.0.1');
+  client.on('connect', function() {
+    client.end();
+  });
+});
+
+process.on('exit', function() {
+  assert.equal(1, conns);
+});