Skip to content

dns: stop using deprecated functions in SetServers #64356

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

Open
aduh95 wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −31
Open

dns: stop using deprecated functions in SetServers #64356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 13 additions & 29 deletions src/cares_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2110,15 +2110,9 @@ void SetServers(const FunctionCallbackInfo<Value>& args) {

uint32_t len = arr->Length();

if (len == 0) {
int rv = ares_set_servers(channel->cares_channel(), nullptr);
return args.GetReturnValue().Set(rv);
}

std::vector<ares_addr_port_node> servers(len);
ares_addr_port_node* last = nullptr;

int err;
// An empty list clears all configured servers. ares_set_servers_ports_csv()
// treats an empty string as "blank all servers".
std::string csv;

for (uint32_t i = 0; i < len; i++) {
Local<Value> val;
Expand All @@ -2143,37 +2137,27 @@ void SetServers(const FunctionCallbackInfo<Value>& args) {
node::Utf8Value ip(env->isolate(), ipValue);
int port = portValue->Int32Value(env->context()).FromJust();

ares_addr_port_node* cur = &servers[i];
if (!csv.empty()) csv += ',';

cur->tcp_port = cur->udp_port = port;
// Incoming CSV format expected by c-ares: host[:port][,host[:port]]...
// IPv6 addresses must be wrapped in square brackets.
switch (fam) {
case 4:
cur->family = AF_INET;
err = uv_inet_pton(AF_INET, *ip, &cur->addr);
csv += *ip;
break;
case 6:
cur->family = AF_INET6;
err = uv_inet_pton(AF_INET6, *ip, &cur->addr);
csv += '[';
csv += *ip;
csv += ']';
break;
default:
UNREACHABLE("Bad address family");
}

if (err)
break;

cur->next = nullptr;

if (last != nullptr)
last->next = cur;

last = cur;
csv += ':';
csv += std::to_string(port);
}

if (err == 0)
err = ares_set_servers_ports(channel->cares_channel(), servers.data());
else
err = ARES_EBADSTR;
int err = ares_set_servers_ports_csv(channel->cares_channel(), csv.c_str());

if (err == ARES_SUCCESS)
channel->set_is_servers_default(false);
Expand Down
7 changes: 5 additions & 2 deletions test/parallel/test-dns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,15 @@ const portsExpected = [
'4.4.4.4',
'2001:4860:4860::8888',
'103.238.225.181:666',
'[fe80::483a:5aff:fee6:1f04]:666',
'fe80::483a:5aff:fee6:1f04',
];
dns.setServers(ports);
assert.deepStrictEqual(dns.getServers(), portsExpected);

// Link-local IPv6 addresses require a zone index (scope id) to be usable;
// c-ares drops link-local servers configured without one.
dns.setServers(['[fe80::483a:5aff:fee6:1f04]%eth0']);
assert.deepStrictEqual(dns.getServers(), []);

dns.setServers([]);
assert.deepStrictEqual(dns.getServers(), []);

Expand Down
Loading