Commit 950185b
net: fix address iteration with autoSelectFamily
When `autoSelectFamily` is set to `true`, `net.connect` is supposed to
try connecting to both IPv4 and IPv6, interleaving the address types.
Instead, it appears that the array that holds the addresses in the order
they should be attempted was never used after being populated.
PR-URL: #48258
Reviewed-By: Paolo Insogna <paolo@cowtech.it>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>1 parent 50c0a15 commit 950185b
2 files changed
Lines changed: 10 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1476,7 +1476,7 @@ function lookupAndConnectMultiple( | |||
| 1476 | 1476 | ||
| 1477 | 1477 | const context = { | |
| 1478 | 1478 | socket: self, | |
| 1479 | - addresses, | ||
| 1479 | + addresses: toAttempt, | ||
| 1480 | 1480 | current: 0, | |
| 1481 | 1481 | port, | |
| 1482 | 1482 | localPort, | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -117,7 +117,7 @@ function createDnsServer(ipv6Addrs, ipv4Addrs, cb) { | |||
| 117 | 117 | // Test that only the last successful connection is established. | |
| 118 | 118 | { | |
| 119 | 119 | createDnsServer( | |
| 120 | - '::1', | ||
| 120 | + ['2606:4700::6810:85e5', '2606:4700::6810:84e5', '::1'], | ||
| 121 | 121 | ['104.20.22.46', '104.20.23.46', '127.0.0.1'], | |
| 122 | 122 | common.mustCall(function({ dnsServer, lookup }) { | |
| 123 | 123 | const ipv4Server = createServer((socket) => { | |
@@ -144,7 +144,14 @@ function createDnsServer(ipv6Addrs, ipv4Addrs, cb) { | |||
| 144 | 144 | connection.on('ready', common.mustCall(() => { | |
| 145 | 145 | assert.deepStrictEqual( | |
| 146 | 146 | connection.autoSelectFamilyAttemptedAddresses, | |
| 147 | - [`::1:${port}`, `104.20.22.46:${port}`, `104.20.23.46:${port}`, `127.0.0.1:${port}`] | ||
| 147 | + [ | ||
| 148 | + `2606:4700::6810:85e5:${port}`, | ||
| 149 | + `104.20.22.46:${port}`, | ||
| 150 | + `2606:4700::6810:84e5:${port}`, | ||
| 151 | + `104.20.23.46:${port}`, | ||
| 152 | + `::1:${port}`, | ||
| 153 | + `127.0.0.1:${port}`, | ||
| 154 | + ] | ||
| 148 | 155 | ); | |
| 149 | 156 | })); | |
| 150 | 157 | ||
0 commit comments