Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nodejs/node.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAntoine du Hamel <duhamelantoine1995@gmail.com>2022-01-07 19:24:40 +0300
committerAntoine du Hamel <duhamelantoine1995@gmail.com>2022-04-12 06:50:09 +0300
commit3a26db9697a09915a0d541d97f047fc9c02bb452 (patch)
tree66359e4b009324215ec0915b44948a1501a10172 /src
parent6706be1cdb676605a25d1a4b8dd0890fab62d73f (diff)
net: make `server.address()` return an integer for `family`
`dns.lookup` options only accepts integer for `family` options, having a string doesn't really make sense here. PR-URL: https://github.com/nodejs/node/pull/41431 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/env.h2
-rw-r--r--src/node_os.cc9
-rw-r--r--src/tcp_wrap.cc4
3 files changed, 7 insertions, 8 deletions
diff --git a/src/env.h b/src/env.h
index efaeb53fbc7..bededfcb5de 100644
--- a/src/env.h
+++ b/src/env.h
@@ -289,8 +289,6 @@ constexpr size_t kFsStatsBufferLength =
V(input_string, "input") \
V(internal_binding_string, "internalBinding") \
V(internal_string, "internal") \
- V(ipv4_string, "IPv4") \
- V(ipv6_string, "IPv6") \
V(isclosing_string, "isClosing") \
V(issuer_string, "issuer") \
V(issuercert_string, "issuerCertificate") \
diff --git a/src/node_os.cc b/src/node_os.cc
index 046a6106ccd..6e62af00f5f 100644
--- a/src/node_os.cc
+++ b/src/node_os.cc
@@ -174,7 +174,8 @@ static void GetInterfaceAddresses(const FunctionCallbackInfo<Value>& args) {
char ip[INET6_ADDRSTRLEN];
char netmask[INET6_ADDRSTRLEN];
std::array<char, 18> mac;
- Local<String> name, family;
+ Local<String> name;
+ Local<Integer> family;
int err = uv_interface_addresses(&interfaces, &count);
@@ -214,14 +215,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 = env->ipv4_string();
+ family = Integer::New(env->isolate(), 4);
} 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 = env->ipv6_string();
+ family = Integer::New(env->isolate(), 6);
} else {
strncpy(ip, "<unknown sa family>", INET6_ADDRSTRLEN);
- family = env->unknown_string();
+ family = Integer::New(env->isolate(), 0);
}
result.emplace_back(name);
diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc
index 538f0355491..747d3e028c2 100644
--- a/src/tcp_wrap.cc
+++ b/src/tcp_wrap.cc
@@ -380,7 +380,7 @@ MaybeLocal<Object> AddressToJS(Environment* env,
OneByteString(env->isolate(), ip)).Check();
info->Set(env->context(),
env->family_string(),
- env->ipv6_string()).Check();
+ Integer::New(env->isolate(), 6)).Check();
info->Set(env->context(),
env->port_string(),
Integer::New(env->isolate(), port)).Check();
@@ -395,7 +395,7 @@ MaybeLocal<Object> AddressToJS(Environment* env,
OneByteString(env->isolate(), ip)).Check();
info->Set(env->context(),
env->family_string(),
- env->ipv4_string()).Check();
+ Integer::New(env->isolate(), 4)).Check();
info->Set(env->context(),
env->port_string(),
Integer::New(env->isolate(), port)).Check();