net: emit host in lookup event

Previously, we emitted ip and addressType. This change includes the host as the last argument to the lookup event. PR-URL: #5598 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Evan Lucas <[email protected]>
nodejs · Mar 30, 2016 · d1483f0 · d1483f0
1 parent 6ea6b64
commit d1483f0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/doc/api/net.markdown b/doc/api/net.markdown
@@ -317,6 +317,7 @@ Not applicable to UNIX sockets.
 * `err` {Error|Null} The error object.  See [`dns.lookup()`][].
 * `address` {String} The IP address.
 * `family` {String|Null} The address type.  See [`dns.lookup()`][].
+* `host` {String} The hostname.
 
 ### Event: 'timeout'
 

diff --git a/lib/net.js b/lib/net.js
@@ -963,7 +963,7 @@ function lookupAndConnect(self, options) {
   self._host = host;
   var lookup = options.lookup || dns.lookup;
   lookup(host, dnsopts, function(err, ip, addressType) {
-    self.emit('lookup', err, ip, addressType);
+    self.emit('lookup', err, ip, addressType, host);
 
     // It's possible we were destroyed while looking this up.
     // XXX it would be great if we could cancel the promise returned by

diff --git a/test/parallel/test-net-dns-lookup.js b/test/parallel/test-net-dns-lookup.js
@@ -10,12 +10,14 @@ var server = net.createServer(function(client) {
 });
 
 server.listen(common.PORT, '127.0.0.1', function() {
-  net.connect(common.PORT, 'localhost').on('lookup', function(err, ip, type) {
-    assert.equal(err, null);
-    assert.equal(ip, '127.0.0.1');
-    assert.equal(type, '4');
-    ok = true;
-  });
+  net.connect(common.PORT, 'localhost')
+    .on('lookup', function(err, ip, type, host) {
+      assert.equal(err, null);
+      assert.equal(ip, '127.0.0.1');
+      assert.equal(type, '4');
+      assert.equal(host, 'localhost');
+      ok = true;
+    });
 });
 
 process.on('exit', function() {