1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dns: refactor internal/dns/promises.js

Browse Source 
Use `isIP()` instead of `isIPv4()` since it does the additional
functionality that we were adding after our calls to `isIP()`.

This not-so-incidentally also increases code coverage from tests. At
least one of the replaced ternaries was difficult to cover reliably
because operating system/configuration variances were too unpredictable.

PR-URL: https://github.com/nodejs/node/pull/27081
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This commit is contained in:
Rich Trott 2019-04-03 17:07:15 -07:00
parent 14df42fd00
commit bc2d258a3e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/internal/dns/promises.js
View File

@ -10,7 +10,7 @@ const {
} = require('internal/dns/utils'); } = require('internal/dns/utils');
const { codes, dnsException } = require('internal/errors'); const { codes, dnsException } = require('internal/errors');
const { toASCII } = require('internal/idna'); const { toASCII } = require('internal/idna');
const { isIP, isIPv4, isLegalPort } = require('internal/net'); const { isIP, isLegalPort } = require('internal/net');
const { const {
getaddrinfo, getaddrinfo,
getnameinfo, getnameinfo,
@ -34,7 +34,7 @@ function onlookup(err, addresses) {
return; return;
} }
const family = this.family ? this.family : isIPv4(addresses[0]) ? 4 : 6; const family = this.family ? this.family : isIP(addresses[0]);
this.resolve({ address: addresses[0], family }); this.resolve({ address: addresses[0], family });
} }
@ -51,7 +51,7 @@ function onlookupall(err, addresses) {
addresses[i] = { addresses[i] = {
address, address,
family: family ? family : isIPv4(addresses[i]) ? 4 : 6 family: family ? family : isIP(addresses[i])
}; };
} }