mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-11-18 20:10:53 +00:00
Minor fix (spaces, indent) and check for LWIP_SO_RCVTIMEO..
This commit is contained in:
parent
2ff620e1b5
commit
d1ef610822
@ -490,17 +490,16 @@ netconn_recv(struct netconn *conn)
|
|||||||
|
|
||||||
sys_arch_mbox_fetch(conn->recvmbox, (void *)&p, 0);
|
sys_arch_mbox_fetch(conn->recvmbox, (void *)&p, 0);
|
||||||
|
|
||||||
if (p != NULL)
|
if (p != NULL) {
|
||||||
{
|
len = p->tot_len;
|
||||||
len = p->tot_len;
|
conn->recv_avail -= len;
|
||||||
conn->recv_avail -= len;
|
} else {
|
||||||
|
len = 0;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
len = 0;
|
|
||||||
|
|
||||||
/* Register event with callback */
|
/* Register event with callback */
|
||||||
if (conn->callback)
|
if (conn->callback)
|
||||||
(*conn->callback)(conn, NETCONN_EVT_RCVMINUS, len);
|
(*conn->callback)(conn, NETCONN_EVT_RCVMINUS, len);
|
||||||
|
|
||||||
/* If we are closed, we indicate that we no longer wish to receive
|
/* If we are closed, we indicate that we no longer wish to receive
|
||||||
data by setting conn->recvmbox to SYS_MBOX_NULL. */
|
data by setting conn->recvmbox to SYS_MBOX_NULL. */
|
||||||
@ -529,16 +528,18 @@ netconn_recv(struct netconn *conn)
|
|||||||
} else {
|
} else {
|
||||||
#if (LWIP_UDP || LWIP_RAW)
|
#if (LWIP_UDP || LWIP_RAW)
|
||||||
#if LWIP_SO_RCVTIMEO
|
#if LWIP_SO_RCVTIMEO
|
||||||
sys_arch_mbox_fetch(conn->recvmbox, (void *)&buf, conn->recv_timeout);
|
if (sys_arch_mbox_fetch(conn->recvmbox, (void *)&buf, conn->recv_timeout)==SYS_ARCH_TIMEOUT) {
|
||||||
|
buf = NULL;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
sys_arch_mbox_fetch(conn->recvmbox, (void *)&buf, 0);
|
sys_arch_mbox_fetch(conn->recvmbox, (void *)&buf, 0);
|
||||||
#endif /* LWIP_SO_RCVTIMEO*/
|
#endif /* LWIP_SO_RCVTIMEO*/
|
||||||
if (buf!=NULL)
|
if (buf!=NULL) {
|
||||||
{ conn->recv_avail -= buf->p->tot_len;
|
conn->recv_avail -= buf->p->tot_len;
|
||||||
/* Register event with callback */
|
/* Register event with callback */
|
||||||
if (conn->callback)
|
if (conn->callback)
|
||||||
(*conn->callback)(conn, NETCONN_EVT_RCVMINUS, buf->p->tot_len);
|
(*conn->callback)(conn, NETCONN_EVT_RCVMINUS, buf->p->tot_len);
|
||||||
}
|
}
|
||||||
#endif /* (LWIP_UDP || LWIP_RAW) */
|
#endif /* (LWIP_UDP || LWIP_RAW) */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user