mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-30 15:15:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid to lost previous error codes in sockets.c and api_lib.c.

Browse Source
This commit is contained in:
fbernon 2007-09-13 15:03:42 +00:00
parent 8c847a85ae
commit 95f2d48ac4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/api_lib.c
View File

@ -424,6 +424,7 @@ netconn_recv(struct netconn *conn)
#if LWIP_SO_RCVTIMEO #if LWIP_SO_RCVTIMEO
if (sys_arch_mbox_fetch(conn->recvmbox, (void *)&p, conn->recv_timeout)==SYS_ARCH_TIMEOUT) { if (sys_arch_mbox_fetch(conn->recvmbox, (void *)&p, conn->recv_timeout)==SYS_ARCH_TIMEOUT) {
conn->err = ERR_TIMEOUT;
p = NULL; p = NULL;
} }
#else #else
@ -444,7 +445,10 @@ netconn_recv(struct netconn *conn)
/* If we are closed, we indicate that we no longer wish to use the socket */ /* If we are closed, we indicate that we no longer wish to use the socket */
if (p == NULL) { if (p == NULL) {
memp_free(MEMP_NETBUF, buf); memp_free(MEMP_NETBUF, buf);
/* Avoid to lost any previous error code */
if (conn->err == ERR_OK) {
conn->err = ERR_CLSD; conn->err = ERR_CLSD;
}
return NULL; return NULL;
} }

2
src/api/sockets.c
View File

@ -417,7 +417,7 @@ lwip_recvfrom(int s, void *mem, int len, unsigned int flags,
if (!buf) { if (!buf) {
/* We should really do some error checking here. */ /* We should really do some error checking here. */
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d): buf == NULL!\n", s)); LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d): buf == NULL!\n", s));
sock_set_errno(sock, (sock->conn->type==NETCONN_UDP)?ETIMEDOUT:0); sock_set_errno(sock, (((sock->conn->pcb.ip!=NULL) && (sock->conn->err==ERR_OK))?ETIMEDOUT:err_to_errno(sock->conn->err)));
return 0; return 0;
} }
} }