libuv 1.42.0.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3650 ed5197a5-7fde-0310-b194-c3ffbd925b24

deps/libuv/test/echo-server.c

@@ -65,25 +65,35 @@ static void after_write(uv_write_t* req, int status) {
 
 
 static void after_shutdown(uv_shutdown_t* req, int status) {
+  ASSERT_EQ(status, 0);
   uv_close((uv_handle_t*) req->handle, on_close);
   free(req);
 }
 
 
+static void on_shutdown(uv_shutdown_t* req, int status) {
+  ASSERT_EQ(status, 0);
+  free(req);
+}
+
+
 static void after_read(uv_stream_t* handle,
                        ssize_t nread,
                        const uv_buf_t* buf) {
   int i;
   write_req_t *wr;
   uv_shutdown_t* sreq;
+  int shutdown = 0;
 
   if (nread < 0) {
     /* Error or EOF */
-    ASSERT(nread == UV_EOF);
+    ASSERT_EQ(nread, UV_EOF);
 
     free(buf->base);
     sreq = malloc(sizeof* sreq);
-    ASSERT(0 == uv_shutdown(sreq, handle, after_shutdown));
+    if (uv_is_writable(handle)) {
+      ASSERT_EQ(0, uv_shutdown(sreq, handle, after_shutdown));
+    }
     return;
   }
 
@@ -96,29 +106,42 @@ static void after_read(uv_stream_t* handle,
   /*
    * Scan for the letter Q which signals that we should quit the server.
    * If we get QS it means close the stream.
+   * If we get QSS it means shutdown the stream.
+   * If we get QSH it means disable linger before close the socket.
    */
-  if (!server_closed) {
-    for (i = 0; i < nread; i++) {
-      if (buf->base[i] == 'Q') {
-        if (i + 1 < nread && buf->base[i + 1] == 'S') {
-          free(buf->base);
-          uv_close((uv_handle_t*)handle, on_close);
-          return;
-        } else {
-          uv_close(server, on_server_close);
-          server_closed = 1;
-        }
+  for (i = 0; i < nread; i++) {
+    if (buf->base[i] == 'Q') {
+      if (i + 1 < nread && buf->base[i + 1] == 'S') {
+        int reset = 0;
+        if (i + 2 < nread && buf->base[i + 2] == 'S')
+          shutdown = 1;
+        if (i + 2 < nread && buf->base[i + 2] == 'H')
+          reset = 1;
+        if (reset && handle->type == UV_TCP)
+          ASSERT_EQ(0, uv_tcp_close_reset((uv_tcp_t*) handle, on_close));
+        else if (shutdown)
+          break;
+        else
+          uv_close((uv_handle_t*) handle, on_close);
+        free(buf->base);
+        return;
+      } else if (!server_closed) {
+        uv_close(server, on_server_close);
+        server_closed = 1;
       }
     }
   }
 
   wr = (write_req_t*) malloc(sizeof *wr);
-  ASSERT(wr != NULL);
+  ASSERT_NOT_NULL(wr);
   wr->buf = uv_buf_init(buf->base, nread);
 
   if (uv_write(&wr->req, handle, &wr->buf, 1, after_write)) {
     FATAL("uv_write failed");
   }
+
+  if (shutdown)
+    ASSERT_EQ(0, uv_shutdown(malloc(sizeof* sreq), handle, on_shutdown));
 }
 
 
@@ -155,14 +178,14 @@ static void on_connection(uv_stream_t* server, int status) {
   switch (serverType) {
   case TCP:
     stream = malloc(sizeof(uv_tcp_t));
-    ASSERT(stream != NULL);
+    ASSERT_NOT_NULL(stream);
     r = uv_tcp_init(loop, (uv_tcp_t*)stream);
     ASSERT(r == 0);
     break;
 
   case PIPE:
     stream = malloc(sizeof(uv_pipe_t));
-    ASSERT(stream != NULL);
+    ASSERT_NOT_NULL(stream);
     r = uv_pipe_init(loop, (uv_pipe_t*)stream, 0);
     ASSERT(r == 0);
     break;
@@ -197,7 +220,7 @@ static uv_udp_send_t* send_alloc(void) {
 }
 
 static void on_send(uv_udp_send_t* req, int status) {
-  ASSERT(req != NULL);
+  ASSERT_NOT_NULL(req);
   ASSERT(status == 0);
   req->data = send_freelist;
   send_freelist = req;
@@ -209,6 +232,7 @@ static void on_recv(uv_udp_t* handle,
                     const struct sockaddr* addr,
                     unsigned flags) {
   uv_buf_t sndbuf;
+  uv_udp_send_t* req;
 
   if (nread == 0) {
     /* Everything OK, but nothing read. */
@@ -218,8 +242,8 @@ static void on_recv(uv_udp_t* handle,
   ASSERT(nread > 0);
   ASSERT(addr->sa_family == AF_INET);
 
-  uv_udp_send_t* req = send_alloc();
-  ASSERT(req != NULL);
+  req = send_alloc();
+  ASSERT_NOT_NULL(req);
   sndbuf = uv_buf_init(rcvbuf->base, nread);
   ASSERT(0 <= uv_udp_send(req, handle, &sndbuf, 1, addr, on_send));
 }
@@ -228,7 +252,7 @@ static int tcp4_echo_start(int port) {
   struct sockaddr_in addr;
   int r;
 
-  ASSERT(0 == uv_ip4_addr("0.0.0.0", port, &addr));
+  ASSERT(0 == uv_ip4_addr("127.0.0.1", port, &addr));
 
   server = (uv_handle_t*)&tcpServer;
   serverType = TCP;