abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-04 13:34:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #49914: lwip_sendmsg uses PBUF_REF pbufs

Browse Source 
Use PBUF_RAM and create private copy of the data
This commit is contained in:
Dirk Ziegelmeier 2016-12-22 21:19:53 +01:00
parent 3a557baedd
commit 4e34851c57
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/api/sockets.c
View File

@ -181,7 +181,7 @@ static void sockaddr_to_ipaddr_port(const struct sockaddr* sockaddr, ip_addr_t*
#else #else
#define LWIP_SO_SNDRCVTIMEO_OPTTYPE struct timeval #define LWIP_SO_SNDRCVTIMEO_OPTTYPE struct timeval
#define LWIP_SO_SNDRCVTIMEO_SET(optval, val) do { \ #define LWIP_SO_SNDRCVTIMEO_SET(optval, val) do { \
s32_t loc = (val); \ u32_t loc = (u32_t)(val); \
((struct timeval *)(optval))->tv_sec = (loc) / 1000U; \ ((struct timeval *)(optval))->tv_sec = (loc) / 1000U; \
((struct timeval *)(optval))->tv_usec = ((loc) % 1000U) * 1000U; }while(0) ((struct timeval *)(optval))->tv_usec = ((loc) % 1000U) * 1000U; }while(0)
#define LWIP_SO_SNDRCVTIMEO_GET_MS(optval) ((((const struct timeval *)(optval))->tv_sec * 1000U) + (((const struct timeval *)(optval))->tv_usec / 1000U)) #define LWIP_SO_SNDRCVTIMEO_GET_MS(optval) ((((const struct timeval *)(optval))->tv_sec * 1000U) + (((const struct timeval *)(optval))->tv_usec / 1000U))
@ -1068,14 +1068,15 @@ lwip_sendmsg(int s, const struct msghdr *msg, int flags)
/* create a chained netbuf from the IO vectors. NOTE: we assemble a pbuf chain /* create a chained netbuf from the IO vectors. NOTE: we assemble a pbuf chain
manually to avoid having to allocate, chain, and delete a netbuf for each iov */ manually to avoid having to allocate, chain, and delete a netbuf for each iov */
for (i = 0; i < msg->msg_iovlen; i++) { for (i = 0; i < msg->msg_iovlen; i++) {
struct pbuf *p = pbuf_alloc(PBUF_TRANSPORT, 0, PBUF_REF); struct pbuf *p;
LWIP_ASSERT("iov_len < u16_t", msg->msg_iov[i].iov_len <= 0xFFFF);
p = pbuf_alloc(PBUF_TRANSPORT, msg->msg_iov[i].iov_len, PBUF_RAM);
if (p == NULL) { if (p == NULL) {
err = ERR_MEM; /* let netbuf_delete() cleanup chain_buf */ err = ERR_MEM; /* let netbuf_delete() cleanup chain_buf */
break; break;
} }
p->payload = msg->msg_iov[i].iov_base; pbuf_take(p, msg->msg_iov[i].iov_base, (u16_t)msg->msg_iov[i].iov_len);
LWIP_ASSERT("iov_len < u16_t", msg->msg_iov[i].iov_len <= 0xFFFF);
p->len = p->tot_len = (u16_t)msg->msg_iov[i].iov_len;
/* netbuf empty, add new pbuf */ /* netbuf empty, add new pbuf */
if (chain_buf->p == NULL) { if (chain_buf->p == NULL) {
chain_buf->p = chain_buf->ptr = p; chain_buf->p = chain_buf->ptr = p;
@ -1467,7 +1468,7 @@ lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
/* Wait forever */ /* Wait forever */
msectimeout = 0; msectimeout = 0;
} else { } else {
msectimeout = ((timeout->tv_sec * 1000) + ((timeout->tv_usec + 500)/1000)); msectimeout = (u32_t)((timeout->tv_sec * 1000) + ((timeout->tv_usec + 500)/1000));
if (msectimeout == 0) { if (msectimeout == 0) {
/* Wait 1ms at least (0 means wait forever) */ /* Wait 1ms at least (0 means wait forever) */
msectimeout = 1; msectimeout = 1;