mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-01-01 20:57:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

sockets.h, sockets.c: Implement MSG_PEEK flag for recv/recvfrom functions.

Browse Source
This commit is contained in:
fbernon 2007-06-30 13:24:11 +00:00
parent c91caa06d3
commit b6750de9e8
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -19,6 +19,9 @@ HISTORY
++ New features: ++ New features:
2007-06-30 Frédéric Bernon
* sockets.h, sockets.c: Implement MSG_PEEK flag for recv/recvfrom functions.
2007-06-21 Simon Goldschmidt 2007-06-21 Simon Goldschmidt
* etharp.h, etharp.c: Combined etharp_request with etharp_raw for both * etharp.h, etharp.c: Combined etharp_request with etharp_raw for both
LWIP_AUTOIP =0 and =1 to remove redundant code. LWIP_AUTOIP =0 and =1 to remove redundant code.

7
src/api/sockets.c
View File

@ -381,7 +381,6 @@ lwip_recvfrom(int s, void *mem, int len, unsigned int flags,
struct ip_addr *addr; struct ip_addr *addr;
u16_t port; u16_t port;
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d, %p, %d, 0x%x, ..)\n", s, mem, len, flags)); LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d, %p, %d, 0x%x, ..)\n", s, mem, len, flags));
sock = get_socket(s); sock = get_socket(s);
if (!sock) if (!sock)
@ -400,7 +399,7 @@ lwip_recvfrom(int s, void *mem, int len, unsigned int flags,
/* No data was left from the previous operation, so we try to get /* No data was left from the previous operation, so we try to get
some from the network. */ some from the network. */
buf = netconn_recv(sock->conn); sock->lastdata = buf = netconn_recv(sock->conn);
if (!buf) { if (!buf) {
/* We should really do some error checking here. */ /* We should really do some error checking here. */
@ -454,9 +453,10 @@ lwip_recvfrom(int s, void *mem, int len, unsigned int flags,
ip_addr_debug_print(SOCKETS_DEBUG, addr); ip_addr_debug_print(SOCKETS_DEBUG, addr);
LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%u len=%u\n", port, copylen)); LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%u len=%u\n", port, copylen));
#endif #endif
} }
/* If we don't peek the incoming message... */
if ((flags & MSG_PEEK)==0) {
/* If this is a TCP socket, check if there is data left in the /* If this is a TCP socket, check if there is data left in the
buffer. If so, it should be saved in the sock structure for next buffer. If so, it should be saved in the sock structure for next
time around. */ time around. */
@ -468,6 +468,7 @@ lwip_recvfrom(int s, void *mem, int len, unsigned int flags,
sock->lastoffset = 0; sock->lastoffset = 0;
netbuf_delete(buf); netbuf_delete(buf);
} }
}
sock_set_errno(sock, 0); sock_set_errno(sock, 0);
return copylen; return copylen;

5
src/include/lwip/sockets.h
View File

@ -125,7 +125,10 @@ struct linger {
#define INADDR_BROADCAST 0xffffffff #define INADDR_BROADCAST 0xffffffff
/* Flags we can use with send and recv. */ /* Flags we can use with send and recv. */
#define MSG_DONTWAIT 0x40 /* Nonblocking i/o for this operation only */ #define MSG_PEEK 0x01 /* Peeks at an incoming message */
#define MSG_WAITALL 0x02 /* Requests that the function block until the full amount of data requested can be returned */
#define MSG_OOB 0x04 /* Requests out-of-band data. The significance and semantics of out-of-band data are protocol-specific */
#define MSG_DONTWAIT 0x08 /* Nonblocking i/o for this operation only */
/* /*