luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uv-unix: guard against self-close by connection_cb

Browse Source 
connection_cb may close the server socket inside the accept loop, handle it.

Fixes failing node.js tests:
  test/simple/test-net-connect-buffer.js
  test/simple/test-net-create-connection.js
This commit is contained in:
Ben Noordhuis 2011-08-11 00:29:50 +02:00
parent afb1859600
commit b6b97f305e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/uv-unix.c
View File

@ -427,14 +427,17 @@ void uv__server_io(EV_P_ ev_io* watcher, int revents) {
watcher == &stream->write_watcher);
assert(revents == EV_READ);
assert(!(((uv_handle_t*)stream)->flags & UV_CLOSING));
assert(!(stream->flags & UV_CLOSING));
if (stream->accepted_fd >= 0) {
ev_io_stop(EV_DEFAULT_ &stream->read_watcher);
return;
}
while (1) {
/* connection_cb can close the server socket while we're
* in the loop so check it on each iteration.
*/
while (stream->fd != -1) {
assert(stream->accepted_fd < 0);
fd = uv__accept(stream->fd, (struct sockaddr*)&addr, sizeof addr);
@ -449,7 +452,6 @@ void uv__server_io(EV_P_ ev_io* watcher, int revents) {
uv_err_new((uv_handle_t*)stream, errno);
stream->connection_cb((uv_stream_t*)stream, -1);
}
} else {
stream->accepted_fd = fd;
stream->connection_cb((uv_stream_t*)stream, 0);
@ -897,7 +899,7 @@ static void uv__stream_io(EV_P_ ev_io* watcher, int revents) {
stream->type == UV_NAMED_PIPE);
assert(watcher == &stream->read_watcher ||
watcher == &stream->write_watcher);
assert(!(((uv_handle_t*)stream)->flags & UV_CLOSING));
assert(!(stream->flags & UV_CLOSING));
if (stream->connect_req) {
uv__stream_connect(stream);
@ -2061,6 +2063,8 @@ static int uv__socket(int domain, int type, int protocol) {
static int uv__accept(int sockfd, struct sockaddr* saddr, socklen_t slen) {
int peerfd;
assert(sockfd >= 0);
do {
#if defined(SOCK_NONBLOCK) && defined(SOCK_CLOEXEC)
peerfd = accept4(sockfd, saddr, &slen, SOCK_NONBLOCK | SOCK_CLOEXEC);