Skip to content

Commit 95d8a27

Browse files
abmusseRafaelGSS
authored andcommitted
deps: cherry-pick bfbe4e38d7 from libuv upstream
Original commit message: aix: disable ipv6 link local (#4229) AIX does not implement ifaddrs and when retrieving the network interfaces with uv_interface_addresses there was a test failure in tcp_connect6_link_local. For now disable ipv6 link local on aix to: 1) fix broken aix build 2) stop blocking libuv upgrade in node Refs: libuv/libuv#4222 (comment) Refs: #50650 Refs: libuv/libuv@bfbe4e3 PR-URL: #50650 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
1 parent 06038a4 commit 95d8a27

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

deps/uv/src/unix/tcp.c

+7-6
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,8 @@
3030
#include <sys/types.h>
3131
#include <sys/socket.h>
3232

33-
#if defined(__PASE__)
34-
#include <as400_protos.h>
35-
#define ifaddrs ifaddrs_pase
36-
#define getifaddrs Qp2getifaddrs
37-
#define freeifaddrs Qp2freeifaddrs
38-
#else
33+
/* ifaddrs is not implemented on AIX and IBM i PASE */
34+
#if !defined(_AIX)
3935
#include <ifaddrs.h>
4036
#endif
4137

@@ -224,6 +220,10 @@ static int uv__is_ipv6_link_local(const struct sockaddr* addr) {
224220

225221

226222
static int uv__ipv6_link_local_scope_id(void) {
223+
/* disable link local on AIX & PASE for now */
224+
#if defined(_AIX)
225+
return 0;
226+
#else
227227
struct sockaddr_in6* a6;
228228
struct ifaddrs* ifa;
229229
struct ifaddrs* p;
@@ -244,6 +244,7 @@ static int uv__ipv6_link_local_scope_id(void) {
244244

245245
freeifaddrs(ifa);
246246
return rv;
247+
#endif
247248
}
248249

249250

0 commit comments

Comments
 (0)