Commit 95d8a27
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 <info@bnoordhuis.nl>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>1 parent 06038a4 commit 95d8a27
1 file changed
Lines changed: 7 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -30,12 +30,8 @@ | |||
| 30 | 30 | #include <sys/types.h> | |
| 31 | 31 | #include <sys/socket.h> | |
| 32 | 32 | ||
| 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) | ||
| 39 | 35 | #include <ifaddrs.h> | |
| 40 | 36 | #endif | |
| 41 | 37 | ||
@@ -224,6 +220,10 @@ static int uv__is_ipv6_link_local(const struct sockaddr* addr) { | |||
| 224 | 220 | ||
| 225 | 221 | ||
| 226 | 222 | 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 | ||
| 227 | 227 | struct sockaddr_in6* a6; | |
| 228 | 228 | struct ifaddrs* ifa; | |
| 229 | 229 | struct ifaddrs* p; | |
@@ -244,6 +244,7 @@ static int uv__ipv6_link_local_scope_id(void) { | |||
| 244 | 244 | ||
| 245 | 245 | freeifaddrs(ifa); | |
| 246 | 246 | return rv; | |
| 247 | + #endif | ||
| 247 | 248 | } | |
| 248 | 249 | ||
| 249 | 250 | ||
0 commit comments