Created
November 8, 2011 00:35
-
-
Save igorzi/1346659 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 305e179b307fc9a48783dd48481553fb70528b13 Mon Sep 17 00:00:00 2001 | |
From: Igor Zinkovsky <igorzi@microsoft.com> | |
Date: Mon, 7 Nov 2011 15:48:33 -0800 | |
Subject: [PATCH] windows: convert WSAECONNABORTED to EOF | |
--- | |
src/win/tcp.c | 22 ++++- | |
test/test-list.h | 2 + | |
test/test-tcp-write-to-half-open-connection.c | 138 +++++++++++++++++++++++++ | |
uv.gyp | 1 + | |
4 files changed, 160 insertions(+), 3 deletions(-) | |
create mode 100644 test/test-tcp-write-to-half-open-connection.c | |
diff --git a/src/win/tcp.c b/src/win/tcp.c | |
index f086086..f57c825 100644 | |
--- a/src/win/tcp.c | |
+++ b/src/win/tcp.c | |
@@ -824,9 +824,19 @@ void uv_process_tcp_read_req(uv_loop_t* loop, uv_tcp_t* handle, | |
/* An error occurred doing the read. */ | |
if ((handle->flags & UV_HANDLE_READING)) { | |
handle->flags &= ~UV_HANDLE_READING; | |
- uv__set_sys_error(loop, GET_REQ_SOCK_ERROR(req)); | |
buf = (handle->flags & UV_HANDLE_ZERO_READ) ? | |
uv_buf_init(NULL, 0) : handle->read_buffer; | |
+ | |
+ err = GET_REQ_SOCK_ERROR(req); | |
+ | |
+ if (err == WSAECONNABORTED) { | |
+ /* Treat WSAECONNABORTED as connection closed. */ | |
+ handle->flags |= UV_HANDLE_EOF; | |
+ uv__set_error(loop, UV_EOF, ERROR_SUCCESS); | |
+ } else { | |
+ uv__set_sys_error(loop, err); | |
+ } | |
+ | |
handle->read_cb((uv_stream_t*)handle, -1, buf); | |
} | |
} else { | |
@@ -887,8 +897,14 @@ void uv_process_tcp_read_req(uv_loop_t* loop, uv_tcp_t* handle, | |
uv__set_sys_error(loop, WSAEWOULDBLOCK); | |
handle->read_cb((uv_stream_t*)handle, 0, buf); | |
} else { | |
- /* Ouch! serious error. */ | |
- uv__set_sys_error(loop, err); | |
+ if (err == WSAECONNABORTED) { | |
+ /* Treat WSAECONNABORTED as connection closed. */ | |
+ handle->flags |= UV_HANDLE_EOF; | |
+ uv__set_error(loop, UV_EOF, ERROR_SUCCESS); | |
+ } else { | |
+ /* Ouch! serious error. */ | |
+ uv__set_sys_error(loop, err); | |
+ } | |
handle->flags &= ~UV_HANDLE_READING; | |
handle->read_cb((uv_stream_t*)handle, -1, buf); | |
} | |
diff --git a/test/test-list.h b/test/test-list.h | |
index b38f953..9051fdb 100644 | |
--- a/test/test-list.h | |
+++ b/test/test-list.h | |
@@ -41,6 +41,7 @@ TEST_DECLARE (tcp_listen_without_bind) | |
TEST_DECLARE (tcp_close) | |
TEST_DECLARE (tcp_flags) | |
TEST_DECLARE (tcp_write_error) | |
+TEST_DECLARE (tcp_write_to_half_open_connection) | |
TEST_DECLARE (tcp_bind6_error_addrinuse) | |
TEST_DECLARE (tcp_bind6_error_addrnotavail) | |
TEST_DECLARE (tcp_bind6_error_fault) | |
@@ -163,6 +164,7 @@ TASK_LIST_START | |
TEST_ENTRY (tcp_close) | |
TEST_ENTRY (tcp_flags) | |
TEST_ENTRY (tcp_write_error) | |
+ TEST_ENTRY (tcp_write_to_half_open_connection) | |
TEST_ENTRY (tcp_bind6_error_addrinuse) | |
TEST_ENTRY (tcp_bind6_error_addrnotavail) | |
diff --git a/test/test-tcp-write-to-half-open-connection.c b/test/test-tcp-write-to-half-open-connection.c | |
new file mode 100644 | |
index 0000000..1551c71 | |
--- /dev/null | |
+++ b/test/test-tcp-write-to-half-open-connection.c | |
@@ -0,0 +1,138 @@ | |
+/* Copyright Joyent, Inc. and other Node contributors. All rights reserved. | |
+ * | |
+ * Permission is hereby granted, free of charge, to any person obtaining a copy | |
+ * of this software and associated documentation files (the "Software"), to | |
+ * deal in the Software without restriction, including without limitation the | |
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or | |
+ * sell copies of the Software, and to permit persons to whom the Software is | |
+ * furnished to do so, subject to the following conditions: | |
+ * | |
+ * The above copyright notice and this permission notice shall be included in | |
+ * all copies or substantial portions of the Software. | |
+ * | |
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | |
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS | |
+ * IN THE SOFTWARE. | |
+ */ | |
+ | |
+#include "uv.h" | |
+#include "task.h" | |
+ | |
+#include <stdio.h> | |
+#include <stdlib.h> | |
+#include <string.h> | |
+ | |
+static void connection_cb(uv_stream_t* server, int status); | |
+static void connect_cb(uv_connect_t* req, int status); | |
+static void write_cb(uv_write_t* req, int status); | |
+static void read_cb(uv_stream_t* stream, ssize_t nread, uv_buf_t buf); | |
+static uv_buf_t alloc_cb(uv_handle_t* handle, size_t suggested_size); | |
+ | |
+static uv_tcp_t tcp_server; | |
+static uv_tcp_t tcp_client; | |
+static uv_tcp_t tcp_peer; /* client socket as accept()-ed by server */ | |
+static uv_connect_t connect_req; | |
+static uv_write_t write_req; | |
+ | |
+static int write_cb_called; | |
+static int read_cb_called; | |
+ | |
+ | |
+static void connection_cb(uv_stream_t* server, int status) { | |
+ int r; | |
+ uv_buf_t buf; | |
+ | |
+ ASSERT(server == (uv_stream_t*)&tcp_server); | |
+ ASSERT(status == 0); | |
+ | |
+ r = uv_tcp_init(server->loop, &tcp_peer); | |
+ ASSERT(r == 0); | |
+ | |
+ r = uv_accept(server, (uv_stream_t*)&tcp_peer); | |
+ ASSERT(r == 0); | |
+ | |
+ r = uv_read_start((uv_stream_t*)&tcp_peer, alloc_cb, read_cb); | |
+ ASSERT(r == 0); | |
+ | |
+ buf.base = "hello\n"; | |
+ buf.len = 6; | |
+ | |
+ r = uv_write(&write_req, (uv_stream_t*)&tcp_peer, &buf, 1, write_cb); | |
+ ASSERT(r == 0); | |
+} | |
+ | |
+ | |
+static uv_buf_t alloc_cb(uv_handle_t* handle, size_t suggested_size) { | |
+ static char slab[1024]; | |
+ return uv_buf_init(slab, sizeof slab); | |
+} | |
+ | |
+ | |
+static void read_cb(uv_stream_t* stream, ssize_t nread, uv_buf_t buf) { | |
+ if (nread == -1) { | |
+ fprintf(stderr, "read_cb error: %s\n", uv_err_name(uv_last_error(stream->loop))); | |
+ ASSERT(uv_last_error(stream->loop).code == UV_EOF); | |
+ | |
+ uv_close((uv_handle_t*)&tcp_server, NULL); | |
+ uv_close((uv_handle_t*)&tcp_peer, NULL); | |
+ } | |
+ | |
+ read_cb_called++; | |
+} | |
+ | |
+ | |
+static void connect_cb(uv_connect_t* req, int status) { | |
+ ASSERT(req == &connect_req); | |
+ ASSERT(status == 0); | |
+ | |
+ /* Close the client. */ | |
+ uv_close((uv_handle_t*)&tcp_client, NULL); | |
+} | |
+ | |
+ | |
+static void write_cb(uv_write_t* req, int status) { | |
+ ASSERT(status == 0); | |
+ uv_close((uv_handle_t*)&tcp_client, NULL); | |
+ write_cb_called++; | |
+} | |
+ | |
+ | |
+TEST_IMPL(tcp_write_to_half_open_connection) { | |
+ uv_loop_t* loop; | |
+ int r; | |
+ | |
+ loop = uv_default_loop(); | |
+ ASSERT(loop != NULL); | |
+ | |
+ r = uv_tcp_init(loop, &tcp_server); | |
+ ASSERT(r == 0); | |
+ | |
+ r = uv_tcp_bind(&tcp_server, uv_ip4_addr("127.0.0.1", TEST_PORT)); | |
+ ASSERT(r == 0); | |
+ | |
+ r = uv_listen((uv_stream_t*)&tcp_server, 1, connection_cb); | |
+ ASSERT(r == 0); | |
+ | |
+ r = uv_tcp_init(loop, &tcp_client); | |
+ ASSERT(r == 0); | |
+ | |
+ r = uv_tcp_connect(&connect_req, | |
+ &tcp_client, | |
+ uv_ip4_addr("127.0.0.1", TEST_PORT), | |
+ connect_cb); | |
+ ASSERT(r == 0); | |
+ | |
+ ASSERT(write_cb_called == 0); | |
+ | |
+ r = uv_run(loop); | |
+ ASSERT(r == 0); | |
+ | |
+ ASSERT(write_cb_called > 0); | |
+ ASSERT(read_cb_called > 0); | |
+ | |
+ return 0; | |
+} | |
diff --git a/uv.gyp b/uv.gyp | |
index 3dac47f..83129b5 100644 | |
--- a/uv.gyp | |
+++ b/uv.gyp | |
@@ -308,6 +308,7 @@ | |
'test/test-tcp-connect-error.c', | |
'test/test-tcp-connect6-error.c', | |
'test/test-tcp-write-error.c', | |
+ 'test/test-tcp-write-to-half-open-connection.c', | |
'test/test-tcp-writealot.c', | |
'test/test-threadpool.c', | |
'test/test-timer-again.c', | |
-- | |
1.7.4.msysgit.0 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment