ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10807 from kjbracey-arm/lwip_tcp_pbuf 

NSAPI/lwIP: Use netconn_recv_tcp_pbuf
pull/10869/head
Anna Bridge 2019-06-19 14:57:18 +01:00 committed by GitHub
parent 4bd1d15d01 3b178a08ef
commit 5b0f45f685
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
features/lwipstack/LWIPStack.cpp
View File

@ -341,7 +341,7 @@ nsapi_error_t LWIP::socket_close(nsapi_socket_t handle)
_event_flag.wait_any(TCP_CLOSED_FLAG, TCP_CLOSE_TIMEOUT);
}
#endif
netbuf_delete(s->buf);
pbuf_free(s->buf);
err_t err = netconn_delete(s->conn);
arena_dealloc(s);
return err_remap(err);
@ -465,7 +465,7 @@ nsapi_size_or_error_t LWIP::socket_recv(nsapi_socket_t handle, void *data, nsapi
struct mbed_lwip_socket *s = (struct mbed_lwip_socket *)handle;
if (!s->buf) {
err_t err = netconn_recv(s->conn, &s->buf);
err_t err = netconn_recv_tcp_pbuf(s->conn, &s->buf);
s->offset = 0;
if (err != ERR_OK) {
@ -473,11 +473,11 @@ nsapi_size_or_error_t LWIP::socket_recv(nsapi_socket_t handle, void *data, nsapi
}
}
u16_t recv = netbuf_copy_partial(s->buf, data, (u16_t)size, s->offset);
u16_t recv = pbuf_copy_partial(s->buf, data, (u16_t)size, s->offset);
s->offset += recv;
if (s->offset >= netbuf_len(s->buf)) {
netbuf_delete(s->buf);
if (s->offset >= s->buf->tot_len) {
pbuf_free(s->buf);
s->buf = 0;
}

2
features/lwipstack/LWIPStack.h
View File

@ -526,7 +526,7 @@ private:
bool in_use;
struct netconn *conn;
struct netbuf *buf;
struct pbuf *buf;
u16_t offset;
void (*cb)(void *);