From ee54a89ff957f6b5e465ee4d0fe109f6f9071324 Mon Sep 17 00:00:00 2001
From: Josh Dague <jd@josh3736.net>
Date: Mon, 17 Aug 2020 23:23:25 -0700
Subject: [PATCH 01/11] dns: add setLocalAddress to Resolver

Fixes: https://github.com/nodejs/node/issues/34818
---
 doc/api/dns.md                            |  9 ++++++++
 lib/internal/dns/promises.js              |  1 +
 lib/internal/dns/utils.js                 |  8 +++++++
 src/cares_wrap.cc                         | 24 +++++++++++++++++++++
 test/parallel/test-dns-setlocaladdress.js | 26 +++++++++++++++++++++++
 5 files changed, 68 insertions(+)
 create mode 100644 test/parallel/test-dns-setlocaladdress.js

diff --git a/doc/api/dns.md b/doc/api/dns.md
index a1f4240981f6cf..6480deeba7a01e 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -117,6 +117,15 @@ added: v8.3.0
 Cancel all outstanding DNS queries made by this resolver. The corresponding
 callbacks will be called with an error with code `ECANCELLED`.
 
+### `resolver.setLocalAddress(addr)`
+<!-- YAML
+added: v15.0.0
+-->
+
+* `addr` {string} A string representation of an IPv4 or IPv6 address.
+
+The resolver instance will send its requests from the specified IP address.  This allows programs to specify outbound interfaces when used on multi-homed systems.
+
 ## `dns.getServers()`
 <!-- YAML
 added: v0.11.3
diff --git a/lib/internal/dns/promises.js b/lib/internal/dns/promises.js
index 99693445e825a0..e8505a95d12fed 100644
--- a/lib/internal/dns/promises.js
+++ b/lib/internal/dns/promises.js
@@ -217,6 +217,7 @@ class Resolver {
 
 Resolver.prototype.getServers = CallbackResolver.prototype.getServers;
 Resolver.prototype.setServers = CallbackResolver.prototype.setServers;
+Resolver.prototype.setLocalAddress = CallbackResolver.prototype.setLocalAddress;
 Resolver.prototype.resolveAny = resolveMap.ANY = resolver('queryAny');
 Resolver.prototype.resolve4 = resolveMap.A = resolver('queryA');
 Resolver.prototype.resolve6 = resolveMap.AAAA = resolver('queryAaaa');
diff --git a/lib/internal/dns/utils.js b/lib/internal/dns/utils.js
index 459a67be3d8a78..3e06634c97e334 100644
--- a/lib/internal/dns/utils.js
+++ b/lib/internal/dns/utils.js
@@ -114,6 +114,14 @@ class Resolver {
       throw new ERR_DNS_SET_SERVERS_FAILED(err, servers);
     }
   }
+
+  setLocalAddress(addr) {
+    if (typeof addr != 'string') {
+      throw new ERR_INVALID_ARG_TYPE('addr', 'String', addr);
+    }
+
+    this._handle.setLocalAddress(addr);
+  }
 }
 
 let defaultResolver = new Resolver();
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index fcffc2bec672a7..b5231321f656a4 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -2227,6 +2227,29 @@ void SetServers(const FunctionCallbackInfo<Value>& args) {
   args.GetReturnValue().Set(err);
 }
 
+void SetLocalAddress(const FunctionCallbackInfo<Value>& args) {
+  Environment* env = Environment::GetCurrent(args);
+  ChannelWrap* channel;
+  ASSIGN_OR_RETURN_UNWRAP(&channel, args.Holder());
+
+  CHECK(args[0]->IsString());
+
+  Isolate* isolate = args.GetIsolate();
+  node::Utf8Value ip(isolate, args[0]);
+
+  unsigned char addr[sizeof(struct in6_addr)];
+
+  if (uv_inet_pton(AF_INET, *ip, &addr) == 0) {
+    unsigned int ip4 = (addr[0] << 24) + (addr[1] << 16) + (addr[2] << 8) + addr[3];
+    ares_set_local_ip4(channel->cares_channel(), ip4);
+  } else if (uv_inet_pton(AF_INET6, *ip, &addr) == 0) {
+    ares_set_local_ip6(channel->cares_channel(), reinterpret_cast<const unsigned char*>(&addr));
+  } else {
+    return env->ThrowError("Invalid IP address.");
+  }
+
+}
+
 void Cancel(const FunctionCallbackInfo<Value>& args) {
   ChannelWrap* channel;
   ASSIGN_OR_RETURN_UNWRAP(&channel, args.Holder());
@@ -2329,6 +2352,7 @@ void Initialize(Local<Object> target,
 
   env->SetProtoMethodNoSideEffect(channel_wrap, "getServers", GetServers);
   env->SetProtoMethod(channel_wrap, "setServers", SetServers);
+  env->SetProtoMethod(channel_wrap, "setLocalAddress", SetLocalAddress);
   env->SetProtoMethod(channel_wrap, "cancel", Cancel);
 
   Local<String> channelWrapString =
diff --git a/test/parallel/test-dns-setlocaladdress.js b/test/parallel/test-dns-setlocaladdress.js
new file mode 100644
index 00000000000000..f9c6bc5c74c7fc
--- /dev/null
+++ b/test/parallel/test-dns-setlocaladdress.js
@@ -0,0 +1,26 @@
+'use strict';
+const common = require('../common');
+const { addresses } = require('../common/internet');
+const assert = require('assert');
+
+const dns = require('dns');
+const resolver = new dns.Resolver();
+
+// Verifies that setLocalAddress succeeds with IPv4 and IPv6 addresses
+{
+  resolver.setLocalAddress('127.0.0.1');
+  resolver.setLocalAddress('::1');
+}
+
+// Verifiy that setLocalAddress throws if called with an invalid address
+{
+  assert.throws(() => {
+    resolver.setLocalAddress('bad');
+  });
+  assert.throws(() => {
+    resolver.setLocalAddress(123);
+  });
+  assert.throws(() => {
+    resolver.setLocalAddress();
+  });
+}

From 70decaa799f62b87e3ee66e5bbdef190a194f4ec Mon Sep 17 00:00:00 2001
From: Josh Dague <jd@josh3736.net>
Date: Tue, 18 Aug 2020 00:03:35 -0700
Subject: [PATCH 02/11] fix lint errors

---
 doc/api/dns.md                            |  6 ++++--
 src/cares_wrap.cc                         | 10 +++++++---
 test/parallel/test-dns-setlocaladdress.js |  9 ++++-----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/doc/api/dns.md b/doc/api/dns.md
index 6480deeba7a01e..77161d797b8fc1 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -119,12 +119,14 @@ callbacks will be called with an error with code `ECANCELLED`.
 
 ### `resolver.setLocalAddress(addr)`
 <!-- YAML
-added: v15.0.0
+added: REPLACEME
 -->
 
 * `addr` {string} A string representation of an IPv4 or IPv6 address.
 
-The resolver instance will send its requests from the specified IP address.  This allows programs to specify outbound interfaces when used on multi-homed systems.
+The resolver instance will send its requests from the specified IP address.
+This allows programs to specify outbound interfaces when used on multi-homed
+systems.
 
 ## `dns.getServers()`
 <!-- YAML
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index b5231321f656a4..e2cf0732972d7f 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -2240,14 +2240,18 @@ void SetLocalAddress(const FunctionCallbackInfo<Value>& args) {
   unsigned char addr[sizeof(struct in6_addr)];
 
   if (uv_inet_pton(AF_INET, *ip, &addr) == 0) {
-    unsigned int ip4 = (addr[0] << 24) + (addr[1] << 16) + (addr[2] << 8) + addr[3];
+    unsigned int ip4 = (addr[0] << 24) +
+      (addr[1] << 16) +
+      (addr[2] << 8) +
+      addr[3];
     ares_set_local_ip4(channel->cares_channel(), ip4);
   } else if (uv_inet_pton(AF_INET6, *ip, &addr) == 0) {
-    ares_set_local_ip6(channel->cares_channel(), reinterpret_cast<const unsigned char*>(&addr));
+    ares_set_local_ip6(
+      channel->cares_channel(),
+      reinterpret_cast<const unsigned char*>(&addr));
   } else {
     return env->ThrowError("Invalid IP address.");
   }
-
 }
 
 void Cancel(const FunctionCallbackInfo<Value>& args) {
diff --git a/test/parallel/test-dns-setlocaladdress.js b/test/parallel/test-dns-setlocaladdress.js
index f9c6bc5c74c7fc..6794f3fea33f1f 100644
--- a/test/parallel/test-dns-setlocaladdress.js
+++ b/test/parallel/test-dns-setlocaladdress.js
@@ -1,6 +1,5 @@
 'use strict';
-const common = require('../common');
-const { addresses } = require('../common/internet');
+require('../common');
 const assert = require('assert');
 
 const dns = require('dns');
@@ -16,11 +15,11 @@ const resolver = new dns.Resolver();
 {
   assert.throws(() => {
     resolver.setLocalAddress('bad');
-  });
+  }, Error);
   assert.throws(() => {
     resolver.setLocalAddress(123);
-  });
+  }, Error);
   assert.throws(() => {
     resolver.setLocalAddress();
-  });
+  }, Error);
 }

From d0a7dab0ba3cfdf4df9efbc90a8c3ed7b274fb07 Mon Sep 17 00:00:00 2001
From: Josh Dague <jd@josh3736.net>
Date: Fri, 21 Aug 2020 18:56:08 -0700
Subject: [PATCH 03/11] clean up ares_set_local calls

---
 src/cares_wrap.cc | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index e2cf0732972d7f..4dfc2afeee82a2 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -2240,15 +2240,9 @@ void SetLocalAddress(const FunctionCallbackInfo<Value>& args) {
   unsigned char addr[sizeof(struct in6_addr)];
 
   if (uv_inet_pton(AF_INET, *ip, &addr) == 0) {
-    unsigned int ip4 = (addr[0] << 24) +
-      (addr[1] << 16) +
-      (addr[2] << 8) +
-      addr[3];
-    ares_set_local_ip4(channel->cares_channel(), ip4);
+    ares_set_local_ip4(channel->cares_channel(), cares_get_32bit(addr));
   } else if (uv_inet_pton(AF_INET6, *ip, &addr) == 0) {
-    ares_set_local_ip6(
-      channel->cares_channel(),
-      reinterpret_cast<const unsigned char*>(&addr));
+    ares_set_local_ip6(channel->cares_channel(), addr);
   } else {
     return env->ThrowError("Invalid IP address.");
   }

From 13447146f4c8b4fbcf3de2d8439fcda20a8207b9 Mon Sep 17 00:00:00 2001
From: Josh Dague <jd@josh3736.net>
Date: Fri, 21 Aug 2020 18:57:41 -0700
Subject: [PATCH 04/11] nits

---
 lib/internal/dns/utils.js                 | 2 +-
 test/parallel/test-dns-setlocaladdress.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/dns/utils.js b/lib/internal/dns/utils.js
index 3e06634c97e334..a327be9e0b7080 100644
--- a/lib/internal/dns/utils.js
+++ b/lib/internal/dns/utils.js
@@ -116,7 +116,7 @@ class Resolver {
   }
 
   setLocalAddress(addr) {
-    if (typeof addr != 'string') {
+    if (typeof addr !== 'string') {
       throw new ERR_INVALID_ARG_TYPE('addr', 'String', addr);
     }
 
diff --git a/test/parallel/test-dns-setlocaladdress.js b/test/parallel/test-dns-setlocaladdress.js
index 6794f3fea33f1f..d02952a3190ad3 100644
--- a/test/parallel/test-dns-setlocaladdress.js
+++ b/test/parallel/test-dns-setlocaladdress.js
@@ -11,7 +11,7 @@ const resolver = new dns.Resolver();
   resolver.setLocalAddress('::1');
 }
 
-// Verifiy that setLocalAddress throws if called with an invalid address
+// Verify that setLocalAddress throws if called with an invalid address
 {
   assert.throws(() => {
     resolver.setLocalAddress('bad');

From a8b30dbfd534819b8ab4f5f32da800177e4b7c7a Mon Sep 17 00:00:00 2001
From: Josh Dague <jd@josh3736.net>
Date: Fri, 21 Aug 2020 19:04:27 -0700
Subject: [PATCH 05/11] add promise resolver tests

---
 test/parallel/test-dns-setlocaladdress.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/parallel/test-dns-setlocaladdress.js b/test/parallel/test-dns-setlocaladdress.js
index d02952a3190ad3..cdea26ca65f9fd 100644
--- a/test/parallel/test-dns-setlocaladdress.js
+++ b/test/parallel/test-dns-setlocaladdress.js
@@ -4,11 +4,14 @@ const assert = require('assert');
 
 const dns = require('dns');
 const resolver = new dns.Resolver();
+const promiseResolver = new dns.promises.Resolver();
 
 // Verifies that setLocalAddress succeeds with IPv4 and IPv6 addresses
 {
   resolver.setLocalAddress('127.0.0.1');
   resolver.setLocalAddress('::1');
+  promiseResolver.setLocalAddress('127.0.0.1');
+  promiseResolver.setLocalAddress('::1');
 }
 
 // Verify that setLocalAddress throws if called with an invalid address
@@ -22,4 +25,7 @@ const resolver = new dns.Resolver();
   assert.throws(() => {
     resolver.setLocalAddress();
   }, Error);
+  assert.throws(() => {
+    promiseResolver.setLocalAddress();
+  }, Error);
 }

From de1e8c5603bc13d9f6e0b77a61edfb117ad124cd Mon Sep 17 00:00:00 2001
From: Josh Dague <jd@josh3736.net>
Date: Wed, 26 Aug 2020 19:09:01 -0700
Subject: [PATCH 06/11] clarify IPv4/IPv6 API

---
 doc/api/dns.md                            | 15 ++++++-
 lib/internal/dns/utils.js                 | 12 +++--
 src/cares_wrap.cc                         | 53 ++++++++++++++++++++---
 test/parallel/test-dns-setlocaladdress.js | 10 ++++-
 4 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/doc/api/dns.md b/doc/api/dns.md
index 77161d797b8fc1..7863bc7b343ce4 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -117,17 +117,28 @@ added: v8.3.0
 Cancel all outstanding DNS queries made by this resolver. The corresponding
 callbacks will be called with an error with code `ECANCELLED`.
 
-### `resolver.setLocalAddress(addr)`
+### `resolver.setLocalAddress([ipv4][, ipv6])`
 <!-- YAML
 added: REPLACEME
 -->
 
-* `addr` {string} A string representation of an IPv4 or IPv6 address.
+* `ipv4` {string} A string representation of an IPv4 address.
+  **Default:** `'0.0.0.0'`
+* `ipv6` {string} A string representation of an IPv6 address.
+  **Default:** `'::0'`
 
 The resolver instance will send its requests from the specified IP address.
 This allows programs to specify outbound interfaces when used on multi-homed
 systems.
 
+If a v4 or v6 address is not specified, it is set to `0.0.0.0` or `::0`
+respectively, which is the default and means "choose automatically from
+available IP addresses".
+
+The resolver will use the v4 local address when making requests to IPv4 DNS
+servers, and the v6 local address when making requests to IPv6 DNS servers.
+The `rrtype` of resolution requests has no impact on the local address used.
+
 ## `dns.getServers()`
 <!-- YAML
 added: v0.11.3
diff --git a/lib/internal/dns/utils.js b/lib/internal/dns/utils.js
index a327be9e0b7080..1c50a089d1d89a 100644
--- a/lib/internal/dns/utils.js
+++ b/lib/internal/dns/utils.js
@@ -115,12 +115,16 @@ class Resolver {
     }
   }
 
-  setLocalAddress(addr) {
-    if (typeof addr !== 'string') {
-      throw new ERR_INVALID_ARG_TYPE('addr', 'String', addr);
+  setLocalAddress(ipv4, ipv6) {
+    if (typeof ipv4 !== 'string') {
+      throw new ERR_INVALID_ARG_TYPE('ipv4', 'String', ipv4);
     }
 
-    this._handle.setLocalAddress(addr);
+    if (typeof ipv6 !== 'string' && ipv6 !== undefined) {
+      throw new ERR_INVALID_ARG_TYPE('ipv6', ['String', 'undefined'], ipv6);
+    }
+
+    this._handle.setLocalAddress(ipv4, ipv6);
   }
 }
 
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index 4dfc2afeee82a2..bc811af58c0c1f 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -2232,19 +2232,58 @@ void SetLocalAddress(const FunctionCallbackInfo<Value>& args) {
   ChannelWrap* channel;
   ASSIGN_OR_RETURN_UNWRAP(&channel, args.Holder());
 
+  CHECK(args.Length() == 2);
   CHECK(args[0]->IsString());
 
   Isolate* isolate = args.GetIsolate();
-  node::Utf8Value ip(isolate, args[0]);
+  node::Utf8Value ip0(isolate, args[0]);
+
+  unsigned char addr0[sizeof(struct in6_addr)];
+  unsigned char addr1[sizeof(struct in6_addr)];
+  int type0 = 0;
+
+  // This function accepts 2 arguments.  The first may be either an IPv4
+  // address or an IPv6 address.  If present, the second argument must be the
+  // other type of address.  Otherwise, the unspecified type of IP is set
+  // to 0 (any).
+
+  if (uv_inet_pton(AF_INET, *ip0, &addr0) == 0) {
+    ares_set_local_ip4(channel->cares_channel(), cares_get_32bit(addr0));
+    type0 = 4;
+  } else if (uv_inet_pton(AF_INET6, *ip0, &addr0) == 0) {
+    ares_set_local_ip6(channel->cares_channel(), addr0);
+    type0 = 6;
+  } else {
+    return env->ThrowError("Invalid IP address.");
+  }
 
-  unsigned char addr[sizeof(struct in6_addr)];
+  if (!args[1]->IsUndefined()) {
+    CHECK(args[1]->IsString());
+    node::Utf8Value ip1(isolate, args[1]);
 
-  if (uv_inet_pton(AF_INET, *ip, &addr) == 0) {
-    ares_set_local_ip4(channel->cares_channel(), cares_get_32bit(addr));
-  } else if (uv_inet_pton(AF_INET6, *ip, &addr) == 0) {
-    ares_set_local_ip6(channel->cares_channel(), addr);
+    if (uv_inet_pton(AF_INET, *ip1, &addr1) == 0) {
+      if (type0 == 4) {
+        return env->ThrowError("Invalid argument.  Cannot specify two IPv4 addresses.");
+      } else {
+        ares_set_local_ip4(channel->cares_channel(), cares_get_32bit(addr1));
+      }
+    } else if (uv_inet_pton(AF_INET6, *ip1, &addr1) == 0) {
+      if (type0 == 6) {
+        return env->ThrowError("Invalid argument.  Cannot specify two IPv6 addresses.");
+      } else {
+        ares_set_local_ip6(channel->cares_channel(), addr1);
+      }
+    } else {
+      return env->ThrowError("Invalid IP address.");
+    }
   } else {
-    return env->ThrowError("Invalid IP address.");
+    // No second arg specifed
+    if (type0 == 4) {
+      memset(&addr1, 0, sizeof(addr1));
+      ares_set_local_ip6(channel->cares_channel(), addr1);
+    } else {
+      ares_set_local_ip4(channel->cares_channel(), 0);
+    }
   }
 }
 
diff --git a/test/parallel/test-dns-setlocaladdress.js b/test/parallel/test-dns-setlocaladdress.js
index cdea26ca65f9fd..2e39f3bf910aa7 100644
--- a/test/parallel/test-dns-setlocaladdress.js
+++ b/test/parallel/test-dns-setlocaladdress.js
@@ -10,12 +10,18 @@ const promiseResolver = new dns.promises.Resolver();
 {
   resolver.setLocalAddress('127.0.0.1');
   resolver.setLocalAddress('::1');
-  promiseResolver.setLocalAddress('127.0.0.1');
-  promiseResolver.setLocalAddress('::1');
+  resolver.setLocalAddress('127.0.0.1', '::1');
+  promiseResolver.setLocalAddress('127.0.0.1', '::1');
 }
 
 // Verify that setLocalAddress throws if called with an invalid address
 {
+  assert.throws(() => {
+    resolver.setLocalAddress('127.0.0.1', '127.0.0.1');
+  }, Error);
+  assert.throws(() => {
+    resolver.setLocalAddress('::1', '::1');
+  }, Error);
   assert.throws(() => {
     resolver.setLocalAddress('bad');
   }, Error);

From d672863357871defbfae8b5d7d3d7ad634820c59 Mon Sep 17 00:00:00 2001
From: Josh Dague <jd@josh3736.net>
Date: Wed, 26 Aug 2020 19:15:50 -0700
Subject: [PATCH 07/11] fix lint

---
 src/cares_wrap.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index bc811af58c0c1f..bccfc6fa15f89e 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -2232,7 +2232,7 @@ void SetLocalAddress(const FunctionCallbackInfo<Value>& args) {
   ChannelWrap* channel;
   ASSIGN_OR_RETURN_UNWRAP(&channel, args.Holder());
 
-  CHECK(args.Length() == 2);
+  CHECK_EQ(args.Length(), 2);
   CHECK(args[0]->IsString());
 
   Isolate* isolate = args.GetIsolate();
@@ -2263,13 +2263,15 @@ void SetLocalAddress(const FunctionCallbackInfo<Value>& args) {
 
     if (uv_inet_pton(AF_INET, *ip1, &addr1) == 0) {
       if (type0 == 4) {
-        return env->ThrowError("Invalid argument.  Cannot specify two IPv4 addresses.");
+        return env->ThrowError(
+          "Invalid argument.  Cannot specify two IPv4 addresses.");
       } else {
         ares_set_local_ip4(channel->cares_channel(), cares_get_32bit(addr1));
       }
     } else if (uv_inet_pton(AF_INET6, *ip1, &addr1) == 0) {
       if (type0 == 6) {
-        return env->ThrowError("Invalid argument.  Cannot specify two IPv6 addresses.");
+        return env->ThrowError(
+          "Invalid argument.  Cannot specify two IPv6 addresses.");
       } else {
         ares_set_local_ip6(channel->cares_channel(), addr1);
       }

From ac0f1891c0c697e67bd88554c9af7a5a82afac04 Mon Sep 17 00:00:00 2001
From: Josh Dague <jd@josh3736.net>
Date: Fri, 28 Aug 2020 18:15:36 -0700
Subject: [PATCH 08/11] throw errors with codes

---
 src/cares_wrap.cc | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index bccfc6fa15f89e..2983f9364cb0e3 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -29,6 +29,7 @@
 #include "req_wrap-inl.h"
 #include "util-inl.h"
 #include "uv.h"
+#include "node_errors.h"
 
 #include <cerrno>
 #include <cstring>
@@ -2254,7 +2255,8 @@ void SetLocalAddress(const FunctionCallbackInfo<Value>& args) {
     ares_set_local_ip6(channel->cares_channel(), addr0);
     type0 = 6;
   } else {
-    return env->ThrowError("Invalid IP address.");
+    THROW_ERR_INVALID_ARG_VALUE(env, "Invalid IP address.");
+    return;
   }
 
   if (!args[1]->IsUndefined()) {
@@ -2263,20 +2265,21 @@ void SetLocalAddress(const FunctionCallbackInfo<Value>& args) {
 
     if (uv_inet_pton(AF_INET, *ip1, &addr1) == 0) {
       if (type0 == 4) {
-        return env->ThrowError(
-          "Invalid argument.  Cannot specify two IPv4 addresses.");
+        THROW_ERR_INVALID_ARG_VALUE(env, "Cannot specify two IPv4 addresses.");
+        return;
       } else {
         ares_set_local_ip4(channel->cares_channel(), cares_get_32bit(addr1));
       }
     } else if (uv_inet_pton(AF_INET6, *ip1, &addr1) == 0) {
       if (type0 == 6) {
-        return env->ThrowError(
-          "Invalid argument.  Cannot specify two IPv6 addresses.");
+        THROW_ERR_INVALID_ARG_VALUE(env, "Cannot specify two IPv6 addresses.");
+        return;
       } else {
         ares_set_local_ip6(channel->cares_channel(), addr1);
       }
     } else {
-      return env->ThrowError("Invalid IP address.");
+      THROW_ERR_INVALID_ARG_VALUE(env, "Invalid IP address.");
+      return;
     }
   } else {
     // No second arg specifed

From 605d999c7c8d2e4a6fd1d18db7d898fe0f28b203 Mon Sep 17 00:00:00 2001
From: Josh Dague <jd@josh3736.net>
Date: Fri, 28 Aug 2020 18:25:19 -0700
Subject: [PATCH 09/11] tweak doc language

---
 doc/api/dns.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/doc/api/dns.md b/doc/api/dns.md
index 7863bc7b343ce4..507f5af046787b 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -131,9 +131,7 @@ The resolver instance will send its requests from the specified IP address.
 This allows programs to specify outbound interfaces when used on multi-homed
 systems.
 
-If a v4 or v6 address is not specified, it is set to `0.0.0.0` or `::0`
-respectively, which is the default and means "choose automatically from
-available IP addresses".
+If a v4 or v6 address is not specified, it is set to the default, and the operating system will choose a local address automatically.
 
 The resolver will use the v4 local address when making requests to IPv4 DNS
 servers, and the v6 local address when making requests to IPv6 DNS servers.

From cbc571a917dd026123f0dbbd4daee6de8ba96a02 Mon Sep 17 00:00:00 2001
From: Josh Dague <jd@josh3736.net>
Date: Fri, 28 Aug 2020 18:30:06 -0700
Subject: [PATCH 10/11] fix lint

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

diff --git a/doc/api/dns.md b/doc/api/dns.md
index 507f5af046787b..638321f222a940 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -131,7 +131,8 @@ The resolver instance will send its requests from the specified IP address.
 This allows programs to specify outbound interfaces when used on multi-homed
 systems.
 
-If a v4 or v6 address is not specified, it is set to the default, and the operating system will choose a local address automatically.
+If a v4 or v6 address is not specified, it is set to the default, and the
+operating system will choose a local address automatically.
 
 The resolver will use the v4 local address when making requests to IPv4 DNS
 servers, and the v6 local address when making requests to IPv6 DNS servers.

From 4b1c36020b1ce711b41930038cc0132f4d64b850 Mon Sep 17 00:00:00 2001
From: Josh Dague <jd@josh3736.net>
Date: Fri, 16 Oct 2020 18:49:53 -0700
Subject: [PATCH 11/11] cares_get_32bit -> ReadUint32BE

---
 src/cares_wrap.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index 2983f9364cb0e3..6d7a8e66a9d2ce 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -2249,7 +2249,7 @@ void SetLocalAddress(const FunctionCallbackInfo<Value>& args) {
   // to 0 (any).
 
   if (uv_inet_pton(AF_INET, *ip0, &addr0) == 0) {
-    ares_set_local_ip4(channel->cares_channel(), cares_get_32bit(addr0));
+    ares_set_local_ip4(channel->cares_channel(), ReadUint32BE(addr0));
     type0 = 4;
   } else if (uv_inet_pton(AF_INET6, *ip0, &addr0) == 0) {
     ares_set_local_ip6(channel->cares_channel(), addr0);
@@ -2268,7 +2268,7 @@ void SetLocalAddress(const FunctionCallbackInfo<Value>& args) {
         THROW_ERR_INVALID_ARG_VALUE(env, "Cannot specify two IPv4 addresses.");
         return;
       } else {
-        ares_set_local_ip4(channel->cares_channel(), cares_get_32bit(addr1));
+        ares_set_local_ip4(channel->cares_channel(), ReadUint32BE(addr1));
       }
     } else if (uv_inet_pton(AF_INET6, *ip1, &addr1) == 0) {
       if (type0 == 6) {