mirror of
https://github.com/nodejs/node.git
synced 2026-11-15 10:36:53 -05:00
dns: accept 'IPv4' and 'IPv6' for family
Refs: https://github.com/nodejs/node/issues/43014 PR-URL: https://github.com/nodejs/node/pull/43054 Fixes: https://github.com/nodejs/node/issues/43014 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: Beth Griggs <bgriggs@redhat.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This commit is contained in:
1 parent
74716ada2e
commit
70b516e4db
27 files changed
+88
-54
No files matched your search
+4
-5
@@ -174,8 +174,7 @@ static void GetInterfaceAddresses(const FunctionCallbackInfo<Value>& args) {
|
||||
char ip[INET6_ADDRSTRLEN];
|
||||
char netmask[INET6_ADDRSTRLEN];
|
||||
std::array<char, 18> mac;
|
||||
Local<String> name;
|
||||
Local<Integer> family;
|
||||
Local<String> name, family;
|
||||
|
||||
int err = uv_interface_addresses(&interfaces, &count);
|
||||
|
||||
@@ -215,14 +214,14 @@ static void GetInterfaceAddresses(const FunctionCallbackInfo<Value>& args) {
|
||||
if (interfaces[i].address.address4.sin_family == AF_INET) {
|
||||
uv_ip4_name(&interfaces[i].address.address4, ip, sizeof(ip));
|
||||
uv_ip4_name(&interfaces[i].netmask.netmask4, netmask, sizeof(netmask));
|
||||
family = Integer::New(env->isolate(), 4);
|
||||
family = env->ipv4_string();
|
||||
} else if (interfaces[i].address.address4.sin_family == AF_INET6) {
|
||||
uv_ip6_name(&interfaces[i].address.address6, ip, sizeof(ip));
|
||||
uv_ip6_name(&interfaces[i].netmask.netmask6, netmask, sizeof(netmask));
|
||||
family = Integer::New(env->isolate(), 6);
|
||||
family = env->ipv6_string();
|
||||
} else {
|
||||
strncpy(ip, "<unknown sa family>", INET6_ADDRSTRLEN);
|
||||
family = Integer::New(env->isolate(), 0);
|
||||
family = env->unknown_string();
|
||||
}
|
||||
|
||||
result.emplace_back(name);
|
||||
|
||||
Reference in new issue
Block a user