From 6a8ca29d99eda2a5d6d8848fef2d964024174113 Mon Sep 17 00:00:00 2001 From: Cloud Wu Date: Wed, 24 Feb 2021 11:54:47 +0800 Subject: [PATCH] set result for SOCKET_CLOSE, see #1347 --- skynet-src/socket_server.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/skynet-src/socket_server.c b/skynet-src/socket_server.c index 4df1daa1..07db9d8b 100644 --- a/skynet-src/socket_server.c +++ b/skynet-src/socket_server.c @@ -1103,6 +1103,10 @@ close_socket(struct socket_server *ss, struct request_close *request, struct soc s->closing = true; enable_read(ss,s,false); shutdown(s->fd, SHUT_RD); + result->id = s->id; + result->ud = 0; + result->data = NULL; + result->opaque = s->opaque; } return SOCKET_CLOSE; } @@ -1436,6 +1440,11 @@ forward_message_tcp(struct socket_server *ss, struct socket *s, struct socket_lo if (n==0) { if (nomore_sending_data(s)) { force_close(ss,s,l,result); + } else { + result->opaque = s->opaque; + result->id = s->id; + result->ud = 0; + result->data = NULL; } if (s->closing) { // Already returned SOCKET_CLOSE