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

halfclose_read should call before force_close

Browse Source
This commit is contained in:
Cloud Wu
2021-04-06 15:47:32 +08:00
parent ba26c8a432
commit 8ad6622936
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
skynet-src/socket_server.c
View File

@@ -1749,16 +1749,12 @@ socket_server_poll(struct socket_server *ss, struct socket_message * result, int
result->data = (char *)err;
return SOCKET_ERR;
}
if(e->eof) {
if (e->eof) {
// For epoll (at least), FIN packets are exchanged both ways.
// See: https://stackoverflow.com/questions/52976152/tcp-when-is-epollhup-generated
int r = halfclose_read(s) ? -1 : SOCKET_CLOSE;
force_close(ss, s, &l, result);
if (halfclose_read(s)) {
// Already rasied SOCKET_CLOSE
return -1;
} else {
return SOCKET_CLOSE;
}
return r;
}
break;
}