mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-07-07 13:29:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added function-like macro for struct netconn::non_blocking

Browse Source
This commit is contained in:
goldsimon 2010-01-29 22:21:45 +00:00
parent e58f4c567a
commit c70c3eac62
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/api/sockets.c
View File

@ -258,7 +258,7 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
if (!sock)
return -1;
if ((sock->conn->non_blocking) && (sock->rcvevent <= 0)) {
if (netconn_is_nonblocking(sock->conn) && (sock->rcvevent <= 0)) {
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d): returning EWOULDBLOCK\n", s));
sock_set_errno(sock, EWOULDBLOCK);
return -1;
@ -492,7 +492,7 @@ lwip_recvfrom(int s, void *mem, size_t len, int flags,
buf = sock->lastdata;
} else {
/* If this is non-blocking call, then check first */
if (((flags & MSG_DONTWAIT) || (sock->conn->non_blocking)) &&
if (((flags & MSG_DONTWAIT) || netconn_is_nonblocking(sock->conn)) &&
(sock->rcvevent <= 0)) {
if (off > 0) {
/* already received data, return that */
@ -1926,6 +1926,7 @@ lwip_ioctl(int s, long cmd, void *argp)
struct lwip_socket *sock = get_socket(s);
u16_t buflen = 0;
s16_t recv_avail;
u8_t val;
if (!sock)
return -1;
@ -1955,11 +1956,12 @@ lwip_ioctl(int s, long cmd, void *argp)
return 0;
case FIONBIO:
if (argp && *(u32_t*)argp)
sock->conn->non_blocking = 1;
else
sock->conn->non_blocking = 0;
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_ioctl(%d, FIONBIO, %d)\n", s, sock->conn->non_blocking));
val = 0;
if (argp && *(u32_t*)argp) {
val = 1;
}
netconn_set_nonblocking(sock->conn, val);
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_ioctl(%d, FIONBIO, %d)\n", s, val));
sock_set_errno(sock, 0);
return 0;

9
src/include/lwip/api.h
View File

@ -221,8 +221,13 @@ err_t netconn_join_leave_group(struct netconn *conn, struct ip_addr *multiaddr
err_t netconn_gethostbyname(const char *name, struct ip_addr *addr);
#endif /* LWIP_DNS */
#define netconn_err(conn) ((conn)->last_err)
#define netconn_recv_bufsize(conn) ((conn)->recv_bufsize)
#define netconn_err(conn) ((conn)->last_err)
#define netconn_recv_bufsize(conn) ((conn)->recv_bufsize)
/** Set the blocking status of netconn calls (@todo: write/send is missing) */
#define netconn_set_nonblocking(conn, val) ((conn)->non_blocking = (val))
/** Get the blocking status of netconn calls (@todo: write/send is missing) */
#define netconn_is_nonblocking(conn) ((conn)->non_blocking)
#ifdef __cplusplus
}