From ebcae98ae65c26a0c210c802540bf027d07fe2f1 Mon Sep 17 00:00:00 2001 From: Joel Cunningham Date: Mon, 20 Nov 2017 13:54:11 -0600 Subject: [PATCH] Revert "socket/netconn recv: FIN should only be reported once (as '0' for sockets, as 'ERR_CLSD' for netconns)" This reverts commit db3a4e31586f8614b0a27b482406b0c212a4e08a. See description of regression in bug #52417 --- src/api/api_lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/api_lib.c b/src/api/api_lib.c index 2541f41e..e3172483 100644 --- a/src/api/api_lib.c +++ b/src/api/api_lib.c @@ -646,8 +646,8 @@ netconn_recv_data_tcp(struct netconn *conn, struct pbuf **new_buf, u8_t apiflags #endif /* LWIP_TCP */ if (!sys_mbox_valid(&conn->recvmbox)) { - /* This only happens when calling this function more than once *after* receiving FIN */ - return ERR_CONN; + /* This happens when calling this function after receiving FIN */ + return sys_mbox_valid(&conn->acceptmbox) ? ERR_CONN : ERR_CLSD; } if (!(apiflags & NETCONN_NOAUTORCVD)) {