Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit b2252ea

Browse filesBrowse files
UlisesGasconMylesBorins
authored andcommitted
dns: fix inconsistent (hostname vs host)
Fixes: #20892 PR-URL: #23572 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
1 parent 20430ae commit b2252ea
Copy full SHA for b2252ea

File tree

Expand file treeCollapse file tree

4 files changed

+26
-25
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

4 files changed

+26
-25
lines changed
Open diff view settings
Collapse file

‎lib/dns.js‎

Copy file name to clipboardExpand all lines: lib/dns.js
+10-10Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -150,21 +150,21 @@ Object.defineProperty(lookup, customPromisifyArgs,
150150
{ value: ['address', 'family'], enumerable: false });
151151

152152

153-
function onlookupservice(err, host, service) {
153+
function onlookupservice(err, hostname, service) {
154154
if (err)
155-
return this.callback(dnsException(err, 'getnameinfo', this.host));
155+
return this.callback(dnsException(err, 'getnameinfo', this.hostname));
156156

157-
this.callback(null, host, service);
157+
this.callback(null, hostname, service);
158158
}
159159

160160

161161
// lookupService(address, port, callback)
162-
function lookupService(host, port, callback) {
162+
function lookupService(hostname, port, callback) {
163163
if (arguments.length !== 3)
164-
throw new ERR_MISSING_ARGS('host', 'port', 'callback');
164+
throw new ERR_MISSING_ARGS('hostname', 'port', 'callback');
165165

166-
if (isIP(host) === 0)
167-
throw new ERR_INVALID_OPT_VALUE('host', host);
166+
if (isIP(hostname) === 0)
167+
throw new ERR_INVALID_OPT_VALUE('hostname', hostname);
168168

169169
if (!isLegalPort(port))
170170
throw new ERR_SOCKET_BAD_PORT(port);
@@ -176,12 +176,12 @@ function lookupService(host, port, callback) {
176176

177177
var req = new GetNameInfoReqWrap();
178178
req.callback = callback;
179-
req.host = host;
179+
req.hostname = hostname;
180180
req.port = port;
181181
req.oncomplete = onlookupservice;
182182

183-
var err = cares.getnameinfo(req, host, port);
184-
if (err) throw dnsException(err, 'getnameinfo', host);
183+
var err = cares.getnameinfo(req, hostname, port);
184+
if (err) throw dnsException(err, 'getnameinfo', hostname);
185185
return req;
186186
}
187187

Collapse file

‎lib/internal/dns/promises.js‎

Copy file name to clipboardExpand all lines: lib/internal/dns/promises.js
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,34 +127,34 @@ function onlookupservice(err, hostname, service) {
127127
this.resolve({ hostname, service });
128128
}
129129

130-
function createLookupServicePromise(host, port) {
130+
function createLookupServicePromise(hostname, port) {
131131
return new Promise((resolve, reject) => {
132132
const req = new GetNameInfoReqWrap();
133133

134-
req.host = host;
134+
req.hostname = hostname;
135135
req.port = port;
136136
req.oncomplete = onlookupservice;
137137
req.resolve = resolve;
138138
req.reject = reject;
139139

140-
const err = getnameinfo(req, host, port);
140+
const err = getnameinfo(req, hostname, port);
141141

142142
if (err)
143-
reject(dnsException(err, 'getnameinfo', host));
143+
reject(dnsException(err, 'getnameinfo', hostname));
144144
});
145145
}
146146

147-
function lookupService(host, port) {
147+
function lookupService(hostname, port) {
148148
if (arguments.length !== 2)
149-
throw new ERR_MISSING_ARGS('host', 'port');
149+
throw new ERR_MISSING_ARGS('hostname', 'port');
150150

151-
if (isIP(host) === 0)
152-
throw new ERR_INVALID_OPT_VALUE('host', host);
151+
if (isIP(hostname) === 0)
152+
throw new ERR_INVALID_OPT_VALUE('hostname', hostname);
153153

154154
if (!isLegalPort(port))
155155
throw new ERR_SOCKET_BAD_PORT(port);
156156

157-
return createLookupServicePromise(host, +port);
157+
return createLookupServicePromise(hostname, +port);
158158
}
159159

160160

Collapse file

‎test/common/dns.js‎

Copy file name to clipboardExpand all lines: test/common/dns.js
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,12 +291,12 @@ const mockedErrorCode = 'ENOTFOUND';
291291
const mockedSysCall = 'getaddrinfo';
292292

293293
function errorLookupMock(code = mockedErrorCode, syscall = mockedSysCall) {
294-
return function lookupWithError(host, dnsopts, cb) {
295-
const err = new Error(`${syscall} ${code} ${host}`);
294+
return function lookupWithError(hostname, dnsopts, cb) {
295+
const err = new Error(`${syscall} ${code} ${hostname}`);
296296
err.code = code;
297297
err.errno = code;
298298
err.syscall = syscall;
299-
err.hostname = host;
299+
err.hostname = hostname;
300300
cb(err);
301301
};
302302
}
Collapse file

‎test/parallel/test-dns.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-dns.js
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,12 @@ dns.lookup('', {
261261
const err = {
262262
code: 'ERR_MISSING_ARGS',
263263
type: TypeError,
264-
message: 'The "host", "port", and "callback" arguments must be specified'
264+
message: 'The "hostname", "port", and "callback" arguments must be ' +
265+
'specified'
265266
};
266267

267268
common.expectsError(() => dns.lookupService('0.0.0.0'), err);
268-
err.message = 'The "host" and "port" arguments must be specified';
269+
err.message = 'The "hostname" and "port" arguments must be specified';
269270
common.expectsError(() => dnsPromises.lookupService('0.0.0.0'), err);
270271
}
271272

@@ -274,7 +275,7 @@ dns.lookup('', {
274275
const err = {
275276
code: 'ERR_INVALID_OPT_VALUE',
276277
type: TypeError,
277-
message: `The value "${invalidHost}" is invalid for option "host"`
278+
message: `The value "${invalidHost}" is invalid for option "hostname"`
278279
};
279280

280281
common.expectsError(() => {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.