diff options
| author | cjihrig <cjihrig@gmail.com> | 2017-10-02 19:44:44 -0400 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2017-10-05 12:08:33 -0700 |
| commit | fca6c5839a6154275913656dfedb3242959031e3 (patch) | |
| tree | e1fed70c4929b71306e6a18a92bf5501245a286c /deps/uv/src/unix/bsd-ifaddrs.c | |
| parent | b9a55a93c91fb7fd7ac81e182f843f28014179ca (diff) | |
| download | android-node-v8-fca6c5839a6154275913656dfedb3242959031e3.tar.gz android-node-v8-fca6c5839a6154275913656dfedb3242959031e3.tar.bz2 android-node-v8-fca6c5839a6154275913656dfedb3242959031e3.zip | |
deps: upgrade libuv to 1.15.0
PR-URL: https://github.com/nodejs/node/pull/15745
Refs: https://github.com/nodejs/node/pull/15380
Refs: https://github.com/nodejs/node/issues/15683
Fixes: https://github.com/nodejs/node/issues/15394
Fixes: https://github.com/nodejs/node/issues/15770
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'deps/uv/src/unix/bsd-ifaddrs.c')
| -rw-r--r-- | deps/uv/src/unix/bsd-ifaddrs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/deps/uv/src/unix/bsd-ifaddrs.c b/deps/uv/src/unix/bsd-ifaddrs.c index ffcf156440..2593b9ff33 100644 --- a/deps/uv/src/unix/bsd-ifaddrs.c +++ b/deps/uv/src/unix/bsd-ifaddrs.c @@ -50,7 +50,11 @@ static int uv__ifaddr_exclude(struct ifaddrs *ent, int exclude_type) { */ if (ent->ifa_addr->sa_family == AF_LINK) return 1; -#elif defined(__NetBSD__) || defined(__OpenBSD__) +#elif defined(__NetBSD__) + if (ent->ifa_addr->sa_family != PF_INET && + ent->ifa_addr->sa_family != PF_INET6) + return 1; +#elif defined(__OpenBSD__) if (ent->ifa_addr->sa_family != PF_INET) return 1; #endif |