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

bugfix: switch reading status

Browse Source
This commit is contained in:
Cloud Wu
2020-08-10 16:35:55 +08:00
parent a4dc6b9094
commit 51fd63213e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
skynet-src/socket_server.c
View File

@@ -544,7 +544,7 @@ new_fd(struct socket_server *ss, int id, int fd, int protocol, uintptr_t opaque,
s->id = id; s->id = id;
s->fd = fd; s->fd = fd;
s->reading = READING_PAUSE; s->reading = add ? READING_RESUME : READING_PAUSE;
s->sending = ID_TAG16(id) << 16 | 0; s->sending = ID_TAG16(id) << 16 | 0;
s->protocol = protocol; s->protocol = protocol;
s->p.size = MIN_READ_BUFFER; s->p.size = MIN_READ_BUFFER;
@@ -1068,11 +1068,11 @@ resume_socket(struct socket_server *ss, struct request_resumepause *request, str
socket_lock_init(s, &l); socket_lock_init(s, &l);
if (s->reading == READING_PAUSE) { if (s->reading == READING_PAUSE) {
if (sp_add(ss->event_fd, s->fd, s)) { if (sp_add(ss->event_fd, s->fd, s)) {
s->reading = READING_RESUME;
force_close(ss, s, &l, result); force_close(ss, s, &l, result);
result->data = strerror(errno); result->data = strerror(errno);
return SOCKET_ERR; return SOCKET_ERR;
} }
s->reading = READING_RESUME;
} }
if (s->type == SOCKET_TYPE_PACCEPT || s->type == SOCKET_TYPE_PLISTEN) { if (s->type == SOCKET_TYPE_PACCEPT || s->type == SOCKET_TYPE_PLISTEN) {
s->type = (s->type == SOCKET_TYPE_PACCEPT) ? SOCKET_TYPE_CONNECTED : SOCKET_TYPE_LISTEN; s->type = (s->type == SOCKET_TYPE_PACCEPT) ? SOCKET_TYPE_CONNECTED : SOCKET_TYPE_LISTEN;