diff options
author | Benjamin Gruenbaum <inglor@gmail.com> | 2016-03-19 20:26:05 +0200 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2016-03-21 08:50:59 -0700 |
commit | b9299884dc1a15c2b08429d3adba1d9bba5b3af4 (patch) | |
tree | 04675b544f2820bae4a6ed2773a0ac0a836eba0e /lib/dns.js | |
parent | ccb7b45ba0a568bfbde37b34b162676861a662d4 (diff) | |
download | android-node-v8-b9299884dc1a15c2b08429d3adba1d9bba5b3af4.tar.gz android-node-v8-b9299884dc1a15c2b08429d3adba1d9bba5b3af4.tar.bz2 android-node-v8-b9299884dc1a15c2b08429d3adba1d9bba5b3af4.zip |
dns: use isIp consistently
Currently the DNS module imports isIP from both cares and `net` and
uses both of them both throughout the code base. This PR removes the
direct dependency `dns` has on `net` and uses `isIp` from c-ares all
the time. Note that both functions do the same thing.
PR-URL: https://github.com/nodejs/node/pull/5804
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'lib/dns.js')
-rw-r--r-- | lib/dns.js | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/dns.js b/lib/dns.js index 04cc587551..af2d124dbb 100644 --- a/lib/dns.js +++ b/lib/dns.js @@ -1,6 +1,5 @@ 'use strict'; -const net = require('net'); const util = require('util'); const cares = process.binding('cares_wrap'); @@ -11,7 +10,7 @@ const GetAddrInfoReqWrap = cares.GetAddrInfoReqWrap; const GetNameInfoReqWrap = cares.GetNameInfoReqWrap; const QueryReqWrap = cares.QueryReqWrap; -const isIp = net.isIP; +const isIP = cares.isIP; const isLegalPort = internalNet.isLegalPort; @@ -148,7 +147,7 @@ exports.lookup = function lookup(hostname, options, callback) { return {}; } - var matchedFamily = net.isIP(hostname); + var matchedFamily = isIP(hostname); if (matchedFamily) { if (all) { callback(null, [{address: hostname, family: matchedFamily}]); @@ -188,7 +187,7 @@ exports.lookupService = function(host, port, callback) { if (arguments.length !== 3) throw new Error('Invalid arguments'); - if (cares.isIP(host) === 0) + if (isIP(host) === 0) throw new TypeError('"host" argument needs to be a valid IP address'); if (port == null || !isLegalPort(port)) @@ -290,7 +289,7 @@ exports.setServers = function(servers) { var newSet = []; servers.forEach(function(serv) { - var ver = isIp(serv); + var ver = isIP(serv); if (ver) return newSet.push([ver, serv]); @@ -299,13 +298,13 @@ exports.setServers = function(servers) { // we have an IPv6 in brackets if (match) { - ver = isIp(match[1]); + ver = isIP(match[1]); if (ver) return newSet.push([ver, match[1]]); } var s = serv.split(/:\d+$/)[0]; - ver = isIp(s); + ver = isIP(s); if (ver) return newSet.push([ver, s]); |