lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 12:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: disable fd reading flag after shutdown read

Browse Source
This commit is contained in:
Cloud Wu
2021-02-22 09:41:59 +08:00
parent 6d941a6de1
commit 51a942d095
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
skynet-src/socket_server.c
View File

@@ -1141,6 +1141,8 @@ resume_socket(struct socket_server *ss, struct request_resumepause *request, str
result->data = "invalid socket"; result->data = "invalid socket";
return SOCKET_ERR; return SOCKET_ERR;
} }
if (s->closing)
return -1;
struct socket_lock l; struct socket_lock l;
socket_lock_init(s, &l); socket_lock_init(s, &l);
if (enable_read(ss, s, true)) { if (enable_read(ss, s, true)) {
@@ -1387,12 +1389,16 @@ forward_message_tcp(struct socket_server *ss, struct socket *s, struct socket_lo
force_close(ss,s,l,result); force_close(ss,s,l,result);
} else { } else {
ATOM_STORE(&s->type , SOCKET_TYPE_HALFCLOSE_READ); ATOM_STORE(&s->type , SOCKET_TYPE_HALFCLOSE_READ);
if (!s->closing) {
shutdown(s->fd, SHUT_RD); shutdown(s->fd, SHUT_RD);
s->closing = true;
}
enable_read(ss, s, false);
} }
return SOCKET_CLOSE; return SOCKET_CLOSE;
} }
if (ATOM_LOAD(&s->type) == SOCKET_TYPE_HALFCLOSE_READ) { if (s->closing) {
// discard recv data // discard recv data
FREE(buffer); FREE(buffer);
return -1; return -1;