abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-05-23 08:37:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #20429: use the new pbuf_copy_partial instead of the old copy_from_pbuf, which illegally modified the given pbuf; Introduced pbuf_copy_partial, making netbuf_copy_partial use this function.

Browse Source
This commit is contained in:
goldsimon
2007-07-25 18:53:45 +00:00
parent 8be76ed450
commit f9c30017b0
6 changed files with 60 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/api/api_lib.c
View File

@@ -234,50 +234,6 @@ netbuf_first(struct netbuf *buf)
buf->ptr = buf->p;
}
/**
* Copy (part of) the contents of a packet buffer contained in a netbuf
* to an application supplied buffer.
*
* @param buf the netbuf from which to copy data
* @param dataptr the application supplied buffer
* @param len length of data to copy (dataptr must be big enough)
* @param offset offset into the packet buffer from where to begin copying len bytes
*/
void
netbuf_copy_partial(struct netbuf *buf, void *dataptr, u16_t len, u16_t offset)
{
struct pbuf *p;
u16_t left;
u16_t buf_copy_len;
LWIP_ERROR("netbuf_copy_partial: invalid buf", (buf != NULL), return;);
LWIP_ERROR("netbuf_copy_partial: invalid dataptr", (dataptr != NULL), return;);
left = 0;
if(buf == NULL || dataptr == NULL) {
return;
}
/* Note some systems use byte copy if dataptr or one of the pbuf payload pointers are unaligned. */
for(p = buf->p; len != 0 && p != NULL; p = p->next) {
if ((offset != 0) && (offset >= p->len)) {
/* don't copy from this buffer -> on to the next */
offset -= p->len;
} else {
/* copy from this buffer. maybe only partially. */
buf_copy_len = p->len - offset;
if (buf_copy_len > len)
buf_copy_len = len;
/* copy the necessary parts of the buffer */
MEMCPY(&((char*)dataptr)[left], &((char*)p->payload)[offset], buf_copy_len);
left += buf_copy_len;
len -= buf_copy_len;
offset = 0;
}
}
}
/**
**********************************
* Netconn functions