From 05bbc0ef6f97810a5524511ff348e2486e9b1046 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Wed, 29 Jan 2020 13:12:15 +0100
Subject: [PATCH 01/18] dns: default to verbatim=true in dns.lookup()

Switch the default from false (reorder the result so that IPv4 addresses
come before IPv6 addresses) to true (return them exactly as the resolver
sent them to us.)

Fixes: https://github.com/nodejs/node/issues/31566
Refs: nodejs#6307
Refs: nodejs#20710
Refs: nodejs#38099
Reissue of nodejs#31567
Reissue of nodejs#37681
Reissue of nodejs#37931
---
 doc/api/dns.md                                         | 8 +++++---
 lib/internal/dns/utils.js                              | 5 +++--
 test/sequential/test-net-better-error-messages-port.js | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/doc/api/dns.md b/doc/api/dns.md
index af9bb60967e56c..2087715cbeb039 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -170,6 +170,9 @@ section if a custom port is used.
 <!-- YAML
 added: v0.1.90
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/37681
+    description: The `verbatim` options defaults to `true` now.
   - version: v8.5.0
     pr-url: https://github.com/nodejs/node/pull/14731
     description: The `verbatim` option is supported now.
@@ -190,10 +193,9 @@ changes:
   * `verbatim` {boolean} When `true`, the callback receives IPv4 and IPv6
     addresses in the order the DNS resolver returned them. When `false`,
     IPv4 addresses are placed before IPv6 addresses.
-    **Default:** currently `false` (addresses are reordered) but this is
-    expected to change in the not too distant future. Default value is
+    **Default:** `true` (addresses are reordered). Default value is
     configurable using [`dns.setDefaultResultOrder()`][] or
-    [`--dns-result-order`][]. New code should use `{ verbatim: true }`.
+    [`--dns-result-order`][].
 * `callback` {Function}
   * `err` {Error}
   * `address` {string} A string representation of an IPv4 or IPv6 address.
diff --git a/lib/internal/dns/utils.js b/lib/internal/dns/utils.js
index f15f8c7a779ce1..e73300e00049e3 100644
--- a/lib/internal/dns/utils.js
+++ b/lib/internal/dns/utils.js
@@ -193,15 +193,16 @@ function emitInvalidHostnameWarning(hostname) {
   );
 }
 
-let dnsOrder = getOptionValue('--dns-result-order') || 'ipv4first';
+let dnsOrder = getOptionValue('--dns-result-order') || 'verbatim';
 
 function getDefaultVerbatim() {
   switch (dnsOrder) {
     case 'verbatim':
       return true;
     case 'ipv4first':
-    default:
       return false;
+    default:
+      return true;
   }
 }
 
diff --git a/test/sequential/test-net-better-error-messages-port.js b/test/sequential/test-net-better-error-messages-port.js
index 789b2e31801da1..c21427ee395139 100644
--- a/test/sequential/test-net-better-error-messages-port.js
+++ b/test/sequential/test-net-better-error-messages-port.js
@@ -10,5 +10,5 @@ c.on('connect', common.mustNotCall());
 c.on('error', common.mustCall(function(e) {
   assert.strictEqual(e.code, 'ECONNREFUSED');
   assert.strictEqual(e.port, common.PORT);
-  assert.strictEqual(e.address, '127.0.0.1');
+  assert.match(e.address, /^(127\.0\.0\.1|::1)$/);
 }));

From acdfa26dee3cd648f7335ad1e14e5cfffcace715 Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Fri, 3 Sep 2021 22:30:08 +0200
Subject: [PATCH 02/18] dns: fix dns.md

---
 doc/api/dns.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/dns.md b/doc/api/dns.md
index 2087715cbeb039..ef90e15a04dc4b 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -171,7 +171,7 @@ section if a custom port is used.
 added: v0.1.90
 changes:
   - version: REPLACEME
-    pr-url: https://github.com/nodejs/node/pull/37681
+    pr-url: https://github.com/nodejs/node/pull/39987
     description: The `verbatim` options defaults to `true` now.
   - version: v8.5.0
     pr-url: https://github.com/nodejs/node/pull/14731

From 36c0fe21ac3348a6383cce9fdbf31d7513390fbe Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Fri, 3 Sep 2021 23:53:47 +0200
Subject: [PATCH 03/18] dns: added suggestion from comments

---
 lib/internal/dns/utils.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/internal/dns/utils.js b/lib/internal/dns/utils.js
index e73300e00049e3..28109367e36c5a 100644
--- a/lib/internal/dns/utils.js
+++ b/lib/internal/dns/utils.js
@@ -196,14 +196,7 @@ function emitInvalidHostnameWarning(hostname) {
 let dnsOrder = getOptionValue('--dns-result-order') || 'verbatim';
 
 function getDefaultVerbatim() {
-  switch (dnsOrder) {
-    case 'verbatim':
-      return true;
-    case 'ipv4first':
-      return false;
-    default:
-      return true;
-  }
+  return dnsOrder !== 'ipv4first';
 }
 
 function setDefaultResultOrder(value) {

From 09e0021f000e1979c8dbc9b55bd567a6572c9413 Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Sat, 4 Sep 2021 06:36:11 +0200
Subject: [PATCH 04/18] dns: fix test suite, part 1

---
 test/common/inspector-helper.js                 | 3 ++-
 test/parallel/test-cluster-message.js           | 2 +-
 test/sequential/test-https-connect-localport.js | 2 +-
 test/sequential/test-net-connect-local-error.js | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/common/inspector-helper.js b/test/common/inspector-helper.js
index 9c98ce6252c0e3..fec48ddcba7b9c 100644
--- a/test/common/inspector-helper.js
+++ b/test/common/inspector-helper.js
@@ -392,7 +392,7 @@ class NodeInstance extends EventEmitter {
     console.log('[test]', `Testing ${path}`);
     const headers = hostHeaderValue ? { 'Host': hostHeaderValue } : null;
     return this.portPromise.then((port) => new Promise((resolve, reject) => {
-      const req = http.get({ host, port, path, headers }, (res) => {
+      const req = http.get({ host, port, family: 4, path, headers }, (res) => {
         let response = '';
         res.setEncoding('utf8');
         res
@@ -418,6 +418,7 @@ class NodeInstance extends EventEmitter {
     const port = await this.portPromise;
     return http.get({
       port,
+      family: 4,
       path: parseURL(devtoolsUrl).path,
       headers: {
         'Connection': 'Upgrade',
diff --git a/test/parallel/test-cluster-message.js b/test/parallel/test-cluster-message.js
index 45854c77a5a347..35d6c975b28b5f 100644
--- a/test/parallel/test-cluster-message.js
+++ b/test/parallel/test-cluster-message.js
@@ -60,7 +60,7 @@ if (cluster.isWorker) {
     maybeReply();
   });
 
-  server.listen(0, '127.0.0.1');
+  server.listen(0);
 } else if (cluster.isPrimary) {
 
   const checks = {
diff --git a/test/sequential/test-https-connect-localport.js b/test/sequential/test-https-connect-localport.js
index e703fb2287d369..4062a8ad4e6d5d 100644
--- a/test/sequential/test-https-connect-localport.js
+++ b/test/sequential/test-https-connect-localport.js
@@ -23,7 +23,7 @@ const assert = require('assert');
       host: 'localhost',
       pathname: '/',
       port,
-      family: 4,
+      //family: 4,
       localPort: common.PORT,
       rejectUnauthorized: false,
     }, common.mustCall(() => {
diff --git a/test/sequential/test-net-connect-local-error.js b/test/sequential/test-net-connect-local-error.js
index 030c4de750cb4d..6169c14989bd87 100644
--- a/test/sequential/test-net-connect-local-error.js
+++ b/test/sequential/test-net-connect-local-error.js
@@ -9,12 +9,14 @@ const expectedErrorCodes = ['ECONNREFUSED', 'EADDRINUSE'];
 
 const optionsIPv4 = {
   port: common.PORT,
+  family: 4,
   localPort: common.PORT + 1,
   localAddress: common.localhostIPv4
 };
 
 const optionsIPv6 = {
   host: '::1',
+  family: 6,
   port: common.PORT + 2,
   localPort: common.PORT + 3,
   localAddress: '::1',

From b352e42f6ea6ed0d604ccfd16e22409356b7a860 Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Sat, 4 Sep 2021 16:19:51 +0200
Subject: [PATCH 05/18] dns: fix test suite part 2

---
 test/parallel/test-http-localaddress.js                       | 1 +
 test/parallel/test-http-upgrade-client.js                     | 2 +-
 test/parallel/test-http2-connect-options.js                   | 2 +-
 test/parallel/test-https-localaddress.js                      | 1 +
 test/parallel/test-net-dns-lookup.js                          | 2 +-
 test/parallel/test-net-remote-address-port.js                 | 4 ++--
 test/parallel/test-tcp-wrap-listen.js                         | 2 +-
 ...-timers-socket-timeout-removes-other-socket-unref-timer.js | 2 +-
 test/parallel/test-tls-client-getephemeralkeyinfo.js          | 2 +-
 test/parallel/test-tls-client-mindhsize.js                    | 2 +-
 test/parallel/test-tls-wrap-econnreset-localaddress.js        | 1 +
 test/pummel/test-http-upload-timeout.js                       | 2 +-
 test/pummel/test-net-pingpong.js                              | 3 ++-
 test/sequential/test-inspector-open.js                        | 2 +-
 14 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/test/parallel/test-http-localaddress.js b/test/parallel/test-http-localaddress.js
index e237c3bff1ac84..a0e4bb80a3f8c2 100644
--- a/test/parallel/test-http-localaddress.js
+++ b/test/parallel/test-http-localaddress.js
@@ -42,6 +42,7 @@ const server = http.createServer((req, res) => {
 server.listen(0, '127.0.0.1', () => {
   const options = { host: 'localhost',
                     port: server.address().port,
+                    family: 4,
                     path: '/',
                     method: 'GET',
                     localAddress: '127.0.0.2' };
diff --git a/test/parallel/test-http-upgrade-client.js b/test/parallel/test-http-upgrade-client.js
index ea6972a18c7d49..e86979fffd0d1c 100644
--- a/test/parallel/test-http-upgrade-client.js
+++ b/test/parallel/test-http-upgrade-client.js
@@ -49,7 +49,7 @@ const server = net.createServer(function(c) {
   });
 });
 
-server.listen(0, '127.0.0.1', common.mustCall(function() {
+server.listen(0, common.mustCall(function() {
   const port = this.address().port;
   const headers = [
     {
diff --git a/test/parallel/test-http2-connect-options.js b/test/parallel/test-http2-connect-options.js
index 0c7ec807b84d38..233ced016974e2 100644
--- a/test/parallel/test-http2-connect-options.js
+++ b/test/parallel/test-http2-connect-options.js
@@ -22,7 +22,7 @@ const server = http2.createServer((req, res) => {
 });
 
 server.listen(0, '127.0.0.1', common.mustCall(() => {
-  const options = { localAddress: '127.0.0.2' };
+  const options = { localAddress: '127.0.0.2', family: 4 };
 
   const client = http2.connect(
     'http://localhost:' + server.address().port,
diff --git a/test/parallel/test-https-localaddress.js b/test/parallel/test-https-localaddress.js
index 0ac8414b2d4b35..0de0974dc69b04 100644
--- a/test/parallel/test-https-localaddress.js
+++ b/test/parallel/test-https-localaddress.js
@@ -52,6 +52,7 @@ server.listen(0, '127.0.0.1', function() {
   const options = {
     host: 'localhost',
     port: this.address().port,
+    family: 4,
     path: '/',
     method: 'GET',
     localAddress: '127.0.0.2',
diff --git a/test/parallel/test-net-dns-lookup.js b/test/parallel/test-net-dns-lookup.js
index 53052de716ee9e..5a40ce5c598bb2 100644
--- a/test/parallel/test-net-dns-lookup.js
+++ b/test/parallel/test-net-dns-lookup.js
@@ -29,7 +29,7 @@ const server = net.createServer(function(client) {
   server.close();
 });
 
-server.listen(0, '127.0.0.1', common.mustCall(function() {
+server.listen(0, common.mustCall(function() {
   net.connect(this.address().port, 'localhost')
     .on('lookup', common.mustCall(function(err, ip, type, host) {
       assert.strictEqual(err, null);
diff --git a/test/parallel/test-net-remote-address-port.js b/test/parallel/test-net-remote-address-port.js
index 094206f85df34d..4ef686a3de7659 100644
--- a/test/parallel/test-net-remote-address-port.js
+++ b/test/parallel/test-net-remote-address-port.js
@@ -48,8 +48,8 @@ const server = net.createServer(common.mustCall(function(socket) {
   socket.resume();
 }, 2));
 
-server.listen(0, 'localhost', function() {
-  const client = net.createConnection(this.address().port, 'localhost');
+server.listen(0, function() {
+  const client = net.createConnection(this.address().port, '127.0.0.1');
   const client2 = net.createConnection(this.address().port);
   client.on('connect', function() {
     assert.ok(remoteAddrCandidates.includes(client.remoteAddress));
diff --git a/test/parallel/test-tcp-wrap-listen.js b/test/parallel/test-tcp-wrap-listen.js
index 72981b683ccea3..29051481c72583 100644
--- a/test/parallel/test-tcp-wrap-listen.js
+++ b/test/parallel/test-tcp-wrap-listen.js
@@ -14,7 +14,7 @@ const {
 
 const server = new TCP(TCPConstants.SOCKET);
 
-const r = server.bind('0.0.0.0', 0);
+const r = server.bind(0);
 assert.strictEqual(r, 0);
 let port = {};
 server.getsockname(port);
diff --git a/test/parallel/test-timers-socket-timeout-removes-other-socket-unref-timer.js b/test/parallel/test-timers-socket-timeout-removes-other-socket-unref-timer.js
index ccecfe4c63a6a1..01d2367bdb5717 100644
--- a/test/parallel/test-timers-socket-timeout-removes-other-socket-unref-timer.js
+++ b/test/parallel/test-timers-socket-timeout-removes-other-socket-unref-timer.js
@@ -28,7 +28,7 @@ const server = net.createServer(function onClient(client) {
   }
 });
 
-server.listen(0, common.localhostIPv4, common.mustCall(() => {
+server.listen(0, common.mustCall(() => {
   const countdown = new Countdown(2, () => server.close());
 
   {
diff --git a/test/parallel/test-tls-client-getephemeralkeyinfo.js b/test/parallel/test-tls-client-getephemeralkeyinfo.js
index 73ac215102ddbb..82f41cfe7e06bd 100644
--- a/test/parallel/test-tls-client-getephemeralkeyinfo.js
+++ b/test/parallel/test-tls-client-getephemeralkeyinfo.js
@@ -37,7 +37,7 @@ function test(size, type, name, cipher) {
 
   server.on('close', common.mustSucceed());
 
-  server.listen(0, '127.0.0.1', common.mustCall(() => {
+  server.listen(0, common.mustCall(() => {
     const client = tls.connect({
       port: server.address().port,
       rejectUnauthorized: false
diff --git a/test/parallel/test-tls-client-mindhsize.js b/test/parallel/test-tls-client-mindhsize.js
index a6fbc67bd88361..1ccf49fa9292eb 100644
--- a/test/parallel/test-tls-client-mindhsize.js
+++ b/test/parallel/test-tls-client-mindhsize.js
@@ -34,7 +34,7 @@ function test(size, err, next) {
     if (next) next();
   });
 
-  server.listen(0, '127.0.0.1', function() {
+  server.listen(0, function() {
     // Client set minimum DH parameter size to 2048 bits so that
     // it fails when it make a connection to the tls server where
     // dhparams is 1024 bits
diff --git a/test/parallel/test-tls-wrap-econnreset-localaddress.js b/test/parallel/test-tls-wrap-econnreset-localaddress.js
index 30d3a8873fa8f0..b51ddb29ba8b55 100644
--- a/test/parallel/test-tls-wrap-econnreset-localaddress.js
+++ b/test/parallel/test-tls-wrap-econnreset-localaddress.js
@@ -16,6 +16,7 @@ const server = net.createServer((c) => {
   let errored = false;
   tls.connect({
     port: port,
+    family: 4,
     localAddress: common.localhostIPv4
   }, common.localhostIPv4)
     .once('error', common.mustCall((e) => {
diff --git a/test/pummel/test-http-upload-timeout.js b/test/pummel/test-http-upload-timeout.js
index c3ec3ad19d5d37..a9932306127753 100644
--- a/test/pummel/test-http-upload-timeout.js
+++ b/test/pummel/test-http-upload-timeout.js
@@ -44,7 +44,7 @@ server.on('request', function(req, res) {
   req.resume();
 });
 
-server.listen(0, '127.0.0.1', function() {
+server.listen(0, function() {
   for (let i = 0; i < 10; i++) {
     connections++;
 
diff --git a/test/pummel/test-net-pingpong.js b/test/pummel/test-net-pingpong.js
index 0b2947ade41a1c..ac65e32af3c67b 100644
--- a/test/pummel/test-net-pingpong.js
+++ b/test/pummel/test-net-pingpong.js
@@ -38,7 +38,8 @@ function pingPongTest(host, on_complete) {
     if (host === '127.0.0.1') {
       assert.strictEqual(address, '127.0.0.1');
     } else if (host == null || host === 'localhost') {
-      assert(address === '127.0.0.1' || address === '::ffff:127.0.0.1');
+      assert(address === '127.0.0.1' || address === '::ffff:127.0.0.1'
+        || address === '::1');
     } else {
       console.log(`host = ${host}, remoteAddress = ${address}`);
       assert.strictEqual(address, '::1');
diff --git a/test/sequential/test-inspector-open.js b/test/sequential/test-inspector-open.js
index 190a99e7282e52..847f0ab6926f67 100644
--- a/test/sequential/test-inspector-open.js
+++ b/test/sequential/test-inspector-open.js
@@ -80,7 +80,7 @@ function reopenAfterClose(msg) {
 }
 
 function ping(port, callback) {
-  net.connect(port)
+  net.connect({ port, family: 4 })
     .on('connect', function() { close(this); })
     .on('error', function(err) { close(this, err); });
 

From 7956d2d9811cd801c89d15bfac7c06332b72966d Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Sat, 4 Sep 2021 16:24:21 +0200
Subject: [PATCH 06/18] dns: minor lint fix

---
 test/sequential/test-https-connect-localport.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/sequential/test-https-connect-localport.js b/test/sequential/test-https-connect-localport.js
index 4062a8ad4e6d5d..d52c55a6d74fa0 100644
--- a/test/sequential/test-https-connect-localport.js
+++ b/test/sequential/test-https-connect-localport.js
@@ -23,7 +23,6 @@ const assert = require('assert');
       host: 'localhost',
       pathname: '/',
       port,
-      //family: 4,
       localPort: common.PORT,
       rejectUnauthorized: false,
     }, common.mustCall(() => {

From 9ca2309807981f84b0e8dadd52ef87e7f5542b16 Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Sat, 4 Sep 2021 18:01:40 +0200
Subject: [PATCH 07/18] dns: fix lint error in test-net-pingpong.js

---
 test/pummel/test-net-pingpong.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pummel/test-net-pingpong.js b/test/pummel/test-net-pingpong.js
index ac65e32af3c67b..09b30405da5a39 100644
--- a/test/pummel/test-net-pingpong.js
+++ b/test/pummel/test-net-pingpong.js
@@ -38,8 +38,8 @@ function pingPongTest(host, on_complete) {
     if (host === '127.0.0.1') {
       assert.strictEqual(address, '127.0.0.1');
     } else if (host == null || host === 'localhost') {
-      assert(address === '127.0.0.1' || address === '::ffff:127.0.0.1'
-        || address === '::1');
+      assert(address === '127.0.0.1' || address === '::ffff:127.0.0.1' ||
+        address === '::1');
     } else {
       console.log(`host = ${host}, remoteAddress = ${address}`);
       assert.strictEqual(address, '::1');

From 32a4bca17548b5da0bd7f902d7f15950c12c98a6 Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Sat, 4 Sep 2021 18:10:48 +0200
Subject: [PATCH 08/18] dns: fix test suite, part 3

---
 test/parallel/test-net-dns-lookup.js          | 3 ++-
 test/parallel/test-net-remote-address-port.js | 2 +-
 test/parallel/test-tcp-wrap-listen.js         | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/parallel/test-net-dns-lookup.js b/test/parallel/test-net-dns-lookup.js
index 5a40ce5c598bb2..289a1563a52dbe 100644
--- a/test/parallel/test-net-dns-lookup.js
+++ b/test/parallel/test-net-dns-lookup.js
@@ -34,7 +34,8 @@ server.listen(0, common.mustCall(function() {
     .on('lookup', common.mustCall(function(err, ip, type, host) {
       assert.strictEqual(err, null);
       assert.strictEqual(ip, '127.0.0.1');
-      assert.strictEqual(type, 4);
+      assert.match(ip,/^(127\.0\.0\.1|::1)$/);
+      assert.match(type.toString, /^(4|6)$/);
       assert.strictEqual(host, 'localhost');
     }));
 }));
diff --git a/test/parallel/test-net-remote-address-port.js b/test/parallel/test-net-remote-address-port.js
index 4ef686a3de7659..47a495c09b55ee 100644
--- a/test/parallel/test-net-remote-address-port.js
+++ b/test/parallel/test-net-remote-address-port.js
@@ -28,7 +28,7 @@ const net = require('net');
 let conns_closed = 0;
 
 const remoteAddrCandidates = [ common.localhostIPv4 ];
-if (common.hasIPv6) remoteAddrCandidates.push('::ffff:127.0.0.1');
+if (common.hasIPv6) remoteAddrCandidates.push('::1', '::ffff:127.0.0.1');
 
 const remoteFamilyCandidates = ['IPv4'];
 if (common.hasIPv6) remoteFamilyCandidates.push('IPv6');
diff --git a/test/parallel/test-tcp-wrap-listen.js b/test/parallel/test-tcp-wrap-listen.js
index 29051481c72583..0cac545e81d785 100644
--- a/test/parallel/test-tcp-wrap-listen.js
+++ b/test/parallel/test-tcp-wrap-listen.js
@@ -14,7 +14,9 @@ const {
 
 const server = new TCP(TCPConstants.SOCKET);
 
-const r = server.bind(0);
+const r = (common.hasIPv6 ?
+  server.bind6('::', 0) :
+  server.bind('0.0.0.0', 0));
 assert.strictEqual(r, 0);
 let port = {};
 server.getsockname(port);

From 5822f5eb91d9821ac11c62811bc7ce235cd2393d Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Sat, 4 Sep 2021 18:15:38 +0200
Subject: [PATCH 09/18] dns: fix lint errors

---
 test/parallel/test-net-dns-lookup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/parallel/test-net-dns-lookup.js b/test/parallel/test-net-dns-lookup.js
index 289a1563a52dbe..b5c80641f235b2 100644
--- a/test/parallel/test-net-dns-lookup.js
+++ b/test/parallel/test-net-dns-lookup.js
@@ -34,7 +34,7 @@ server.listen(0, common.mustCall(function() {
     .on('lookup', common.mustCall(function(err, ip, type, host) {
       assert.strictEqual(err, null);
       assert.strictEqual(ip, '127.0.0.1');
-      assert.match(ip,/^(127\.0\.0\.1|::1)$/);
+      assert.match(ip, /^(127\.0\.0\.1|::1)$/);
       assert.match(type.toString, /^(4|6)$/);
       assert.strictEqual(host, 'localhost');
     }));

From 82af5ec842e11c62bd1956aaa6c8ead654f084b4 Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Sat, 4 Sep 2021 19:43:23 +0200
Subject: [PATCH 10/18] dns: fix test suite, part 4

---
 test/parallel/test-net-dns-lookup.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/parallel/test-net-dns-lookup.js b/test/parallel/test-net-dns-lookup.js
index b5c80641f235b2..160e89faeddf21 100644
--- a/test/parallel/test-net-dns-lookup.js
+++ b/test/parallel/test-net-dns-lookup.js
@@ -33,7 +33,6 @@ server.listen(0, common.mustCall(function() {
   net.connect(this.address().port, 'localhost')
     .on('lookup', common.mustCall(function(err, ip, type, host) {
       assert.strictEqual(err, null);
-      assert.strictEqual(ip, '127.0.0.1');
       assert.match(ip, /^(127\.0\.0\.1|::1)$/);
       assert.match(type.toString, /^(4|6)$/);
       assert.strictEqual(host, 'localhost');

From 0cb3a69b6ee279048b2edd79dd67c2f3c44144fd Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Sat, 4 Sep 2021 21:29:45 +0200
Subject: [PATCH 11/18] dns: fix test-net-dns-lookup.js

---
 test/parallel/test-net-dns-lookup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/parallel/test-net-dns-lookup.js b/test/parallel/test-net-dns-lookup.js
index 160e89faeddf21..8c7bbef128d7b1 100644
--- a/test/parallel/test-net-dns-lookup.js
+++ b/test/parallel/test-net-dns-lookup.js
@@ -34,7 +34,7 @@ server.listen(0, common.mustCall(function() {
     .on('lookup', common.mustCall(function(err, ip, type, host) {
       assert.strictEqual(err, null);
       assert.match(ip, /^(127\.0\.0\.1|::1)$/);
-      assert.match(type.toString, /^(4|6)$/);
+      assert.match(type.toString(), /^(4|6)$/);
       assert.strictEqual(host, 'localhost');
     }));
 }));

From dba92ad71b848010ec9fd39083c292a3d139c09b Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Sun, 5 Sep 2021 17:07:59 +0200
Subject: [PATCH 12/18] dns: test suite fixes for CI

---
 .../parallel/test-net-connect-options-port.js | 36 ++++++++++++-------
 test/parallel/test-net-pingpong.js            |  4 +--
 test/parallel/test-net-remote-address-port.js |  5 ++-
 test/parallel/test-net-writable.js            |  4 ++-
 test/pummel/test-net-pingpong.js              |  4 +--
 .../test-https-connect-localport.js           |  1 +
 6 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/test/parallel/test-net-connect-options-port.js b/test/parallel/test-net-connect-options-port.js
index 1225ba209281bb..b62fe945784248 100644
--- a/test/parallel/test-net-connect-options-port.js
+++ b/test/parallel/test-net-connect-options-port.js
@@ -83,7 +83,7 @@ const net = require('net');
     }
   }, expectedConnections));
 
-  server.listen(0, 'localhost', common.mustCall(() => {
+  server.listen(0, common.localhostIPv4, common.mustCall(() => {
     const port = server.address().port;
 
     // Total connections = 3 * 4(canConnect) * 6(doConnect) = 72
@@ -133,28 +133,35 @@ function doConnect(args, getCb) {
 }
 
 function syncFailToConnect(port, assertErr, optOnly) {
+  const family = 4;
   if (!optOnly) {
     // connect(port, cb) and connect(port)
-    const portArgFunctions = doConnect([port], () => common.mustNotCall());
+    const portArgFunctions = doConnect([{ port, family }],
+                                       () => common.mustNotCall());
     for (const fn of portArgFunctions) {
       assert.throws(fn, assertErr, `${fn.name}(${port})`);
     }
 
     // connect(port, host, cb) and connect(port, host)
-    const portHostArgFunctions = doConnect([port, 'localhost'],
+    const portHostArgFunctions = doConnect([{ port,
+                                              host: 'localhost',
+                                              family }],
                                            () => common.mustNotCall());
     for (const fn of portHostArgFunctions) {
       assert.throws(fn, assertErr, `${fn.name}(${port}, 'localhost')`);
     }
   }
   // connect({port}, cb) and connect({port})
-  const portOptFunctions = doConnect([{ port }], () => common.mustNotCall());
+  const portOptFunctions = doConnect([{ port, family }],
+                                     () => common.mustNotCall());
   for (const fn of portOptFunctions) {
     assert.throws(fn, assertErr, `${fn.name}({port: ${port}})`);
   }
 
   // connect({port, host}, cb) and connect({port, host})
-  const portHostOptFunctions = doConnect([{ port: port, host: 'localhost' }],
+  const portHostOptFunctions = doConnect([{ port: port,
+                                            host: 'localhost',
+                                            family: family }],
                                          () => common.mustNotCall());
   for (const fn of portHostOptFunctions) {
     assert.throws(fn,
@@ -165,27 +172,30 @@ function syncFailToConnect(port, assertErr, optOnly) {
 
 function canConnect(port) {
   const noop = () => common.mustCall();
+  const family = 4;
 
   // connect(port, cb) and connect(port)
-  const portArgFunctions = doConnect([port], noop);
+  const portArgFunctions = doConnect([{ port, family }], noop);
   for (const fn of portArgFunctions) {
     fn();
   }
 
   // connect(port, host, cb) and connect(port, host)
-  const portHostArgFunctions = doConnect([port, 'localhost'], noop);
+  const portHostArgFunctions = doConnect([{ port, host: 'localhost', family }],
+                                         noop);
   for (const fn of portHostArgFunctions) {
     fn();
   }
 
   // connect({port}, cb) and connect({port})
-  const portOptFunctions = doConnect([{ port }], noop);
+  const portOptFunctions = doConnect([{ port, family }], noop);
   for (const fn of portOptFunctions) {
     fn();
   }
 
   // connect({port, host}, cb) and connect({port, host})
-  const portHostOptFns = doConnect([{ port, host: 'localhost' }], noop);
+  const portHostOptFns = doConnect([{ port, host: 'localhost', family }],
+                                   noop);
   for (const fn of portHostOptFns) {
     fn();
   }
@@ -198,20 +208,22 @@ function asyncFailToConnect(port) {
   });
 
   const dont = () => common.mustNotCall();
+  const family = 4;
   // connect(port, cb) and connect(port)
-  const portArgFunctions = doConnect([port], dont);
+  const portArgFunctions = doConnect([{ port, family }], dont);
   for (const fn of portArgFunctions) {
     fn().on('error', onError());
   }
 
   // connect({port}, cb) and connect({port})
-  const portOptFunctions = doConnect([{ port }], dont);
+  const portOptFunctions = doConnect([{ port, family }], dont);
   for (const fn of portOptFunctions) {
     fn().on('error', onError());
   }
 
   // connect({port, host}, cb) and connect({port, host})
-  const portHostOptFns = doConnect([{ port, host: 'localhost' }], dont);
+  const portHostOptFns = doConnect([{ port, host: 'localhost', family }],
+                                   dont);
   for (const fn of portHostOptFns) {
     fn().on('error', onError());
   }
diff --git a/test/parallel/test-net-pingpong.js b/test/parallel/test-net-pingpong.js
index 7fb6678fe1a897..29652ec0d1c6ce 100644
--- a/test/parallel/test-net-pingpong.js
+++ b/test/parallel/test-net-pingpong.js
@@ -130,6 +130,4 @@ const tmpdir = require('../common/tmpdir');
 tmpdir.refresh();
 pingPongTest(common.PIPE);
 pingPongTest(0);
-pingPongTest(0, 'localhost');
-if (common.hasIPv6)
-  pingPongTest(0, '::1');
+common.hasIPv6 ? pingPongTest(0, '::1') : pingPongTest(0, '127.0.0.1');
diff --git a/test/parallel/test-net-remote-address-port.js b/test/parallel/test-net-remote-address-port.js
index 47a495c09b55ee..a3ad67d9f9ec6e 100644
--- a/test/parallel/test-net-remote-address-port.js
+++ b/test/parallel/test-net-remote-address-port.js
@@ -34,7 +34,10 @@ const remoteFamilyCandidates = ['IPv4'];
 if (common.hasIPv6) remoteFamilyCandidates.push('IPv6');
 
 const server = net.createServer(common.mustCall(function(socket) {
-  assert.ok(remoteAddrCandidates.includes(socket.remoteAddress));
+  // test to see real value in CI log
+  assert.match(socket.remoteAddress,
+               /^127\.0\.0\.1$|^::1$|^::ffff:127.0.0.1$/);
+  // assert.ok(remoteAddrCandidates.includes(socket.remoteAddress));
   assert.ok(remoteFamilyCandidates.includes(socket.remoteFamily));
   assert.ok(socket.remotePort);
   assert.notStrictEqual(socket.remotePort, this.address().port);
diff --git a/test/parallel/test-net-writable.js b/test/parallel/test-net-writable.js
index dcbb64e272b830..8036c2a13bea06 100644
--- a/test/parallel/test-net-writable.js
+++ b/test/parallel/test-net-writable.js
@@ -7,7 +7,9 @@ const server = net.createServer(common.mustCall(function(s) {
   server.close();
   s.end();
 })).listen(0, 'localhost', common.mustCall(function() {
-  const socket = net.connect(this.address().port, 'localhost');
+  const socket = net.connect(this.address().port, common.hasIPv6 ?
+    '::1' :
+    '127.0.0.1');
   socket.on('end', common.mustCall(() => {
     assert.strictEqual(socket.writable, true);
     socket.write('hello world');
diff --git a/test/pummel/test-net-pingpong.js b/test/pummel/test-net-pingpong.js
index 09b30405da5a39..10c7a36fc4afe5 100644
--- a/test/pummel/test-net-pingpong.js
+++ b/test/pummel/test-net-pingpong.js
@@ -111,10 +111,8 @@ function pingPongTest(host, on_complete) {
 }
 
 // All are run at once and will run on different ports.
-pingPongTest('localhost');
 pingPongTest(null);
-
-if (common.hasIPv6) pingPongTest('::1');
+common.hasIPv6 ? pingPongTest('::1') : pingPongTest('127.0.0.1');
 
 process.on('exit', function() {
   assert.strictEqual(tests_run, common.hasIPv6 ? 3 : 2);
diff --git a/test/sequential/test-https-connect-localport.js b/test/sequential/test-https-connect-localport.js
index d52c55a6d74fa0..1157e1cea7c20e 100644
--- a/test/sequential/test-https-connect-localport.js
+++ b/test/sequential/test-https-connect-localport.js
@@ -23,6 +23,7 @@ const assert = require('assert');
       host: 'localhost',
       pathname: '/',
       port,
+      family: common.hasIPv6 ? 6 : 4,
       localPort: common.PORT,
       rejectUnauthorized: false,
     }, common.mustCall(() => {

From f5b3eaa45c14123078cf23ec9b731dcabf5eee19 Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Sun, 5 Sep 2021 17:25:40 +0200
Subject: [PATCH 13/18] dns: fix linter errors

---
 test/parallel/test-net-pingpong.js            | 2 +-
 test/parallel/test-net-remote-address-port.js | 6 +++---
 test/pummel/test-net-pingpong.js              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/parallel/test-net-pingpong.js b/test/parallel/test-net-pingpong.js
index 29652ec0d1c6ce..3bbe076b4b1658 100644
--- a/test/parallel/test-net-pingpong.js
+++ b/test/parallel/test-net-pingpong.js
@@ -130,4 +130,4 @@ const tmpdir = require('../common/tmpdir');
 tmpdir.refresh();
 pingPongTest(common.PIPE);
 pingPongTest(0);
-common.hasIPv6 ? pingPongTest(0, '::1') : pingPongTest(0, '127.0.0.1');
+if (common.hasIPv6) pingPongTest(0, '::1'); else pingPongTest(0, '127.0.0.1');
diff --git a/test/parallel/test-net-remote-address-port.js b/test/parallel/test-net-remote-address-port.js
index a3ad67d9f9ec6e..fe090a3aa7a580 100644
--- a/test/parallel/test-net-remote-address-port.js
+++ b/test/parallel/test-net-remote-address-port.js
@@ -34,10 +34,10 @@ const remoteFamilyCandidates = ['IPv4'];
 if (common.hasIPv6) remoteFamilyCandidates.push('IPv6');
 
 const server = net.createServer(common.mustCall(function(socket) {
-  // test to see real value in CI log
+  // Test to see real value in CI log
   assert.match(socket.remoteAddress,
-               /^127\.0\.0\.1$|^::1$|^::ffff:127.0.0.1$/);
-  // assert.ok(remoteAddrCandidates.includes(socket.remoteAddress));
+               /^127\.0\.0\.1$|^::1$|^::ffff:127\.0\.0\.1$/);
+  // REM: assert.ok(remoteAddrCandidates.includes(socket.remoteAddress));
   assert.ok(remoteFamilyCandidates.includes(socket.remoteFamily));
   assert.ok(socket.remotePort);
   assert.notStrictEqual(socket.remotePort, this.address().port);
diff --git a/test/pummel/test-net-pingpong.js b/test/pummel/test-net-pingpong.js
index 10c7a36fc4afe5..c5ada54fcecd74 100644
--- a/test/pummel/test-net-pingpong.js
+++ b/test/pummel/test-net-pingpong.js
@@ -112,7 +112,7 @@ function pingPongTest(host, on_complete) {
 
 // All are run at once and will run on different ports.
 pingPongTest(null);
-common.hasIPv6 ? pingPongTest('::1') : pingPongTest('127.0.0.1');
+if (common.hasIPv6) pingPongTest('::1'); else pingPongTest('127.0.0.1');
 
 process.on('exit', function() {
   assert.strictEqual(tests_run, common.hasIPv6 ? 3 : 2);

From 6ac9106ccb97cc648f814d8558675feaec327990 Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Sun, 5 Sep 2021 19:19:35 +0200
Subject: [PATCH 14/18] dns: fix test/pummel/test-net-pingpong.js

---
 test/pummel/test-net-pingpong.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/pummel/test-net-pingpong.js b/test/pummel/test-net-pingpong.js
index c5ada54fcecd74..7db902ddbed20a 100644
--- a/test/pummel/test-net-pingpong.js
+++ b/test/pummel/test-net-pingpong.js
@@ -112,7 +112,8 @@ function pingPongTest(host, on_complete) {
 
 // All are run at once and will run on different ports.
 pingPongTest(null);
-if (common.hasIPv6) pingPongTest('::1'); else pingPongTest('127.0.0.1');
+pingPongTest('127.0.0.1');
+if (common.hasIPv6) pingPongTest('::1');
 
 process.on('exit', function() {
   assert.strictEqual(tests_run, common.hasIPv6 ? 3 : 2);

From e385c66897a60f7fb0969c5171d7a2fcc8978501 Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Sun, 5 Sep 2021 21:09:15 +0200
Subject: [PATCH 15/18] dns: trying to fix test-net-remote-address-port.js

---
 test/parallel/test-net-remote-address-port.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/parallel/test-net-remote-address-port.js b/test/parallel/test-net-remote-address-port.js
index fe090a3aa7a580..799841584def56 100644
--- a/test/parallel/test-net-remote-address-port.js
+++ b/test/parallel/test-net-remote-address-port.js
@@ -34,11 +34,13 @@ const remoteFamilyCandidates = ['IPv4'];
 if (common.hasIPv6) remoteFamilyCandidates.push('IPv6');
 
 const server = net.createServer(common.mustCall(function(socket) {
-  // Test to see real value in CI log
-  assert.match(socket.remoteAddress,
-               /^127\.0\.0\.1$|^::1$|^::ffff:127\.0\.0\.1$/);
-  // REM: assert.ok(remoteAddrCandidates.includes(socket.remoteAddress));
-  assert.ok(remoteFamilyCandidates.includes(socket.remoteFamily));
+  // REM: assert.match(socket.remoteAddress,
+  // REM:              /^127\.0\.0\.1$|^::1$|^::ffff:127\.0\.0\.1$/);
+  assert.ok(remoteAddrCandidates.includes(socket.remoteAddress),
+            `Illformed remoteAddress: ${socket.remoteAddress}`);
+  assert.ok(remoteFamilyCandidates.includes(socket.remoteFamily),
+            `Illformed remoteFamily: ${socket.remoteFamily}`);
+  // REM: assert.ok(remoteFamilyCandidates.includes(socket.remoteFamily));
   assert.ok(socket.remotePort);
   assert.notStrictEqual(socket.remotePort, this.address().port);
   socket.on('end', function() {

From 431f7b23776af84d1faa0e39a97e6607a7166d2e Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Sun, 5 Sep 2021 21:41:35 +0200
Subject: [PATCH 16/18] dns: try to fix test suite for CI

---
 test/parallel/test-net-remote-address-port.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/test/parallel/test-net-remote-address-port.js b/test/parallel/test-net-remote-address-port.js
index 799841584def56..1a753bd9b106cf 100644
--- a/test/parallel/test-net-remote-address-port.js
+++ b/test/parallel/test-net-remote-address-port.js
@@ -27,20 +27,17 @@ const net = require('net');
 
 let conns_closed = 0;
 
-const remoteAddrCandidates = [ common.localhostIPv4 ];
-if (common.hasIPv6) remoteAddrCandidates.push('::1', '::ffff:127.0.0.1');
+const remoteAddrCandidates = [ common.localhostIPv4,
+                               '::1',
+                               '::ffff:127.0.0.1' ];
 
-const remoteFamilyCandidates = ['IPv4'];
-if (common.hasIPv6) remoteFamilyCandidates.push('IPv6');
+const remoteFamilyCandidates = ['IPv4', 'IPv6'];
 
 const server = net.createServer(common.mustCall(function(socket) {
-  // REM: assert.match(socket.remoteAddress,
-  // REM:              /^127\.0\.0\.1$|^::1$|^::ffff:127\.0\.0\.1$/);
   assert.ok(remoteAddrCandidates.includes(socket.remoteAddress),
             `Illformed remoteAddress: ${socket.remoteAddress}`);
   assert.ok(remoteFamilyCandidates.includes(socket.remoteFamily),
             `Illformed remoteFamily: ${socket.remoteFamily}`);
-  // REM: assert.ok(remoteFamilyCandidates.includes(socket.remoteFamily));
   assert.ok(socket.remotePort);
   assert.notStrictEqual(socket.remotePort, this.address().port);
   socket.on('end', function() {

From 424f34fc50e735eb8e2a6f6e789b4751f1308bb9 Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Sun, 5 Sep 2021 22:28:07 +0200
Subject: [PATCH 17/18] dns: test suite fix for CI node-test-commit-aix

---
 test/parallel/test-net-writable.js              | 6 ++----
 test/sequential/test-https-connect-localport.js | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/parallel/test-net-writable.js b/test/parallel/test-net-writable.js
index 8036c2a13bea06..3659869efbb715 100644
--- a/test/parallel/test-net-writable.js
+++ b/test/parallel/test-net-writable.js
@@ -6,10 +6,8 @@ const net = require('net');
 const server = net.createServer(common.mustCall(function(s) {
   server.close();
   s.end();
-})).listen(0, 'localhost', common.mustCall(function() {
-  const socket = net.connect(this.address().port, common.hasIPv6 ?
-    '::1' :
-    '127.0.0.1');
+})).listen(0, '127.0.0.1', common.mustCall(function() {
+  const socket = net.connect(this.address().port, '127.0.0.1');
   socket.on('end', common.mustCall(() => {
     assert.strictEqual(socket.writable, true);
     socket.write('hello world');
diff --git a/test/sequential/test-https-connect-localport.js b/test/sequential/test-https-connect-localport.js
index 1157e1cea7c20e..10d358c8a92146 100644
--- a/test/sequential/test-https-connect-localport.js
+++ b/test/sequential/test-https-connect-localport.js
@@ -17,13 +17,13 @@ const assert = require('assert');
     res.end();
   }));
 
-  server.listen(0, 'localhost', common.mustCall(() => {
+  server.listen(0, '127.0.0.1', common.mustCall(() => {
     const port = server.address().port;
     const req = https.get({
       host: 'localhost',
       pathname: '/',
       port,
-      family: common.hasIPv6 ? 6 : 4,
+      family: 4,
       localPort: common.PORT,
       rejectUnauthorized: false,
     }, common.mustCall(() => {

From 559c3f329b8a7c9b2eff41b8bcdb08eb06470924 Mon Sep 17 00:00:00 2001
From: treysis <treysis@gmx.net>
Date: Mon, 6 Sep 2021 01:35:46 +0200
Subject: [PATCH 18/18] dns: apply suggestions from code review

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 test/parallel/test-net-remote-address-port.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/parallel/test-net-remote-address-port.js b/test/parallel/test-net-remote-address-port.js
index 1a753bd9b106cf..f7162d0f90f933 100644
--- a/test/parallel/test-net-remote-address-port.js
+++ b/test/parallel/test-net-remote-address-port.js
@@ -35,9 +35,9 @@ const remoteFamilyCandidates = ['IPv4', 'IPv6'];
 
 const server = net.createServer(common.mustCall(function(socket) {
   assert.ok(remoteAddrCandidates.includes(socket.remoteAddress),
-            `Illformed remoteAddress: ${socket.remoteAddress}`);
+            `Invalid remoteAddress: ${socket.remoteAddress}`);
   assert.ok(remoteFamilyCandidates.includes(socket.remoteFamily),
-            `Illformed remoteFamily: ${socket.remoteFamily}`);
+            `Invalid remoteFamily: ${socket.remoteFamily}`);
   assert.ok(socket.remotePort);
   assert.notStrictEqual(socket.remotePort, this.address().port);
   socket.on('end', function() {