Upgrade libuv to 7b87ff7c9b

nodejs · Sep 4, 2011 · cb1a21b · cb1a21b
1 parent 766430c
commit cb1a21b
Show file tree

Hide file tree

Showing 15 changed files with 257 additions and 130 deletions.
diff --git a/deps/uv/include/uv-private/uv-win.h b/deps/uv/include/uv-private/uv-win.h
@@ -73,7 +73,7 @@ RB_HEAD(uv_timer_tree_s, uv_timer_s);
   uv_prepare_t* next_prepare_handle;                                          \
   uv_check_t* next_check_handle;                                              \
   uv_idle_t* next_idle_handle;                                                \
-  ares_channel ares_channel;                                                  \
+  ares_channel ares_chan;                                                     \
   int ares_active_sockets;                                                    \
   uv_timer_t ares_polling_timer;                                              \
   /* Last error code */                                                       \

diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h
@@ -415,6 +415,8 @@ int uv_tcp_init(uv_loop_t*, uv_tcp_t* handle);
 
 int uv_tcp_bind(uv_tcp_t* handle, struct sockaddr_in);
 int uv_tcp_bind6(uv_tcp_t* handle, struct sockaddr_in6);
+int uv_tcp_getsockname(uv_tcp_t* handle, struct sockaddr* name, int* namelen);
+int uv_tcp_getpeername(uv_tcp_t* handle, struct sockaddr* name, int* namelen);
 
 /*
  * uv_tcp_connect, uv_tcp_connect6
@@ -436,9 +438,6 @@ struct uv_connect_s {
 };
 
 
-int uv_getsockname(uv_handle_t* handle, struct sockaddr* name, int* namelen);
-
-
 /*
  * UDP support.
  */
@@ -521,6 +520,7 @@ int uv_udp_bind(uv_udp_t* handle, struct sockaddr_in addr, unsigned flags);
  *  0 on success, -1 on error.
  */
 int uv_udp_bind6(uv_udp_t* handle, struct sockaddr_in6 addr, unsigned flags);
+int uv_udp_getsockname(uv_udp_t* handle, struct sockaddr* name, int* namelen);
 
 /*
  * Send data. If the socket has not previously been bound with `uv_udp_bind`

diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c
@@ -300,27 +300,6 @@ void uv__next(EV_P_ ev_idle* watcher, int revents) {
 }
 
 
-int uv_getsockname(uv_handle_t* handle, struct sockaddr* name, int* namelen) {
-  socklen_t socklen;
-  int saved_errno;
-
-  /* Don't clobber errno. */
-  saved_errno = errno;
-
-  /* sizeof(socklen_t) != sizeof(int) on some systems. */
-  socklen = (socklen_t)*namelen;
-
-  if (getsockname(handle->fd, name, &socklen) == -1) {
-    uv_err_new(handle->loop, errno);
-  } else {
-    *namelen = (int)socklen;
-  }
-
-  errno = saved_errno;
-  return 0;
-}
-
-
 void uv_ref(uv_loop_t* loop) {
   ev_ref(loop->ev);
 }

diff --git a/deps/uv/src/unix/error.c b/deps/uv/src/unix/error.c
@@ -30,6 +30,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 
 /* TODO Expose callback to user to handle fatal error like V8 does. */
@@ -79,6 +80,7 @@ static uv_err_code uv_translate_sys_error(int sys_errno) {
     case ECONNREFUSED: return UV_ECONNREFUSED;
     case EADDRINUSE: return UV_EADDRINUSE;
     case EADDRNOTAVAIL: return UV_EADDRNOTAVAIL;
+    case ENOTCONN: return UV_ENOTCONN;
     default: return UV_UNKNOWN;
   }
 }

diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/uio.h>
 
 

diff --git a/deps/uv/src/unix/tcp.c b/deps/uv/src/unix/tcp.c
@@ -122,6 +122,80 @@ int uv_tcp_bind6(uv_tcp_t* tcp, struct sockaddr_in6 addr) {
 }
 
 
+int uv_tcp_getsockname(uv_tcp_t* handle, struct sockaddr* name,
+    int* namelen) {
+  socklen_t socklen;
+  int saved_errno;
+  int rv = 0;
+
+  /* Don't clobber errno. */
+  saved_errno = errno;
+
+  if (handle->delayed_error) {
+    uv_err_new(handle->loop, handle->delayed_error);
+    rv = -1;
+    goto out;
+  }
+
+  if (handle->fd < 0) {
+    uv_err_new(handle->loop, EINVAL);
+    rv = -1;
+    goto out;
+  }
+
+  /* sizeof(socklen_t) != sizeof(int) on some systems. */
+  socklen = (socklen_t)*namelen;
+
+  if (getsockname(handle->fd, name, &socklen) == -1) {
+    uv_err_new(handle->loop, errno);
+    rv = -1;
+  } else {
+    *namelen = (int)socklen;
+  }
+
+out:
+  errno = saved_errno;
+  return rv;
+}
+
+
+int uv_tcp_getpeername(uv_tcp_t* handle, struct sockaddr* name,
+    int* namelen) {
+  socklen_t socklen;
+  int saved_errno;
+  int rv = 0;
+
+  /* Don't clobber errno. */
+  saved_errno = errno;
+
+  if (handle->delayed_error) {
+    uv_err_new(handle->loop, handle->delayed_error);
+    rv = -1;
+    goto out;
+  }
+
+  if (handle->fd < 0) {
+    uv_err_new(handle->loop, EINVAL);
+    rv = -1;
+    goto out;
+  }
+
+  /* sizeof(socklen_t) != sizeof(int) on some systems. */
+  socklen = (socklen_t)*namelen;
+
+  if (getpeername(handle->fd, name, &socklen) == -1) {
+    uv_err_new(handle->loop, errno);
+    rv = -1;
+  } else {
+    *namelen = (int)socklen;
+  }
+
+out:
+  errno = saved_errno;
+  return rv;
+}
+
+
 int uv_tcp_listen(uv_tcp_t* tcp, int backlog, uv_connection_cb cb) {
   int r;
 

diff --git a/deps/uv/src/unix/udp.c b/deps/uv/src/unix/udp.c
@@ -460,6 +460,37 @@ int uv_udp_bind6(uv_udp_t* handle, struct sockaddr_in6 addr, unsigned flags) {
 }
 
 
+int uv_udp_getsockname(uv_udp_t* handle, struct sockaddr* name,
+    int* namelen) {
+  socklen_t socklen;
+  int saved_errno;
+  int rv = 0;
+
+  /* Don't clobber errno. */
+  saved_errno = errno;
+
+  if (handle->fd < 0) {
+    uv_err_new(handle->loop, EINVAL);
+    rv = -1;
+    goto out;
+  }
+
+  /* sizeof(socklen_t) != sizeof(int) on some systems. */
+  socklen = (socklen_t)*namelen;
+
+  if (getsockname(handle->fd, name, &socklen) == -1) {
+    uv_err_new(handle->loop, errno);
+    rv = -1;
+  } else {
+    *namelen = (int)socklen;
+  }
+
+out:
+  errno = saved_errno;
+  return rv;
+}
+
+
 int uv_udp_send(uv_udp_send_t* req,
                 uv_udp_t* handle,
                 uv_buf_t bufs[],

diff --git a/deps/uv/src/win/cares.c b/deps/uv/src/win/cares.c
@@ -95,8 +95,8 @@ static void CALLBACK uv_ares_socksignal_tp(void* parameter,
 /* periodically call ares to check for timeouts */
 static void uv_ares_poll(uv_timer_t* handle, int status) {
   uv_loop_t* loop = handle->loop;
-  if (loop->ares_channel != NULL && loop->ares_active_sockets > 0) {
-    ares_process_fd(loop->ares_channel, ARES_SOCKET_BAD, ARES_SOCKET_BAD);
+  if (loop->ares_chan != NULL && loop->ares_active_sockets > 0) {
+    ares_process_fd(loop->ares_chan, ARES_SOCKET_BAD, ARES_SOCKET_BAD);
   }
 }
 
@@ -214,7 +214,7 @@ static void uv_ares_sockstate_cb(void *data, ares_socket_t sock, int read,
 /* called via uv_poll when ares completion port signaled */
 void uv_process_ares_event_req(uv_loop_t* loop, uv_ares_action_t* handle,
     uv_req_t* req) {
-  ares_process_fd(loop->ares_channel,
+  ares_process_fd(loop->ares_chan,
                   handle->read ? handle->sock : INVALID_SOCKET,
                   handle->write ?  handle->sock : INVALID_SOCKET);
 
@@ -258,7 +258,7 @@ int uv_ares_init_options(uv_loop_t* loop,
   int rc;
 
   /* only allow single init at a time */
-  if (loop->ares_channel != NULL) {
+  if (loop->ares_chan != NULL) {
     return UV_EALREADY;
   }
 
@@ -272,7 +272,7 @@ int uv_ares_init_options(uv_loop_t* loop,
 
   /* if success, save channel */
   if (rc == ARES_SUCCESS) {
-    loop->ares_channel = *channelptr;
+    loop->ares_chan = *channelptr;
   }
 
   return rc;
@@ -282,8 +282,8 @@ int uv_ares_init_options(uv_loop_t* loop,
 /* release memory */
 void uv_ares_destroy(uv_loop_t* loop, ares_channel channel) {
   /* only allow destroy if did init */
-  if (loop->ares_channel != NULL) {
+  if (loop->ares_chan != NULL) {
     ares_destroy(channel);
-    loop->ares_channel = NULL;
+    loop->ares_chan = NULL;
   }
 }
diff --git a/deps/uv/src/win/core.c b/deps/uv/src/win/core.c
@@ -62,7 +62,7 @@ static void uv_loop_init(uv_loop_t* loop) {
   loop->next_idle_handle = NULL;
 
   loop->ares_active_sockets = 0;
-  loop->ares_channel = NULL;
+  loop->ares_chan = NULL;
 
   loop->last_error = uv_ok_;
 }

diff --git a/deps/uv/src/win/error.c b/deps/uv/src/win/error.c
@@ -117,6 +117,8 @@ uv_err_code uv_translate_sys_error(int sys_errno) {
     case ERROR_NETWORK_UNREACHABLE:         return UV_ENETUNREACH;
     case WSAENETUNREACH:                    return UV_ENETUNREACH;
     case ERROR_OUTOFMEMORY:                 return UV_ENOMEM;
+    case ERROR_NOT_CONNECTED:               return UV_ENOTCONN;
+    case WSAENOTCONN:                       return UV_ENOTCONN;
     case ERROR_NOT_SUPPORTED:               return UV_ENOTSUP;
     case ERROR_INSUFFICIENT_BUFFER:         return UV_EINVAL;
     case ERROR_INVALID_FLAGS:               return UV_EBADF;

diff --git a/deps/uv/src/win/handle.c b/deps/uv/src/win/handle.c
@@ -39,23 +39,6 @@ int uv_is_active(uv_handle_t* handle) {
 }
 
 
-int uv_getsockname(uv_handle_t* handle, struct sockaddr* name, int* namelen) {
-  uv_loop_t* loop = handle->loop;
-
-  switch (handle->type) {
-    case UV_TCP:
-      return uv_tcp_getsockname(loop, (uv_tcp_t*) handle, name, namelen);
-
-    case UV_UDP:
-      return uv_udp_getsockname(loop, (uv_udp_t*) handle, name, namelen);
-
-    default:
-      uv_set_sys_error(loop, WSAENOTSOCK);
-      return -1;
-  }
-}
-
-
 void uv_close(uv_handle_t* handle, uv_close_cb cb) {
   uv_tcp_t* tcp;
   uv_pipe_t* pipe;

diff --git a/deps/uv/src/win/internal.h b/deps/uv/src/win/internal.h
@@ -123,8 +123,6 @@ int uv_tcp_read_start(uv_tcp_t* handle, uv_alloc_cb alloc_cb,
     uv_read_cb read_cb);
 int uv_tcp_write(uv_loop_t* loop, uv_write_t* req, uv_tcp_t* handle,
     uv_buf_t bufs[], int bufcnt, uv_write_cb cb);
-int uv_tcp_getsockname(uv_loop_t* loop, uv_tcp_t* handle,
-    struct sockaddr* name, int* namelen);
 
 void uv_process_tcp_read_req(uv_loop_t* loop, uv_tcp_t* handle, uv_req_t* req);
 void uv_process_tcp_write_req(uv_loop_t* loop, uv_tcp_t* handle,
@@ -140,9 +138,6 @@ void uv_tcp_endgame(uv_loop_t* loop, uv_tcp_t* handle);
 /*
  * UDP
  */
-int uv_udp_getsockname(uv_loop_t* loop, uv_udp_t* handle,
-    struct sockaddr* name, int* namelen);
-
 void uv_process_udp_recv_req(uv_loop_t* loop, uv_udp_t* handle, uv_req_t* req);
 void uv_process_udp_send_req(uv_loop_t* loop, uv_udp_t* handle,
     uv_udp_send_t* req);

diff --git a/deps/uv/src/win/tcp.c b/deps/uv/src/win/tcp.c
@@ -419,6 +419,8 @@ int uv_tcp_accept(uv_tcp_t* server, uv_tcp_t* client) {
     rv = -1;
   } else {
     uv_connection_init((uv_stream_t*) client);
+    /* AcceptEx() implicitly binds the accepted socket. */
+    client->flags |= UV_HANDLE_BOUND;
   }
 
   /* Prepare the req to pick up a new connection */
@@ -573,12 +575,18 @@ int uv_tcp_connect6(uv_connect_t* req, uv_tcp_t* handle,
 }
 
 
-int uv_tcp_getsockname(uv_loop_t* loop, uv_tcp_t* handle,
-    struct sockaddr* name, int* namelen) {
+int uv_tcp_getsockname(uv_tcp_t* handle, struct sockaddr* name,
+    int* namelen) {
+  uv_loop_t* loop = handle->loop;
   int result;
 
-  if (handle->flags & UV_HANDLE_SHUTTING) {
-    uv_set_sys_error(loop, WSAESHUTDOWN);
+  if (!(handle->flags & UV_HANDLE_BOUND)) {
+    uv_set_sys_error(loop, WSAEINVAL);
+    return -1;
+  }
+
+  if (handle->flags & UV_HANDLE_BIND_ERROR) {
+    loop->last_error = handle->bind_error;
     return -1;
   }
 
@@ -592,6 +600,31 @@ int uv_tcp_getsockname(uv_loop_t* loop, uv_tcp_t* handle,
 }
 
 
+int uv_tcp_getpeername(uv_tcp_t* handle, struct sockaddr* name,
+    int* namelen) {
+  uv_loop_t* loop = handle->loop;
+  int result;
+
+  if (!(handle->flags & UV_HANDLE_BOUND)) {
+    uv_set_sys_error(loop, WSAEINVAL);
+    return -1;
+  }
+
+  if (handle->flags & UV_HANDLE_BIND_ERROR) {
+    loop->last_error = handle->bind_error;
+    return -1;
+  }
+
+  result = getpeername(handle->socket, name, namelen);
+  if (result != 0) {
+    uv_set_sys_error(loop, WSAGetLastError());
+    return -1;
+  }
+
+  return 0;
+}
+
+
 int uv_tcp_write(uv_loop_t* loop, uv_write_t* req, uv_tcp_t* handle,
     uv_buf_t bufs[], int bufcnt, uv_write_cb cb) {
   int result;

diff --git a/deps/uv/src/win/udp.c b/deps/uv/src/win/udp.c
@@ -40,10 +40,16 @@ static char uv_zero_[] = "";
 static unsigned int active_udp_streams = 0;
 
 
-int uv_udp_getsockname(uv_loop_t* loop, uv_udp_t* handle,
-    struct sockaddr* name, int* namelen) {
+int uv_udp_getsockname(uv_udp_t* handle, struct sockaddr* name,
+    int* namelen) {
+  uv_loop_t* loop = handle->loop;
   int result;
 
+  if (!(handle->flags & UV_HANDLE_BOUND)) {
+    uv_set_sys_error(loop, WSAEINVAL);
+    return -1;
+  }
+
   result = getsockname(handle->socket, name, namelen);
   if (result != 0) {
     uv_set_sys_error(loop, WSAGetLastError());