Skip to content

dns: refactor dns to more modern JavaScript #5762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
benjamingr wants to merge 11 commits into from
Closed

dns: refactor dns to more modern JavaScript #5762

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8d6c22e
initial work - normalize if/else style
benjamingr Mar 17, 2016
f5c4f55
more template strings and less abused returns
benjamingr Mar 17, 2016
2784847
block over for loop, spread arguments from apply
benjamingr Mar 17, 2016
48fde13
address comments
benjamingr Mar 17, 2016
bfe0f40
address comments from mscdex
benjamingr Mar 17, 2016
2d54ae9
refactor forEach to map
benjamingr Mar 17, 2016
85f9b87
var to const
benjamingr Mar 17, 2016
457de39
removed references to net module
benjamingr Mar 17, 2016
4f124f7
changed {} to Object.create(null) to prevent __proto__ meddling
benjamingr Mar 17, 2016
6fe93ed
remove isValidIp and check for 0 instead
benjamingr Mar 17, 2016
b3ced41
silly mistake missing $
benjamingr Mar 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove isValidIp and check for 0 instead
  • Loading branch information
@benjamingr
benjamingr committed Mar 17, 2016
commit 6fe93ed8063458928d8851e60eaca9190eb35571
10 changes: 3 additions & 7 deletions lib/dns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ function errnoException(err, syscall, hostname) {
return ex;
}

function validIpVersion(isIpResult) {
return isIpResult !== 0;
}

// c-ares invokes a callback either synchronously or asynchronously,
// but the dns API should always invoke a callback asynchronously.
//
Expand Down Expand Up @@ -311,23 +307,23 @@ exports.setServers = function(servers) {
const newSet = servers.map((serv) => {
var ipVersion = isIp(serv);

if (validIpVersion(ipVersion)) {
if (ipVersion !== 0) {
return [ver, serv];
}
const match = serv.match(/\[(.*)\](:\d+)?/);

// we have an IPv6 in brackets
if (match) {
ipVersion = isIp(match[1]);
if (validIpVersion(ipVersion)) {
if (ipVersion !== 0) {
return [ver, match[1]];
}
}

var s = serv.split(/:\d+$/)[0];
ipVersion = isIp(s);

if (validIpVersion(ipVersion)) {
if (ipVersion !== 0) {
return [ver, s];
}

Expand Down