Skip to content

Commit

Permalink
net: emit host in lookup event
Browse files Browse the repository at this point in the history
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 <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
  • Loading branch information
entertainyou authored and evanlucas committed Mar 30, 2016
1 parent 6ea6b64 commit d1483f0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
1 change: 1 addition & 0 deletions doc/api/net.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion lib/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 8 additions & 6 deletions test/parallel/test-net-dns-lookup.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit d1483f0

Please sign in to comment.