diff options
author | Ulises Gascón <ulisesgascongonzalez@gmail.com> | 2018-06-22 17:41:42 +0000 |
---|---|---|
committer | Rich Trott <rtrott@gmail.com> | 2018-10-20 21:56:28 -0700 |
commit | beb0f03e78a8fab01169213aafeebf9fabf1db43 (patch) | |
tree | 4e9c35643d66dee33b70dcb101af8c4d0935b93f /lib | |
parent | 6c5e97f2f0928851d613ce90a84a8f8baaba5083 (diff) | |
download | android-node-v8-beb0f03e78a8fab01169213aafeebf9fabf1db43.tar.gz android-node-v8-beb0f03e78a8fab01169213aafeebf9fabf1db43.tar.bz2 android-node-v8-beb0f03e78a8fab01169213aafeebf9fabf1db43.zip |
dns: fix inconsistent (hostname vs host)
Fixes: https://github.com/nodejs/node/issues/20892
PR-URL: https://github.com/nodejs/node/pull/23572
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/dns.js | 20 | ||||
-rw-r--r-- | lib/internal/dns/promises.js | 18 |
2 files changed, 19 insertions, 19 deletions
diff --git a/lib/dns.js b/lib/dns.js index f3b86a471d..ac3f6d6f0e 100644 --- a/lib/dns.js +++ b/lib/dns.js @@ -152,21 +152,21 @@ Object.defineProperty(lookup, customPromisifyArgs, { value: ['address', 'family'], enumerable: false }); -function onlookupservice(err, host, service) { +function onlookupservice(err, hostname, service) { if (err) - return this.callback(dnsException(err, 'getnameinfo', this.host)); + return this.callback(dnsException(err, 'getnameinfo', this.hostname)); - this.callback(null, host, service); + this.callback(null, hostname, service); } // lookupService(address, port, callback) -function lookupService(host, port, callback) { +function lookupService(hostname, port, callback) { if (arguments.length !== 3) - throw new ERR_MISSING_ARGS('host', 'port', 'callback'); + throw new ERR_MISSING_ARGS('hostname', 'port', 'callback'); - if (isIP(host) === 0) - throw new ERR_INVALID_OPT_VALUE('host', host); + if (isIP(hostname) === 0) + throw new ERR_INVALID_OPT_VALUE('hostname', hostname); if (!isLegalPort(port)) throw new ERR_SOCKET_BAD_PORT(port); @@ -178,12 +178,12 @@ function lookupService(host, port, callback) { var req = new GetNameInfoReqWrap(); req.callback = callback; - req.host = host; + req.hostname = hostname; req.port = port; req.oncomplete = onlookupservice; - var err = cares.getnameinfo(req, host, port); - if (err) throw dnsException(err, 'getnameinfo', host); + var err = cares.getnameinfo(req, hostname, port); + if (err) throw dnsException(err, 'getnameinfo', hostname); return req; } diff --git a/lib/internal/dns/promises.js b/lib/internal/dns/promises.js index 8baa0fa0de..4bf5ac0219 100644 --- a/lib/internal/dns/promises.js +++ b/lib/internal/dns/promises.js @@ -129,34 +129,34 @@ function onlookupservice(err, hostname, service) { this.resolve({ hostname, service }); } -function createLookupServicePromise(host, port) { +function createLookupServicePromise(hostname, port) { return new Promise((resolve, reject) => { const req = new GetNameInfoReqWrap(); - req.host = host; + req.hostname = hostname; req.port = port; req.oncomplete = onlookupservice; req.resolve = resolve; req.reject = reject; - const err = getnameinfo(req, host, port); + const err = getnameinfo(req, hostname, port); if (err) - reject(dnsException(err, 'getnameinfo', host)); + reject(dnsException(err, 'getnameinfo', hostname)); }); } -function lookupService(host, port) { +function lookupService(hostname, port) { if (arguments.length !== 2) - throw new ERR_MISSING_ARGS('host', 'port'); + throw new ERR_MISSING_ARGS('hostname', 'port'); - if (isIP(host) === 0) - throw new ERR_INVALID_OPT_VALUE('host', host); + if (isIP(hostname) === 0) + throw new ERR_INVALID_OPT_VALUE('hostname', hostname); if (!isLegalPort(port)) throw new ERR_SOCKET_BAD_PORT(port); - return createLookupServicePromise(host, +port); + return createLookupServicePromise(hostname, +port); } |