deps: upgrade libuv to 3ee4d3f

1 files changed, 113 insertions, 80 deletions

diff --git a/deps/uv/src/uv-common.c b/deps/uv/src/uv-common.c
index 64a25991a8..9bcef4504d 100644
--- a/deps/uv/src/uv-common.c
+++ b/deps/uv/src/uv-common.c
@@ -28,6 +28,16 @@
 #include <stdlib.h> /* malloc */
 #include <string.h> /* memset */
 
+#if defined(UV_PLATFORM_HAS_IP6_LINK_LOCAL_ADDRESS) && !defined(_WIN32)
+# include <net/if.h> /* if_nametoindex */
+#endif
+
+/* EAI_* constants. */
+#if !defined(_WIN32)
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <netdb.h>
+#endif
 
 #define XX(uc, lc) case UV_##uc: return sizeof(uv_##lc##_t);
 
@@ -92,11 +102,9 @@ uv_buf_t uv_buf_init(char* base, unsigned int len) {
 }
 
 
-const uv_err_t uv_ok_ = { UV_OK, 0 };
-
-#define UV_ERR_NAME_GEN(val, name, s) case UV_##name : return #name;
-const char* uv_err_name(uv_err_t err) {
-  switch (err.code) {
+#define UV_ERR_NAME_GEN(name, _) case UV_ ## name: return #name;
+const char* uv_err_name(int err) {
+  switch (err) {
     UV_ERRNO_MAP(UV_ERR_NAME_GEN)
     default:
       assert(0);
@@ -106,9 +114,9 @@ const char* uv_err_name(uv_err_t err) {
 #undef UV_ERR_NAME_GEN
 
 
-#define UV_STRERROR_GEN(val, name, s) case UV_##name : return s;
-const char* uv_strerror(uv_err_t err) {
-  switch (err.code) {
+#define UV_STRERROR_GEN(name, msg) case UV_ ## name: return msg;
+const char* uv_strerror(int err) {
+  switch (err) {
     UV_ERRNO_MAP(UV_STRERROR_GEN)
     default:
       return "Unknown system error";
@@ -117,47 +125,6 @@ const char* uv_strerror(uv_err_t err) {
 #undef UV_STRERROR_GEN
 
 
-int uv__set_error(uv_loop_t* loop, uv_err_code code, int sys_error) {
-  loop->last_err.code = code;
-  loop->last_err.sys_errno_ = sys_error;
-  return -1;
-}
-
-
-int uv__set_sys_error(uv_loop_t* loop, int sys_error) {
-  loop->last_err.code = uv_translate_sys_error(sys_error);
-  loop->last_err.sys_errno_ = sys_error;
-  return -1;
-}
-
-
-int uv__set_artificial_error(uv_loop_t* loop, uv_err_code code) {
-  loop->last_err = uv__new_artificial_error(code);
-  return -1;
-}
-
-
-uv_err_t uv__new_sys_error(int sys_error) {
-  uv_err_t error;
-  error.code = uv_translate_sys_error(sys_error);
-  error.sys_errno_ = sys_error;
-  return error;
-}
-
-
-uv_err_t uv__new_artificial_error(uv_err_code code) {
-  uv_err_t error;
-  error.code = code;
-  error.sys_errno_ = 0;
-  return error;
-}
-
-
-uv_err_t uv_last_error(uv_loop_t* loop) {
-  return loop->last_err;
-}
-
-
 struct sockaddr_in uv_ip4_addr(const char* ip, int port) {
   struct sockaddr_in addr;
 
@@ -173,11 +140,36 @@ struct sockaddr_in uv_ip4_addr(const char* ip, int port) {
 
 struct sockaddr_in6 uv_ip6_addr(const char* ip, int port) {
   struct sockaddr_in6 addr;
+  char address_part[40];
+  size_t address_part_size;
+  const char* zone_index;
 
   memset(&addr, 0, sizeof(struct sockaddr_in6));
 
   addr.sin6_family = AF_INET6;
   addr.sin6_port = htons(port);
+
+#if defined(UV_PLATFORM_HAS_IP6_LINK_LOCAL_ADDRESS)
+  zone_index = strchr(ip, '%');
+  if (zone_index != NULL) {
+    address_part_size = sizeof(address_part);
+    assert((unsigned)(zone_index - ip) < address_part_size);
+    strncpy(address_part, ip, zone_index - ip);
+    address_part[address_part_size - 1] = '\0';
+
+    ip = address_part;
+
+    zone_index++; /* skip '%' */
+    /* NOTE: unknown interface (id=0) is silently ignored */
+#ifdef _WIN32
+    addr.sin6_scope_id = atoi(zone_index);
+#else
+    addr.sin6_scope_id = if_nametoindex(zone_index);
+#endif
+  }
+#endif
+
+  /* result code is ignored - we assume ip is a valid IPv6 address */
   uv_inet_pton(AF_INET6, ip, &addr.sin6_addr);
 
   return addr;
@@ -185,20 +177,18 @@ struct sockaddr_in6 uv_ip6_addr(const char* ip, int port) {
 
 
 int uv_ip4_name(struct sockaddr_in* src, char* dst, size_t size) {
-  uv_err_t err = uv_inet_ntop(AF_INET, &src->sin_addr, dst, size);
-  return err.code != UV_OK;
+  return uv_inet_ntop(AF_INET, &src->sin_addr, dst, size);
 }
 
 
 int uv_ip6_name(struct sockaddr_in6* src, char* dst, size_t size) {
-  uv_err_t err = uv_inet_ntop(AF_INET6, &src->sin6_addr, dst, size);
-  return err.code != UV_OK;
+  return uv_inet_ntop(AF_INET6, &src->sin6_addr, dst, size);
 }
 
 
 int uv_tcp_bind(uv_tcp_t* handle, struct sockaddr_in addr) {
   if (handle->type != UV_TCP || addr.sin_family != AF_INET)
-    return uv__set_artificial_error(handle->loop, UV_EINVAL);
+    return UV_EINVAL;
   else
     return uv__tcp_bind(handle, addr);
 }
@@ -206,7 +196,7 @@ int uv_tcp_bind(uv_tcp_t* handle, struct sockaddr_in addr) {
 
 int uv_tcp_bind6(uv_tcp_t* handle, struct sockaddr_in6 addr) {
   if (handle->type != UV_TCP || addr.sin6_family != AF_INET6)
-    return uv__set_artificial_error(handle->loop, UV_EINVAL);
+    return UV_EINVAL;
   else
     return uv__tcp_bind6(handle, addr);
 }
@@ -216,7 +206,7 @@ int uv_udp_bind(uv_udp_t* handle,
                 struct sockaddr_in addr,
                 unsigned int flags) {
   if (handle->type != UV_UDP || addr.sin_family != AF_INET)
-    return uv__set_artificial_error(handle->loop, UV_EINVAL);
+    return UV_EINVAL;
   else
     return uv__udp_bind(handle, addr, flags);
 }
@@ -226,7 +216,7 @@ int uv_udp_bind6(uv_udp_t* handle,
                  struct sockaddr_in6 addr,
                  unsigned int flags) {
   if (handle->type != UV_UDP || addr.sin6_family != AF_INET6)
-    return uv__set_artificial_error(handle->loop, UV_EINVAL);
+    return UV_EINVAL;
   else
     return uv__udp_bind6(handle, addr, flags);
 }
@@ -237,7 +227,7 @@ int uv_tcp_connect(uv_connect_t* req,
                    struct sockaddr_in address,
                    uv_connect_cb cb) {
   if (handle->type != UV_TCP || address.sin_family != AF_INET)
-    return uv__set_artificial_error(handle->loop, UV_EINVAL);
+    return UV_EINVAL;
   else
     return uv__tcp_connect(req, handle, address, cb);
 }
@@ -248,7 +238,7 @@ int uv_tcp_connect6(uv_connect_t* req,
                     struct sockaddr_in6 address,
                     uv_connect_cb cb) {
   if (handle->type != UV_TCP || address.sin6_family != AF_INET6)
-    return uv__set_artificial_error(handle->loop, UV_EINVAL);
+    return UV_EINVAL;
   else
     return uv__tcp_connect6(req, handle, address, cb);
 }
@@ -260,11 +250,10 @@ int uv_udp_send(uv_udp_send_t* req,
                 int bufcnt,
                 struct sockaddr_in addr,
                 uv_udp_send_cb send_cb) {
-  if (handle->type != UV_UDP || addr.sin_family != AF_INET) {
-    return uv__set_artificial_error(handle->loop, UV_EINVAL);
-  }
-
-  return uv__udp_send(req, handle, bufs, bufcnt, addr, send_cb);
+  if (handle->type != UV_UDP || addr.sin_family != AF_INET)
+    return UV_EINVAL;
+  else
+    return uv__udp_send(req, handle, bufs, bufcnt, addr, send_cb);
 }
 
 
@@ -274,31 +263,28 @@ int uv_udp_send6(uv_udp_send_t* req,
                  int bufcnt,
                  struct sockaddr_in6 addr,
                  uv_udp_send_cb send_cb) {
-  if (handle->type != UV_UDP || addr.sin6_family != AF_INET6) {
-    return uv__set_artificial_error(handle->loop, UV_EINVAL);
-  }
-
-  return uv__udp_send6(req, handle, bufs, bufcnt, addr, send_cb);
+  if (handle->type != UV_UDP || addr.sin6_family != AF_INET6)
+    return UV_EINVAL;
+  else
+    return uv__udp_send6(req, handle, bufs, bufcnt, addr, send_cb);
 }
 
 
 int uv_udp_recv_start(uv_udp_t* handle,
                       uv_alloc_cb alloc_cb,
                       uv_udp_recv_cb recv_cb) {
-  if (handle->type != UV_UDP || alloc_cb == NULL || recv_cb == NULL) {
-    return uv__set_artificial_error(handle->loop, UV_EINVAL);
-  }
-
-  return uv__udp_recv_start(handle, alloc_cb, recv_cb);
+  if (handle->type != UV_UDP || alloc_cb == NULL || recv_cb == NULL)
+    return UV_EINVAL;
+  else
+    return uv__udp_recv_start(handle, alloc_cb, recv_cb);
 }
 
 
 int uv_udp_recv_stop(uv_udp_t* handle) {
-  if (handle->type != UV_UDP) {
-    return uv__set_artificial_error(handle->loop, UV_EINVAL);
-  }
-
-  return uv__udp_recv_stop(handle);
+  if (handle->type != UV_UDP)
+    return UV_EINVAL;
+  else
+    return uv__udp_recv_stop(handle);
 }
 
 
@@ -332,7 +318,7 @@ int uv_thread_create(uv_thread_t *tid, void (*entry)(void *arg), void *arg) {
 
   ctx = malloc(sizeof(*ctx));
   if (ctx == NULL)
-    return -1;
+    return UV_ENOMEM;
 
   ctx->entry = entry;
   ctx->arg = arg;
@@ -439,3 +425,50 @@ void uv_stop(uv_loop_t* loop) {
 uint64_t uv_now(uv_loop_t* loop) {
   return loop->time;
 }
+
+
+int uv__getaddrinfo_translate_error(int sys_err) {
+  switch (sys_err) {
+  case 0: return 0;
+#if defined(EAI_ADDRFAMILY)
+  case EAI_ADDRFAMILY: return UV_EAI_ADDRFAMILY;
+#endif
+#if defined(EAI_AGAIN)
+  case EAI_AGAIN: return UV_EAI_AGAIN;
+#endif
+#if defined(EAI_BADFLAGS)
+  case EAI_BADFLAGS: return UV_EAI_BADFLAGS;
+#endif
+#if defined(EAI_CANCELED)
+  case EAI_CANCELED: return UV_EAI_CANCELED;
+#endif
+#if defined(EAI_FAIL)
+  case EAI_FAIL: return UV_EAI_FAIL;
+#endif
+#if defined(EAI_FAMILY)
+  case EAI_FAMILY: return UV_EAI_FAMILY;
+#endif
+#if defined(EAI_MEMORY)
+  case EAI_MEMORY: return UV_EAI_MEMORY;
+#endif
+#if defined(EAI_NODATA)
+  case EAI_NODATA: return UV_EAI_NODATA;
+#endif
+#if defined(EAI_NONAME)
+# if !defined(EAI_NODATA) || EAI_NODATA != EAI_NONAME
+  case EAI_NONAME: return UV_EAI_NONAME;
+# endif
+#endif
+#if defined(EAI_SERVICE)
+  case EAI_SERVICE: return UV_EAI_SERVICE;
+#endif
+#if defined(EAI_SOCKTYPE)
+  case EAI_SOCKTYPE: return UV_EAI_SOCKTYPE;
+#endif
+#if defined(EAI_SYSTEM)
+  case EAI_SYSTEM: return UV_EAI_SYSTEM;
+#endif
+  }
+  assert(!"unknown EAI_* error code");
+  abort();
+}