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

netconn API: Remove api_msg wrapper struct, it is not needed any more

Browse Source
This commit is contained in:
Dirk Ziegelmeier 2016-03-16 21:31:19 +01:00
parent 2575c7fb5f
commit d38cdccbcd
5 changed files with 63 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/api/api_lib.c
View File

@ -77,15 +77,15 @@ tcpip_apimsg(tcpip_callback_fn fn, struct api_msg *apimsg)
{ {
#ifdef LWIP_DEBUG #ifdef LWIP_DEBUG
/* catch functions that don't set err */ /* catch functions that don't set err */
apimsg->msg.err = ERR_VAL; apimsg->err = ERR_VAL;
#endif /* LWIP_DEBUG */ #endif /* LWIP_DEBUG */
#if LWIP_NETCONN_SEM_PER_THREAD #if LWIP_NETCONN_SEM_PER_THREAD
apimsg->msg.op_completed_sem = LWIP_NETCONN_THREAD_SEM_GET(); apimsg->op_completed_sem = LWIP_NETCONN_THREAD_SEM_GET();
#endif /* LWIP_NETCONN_SEM_PER_THREAD */ #endif /* LWIP_NETCONN_SEM_PER_THREAD */
if (tcpip_send_api_msg(fn, &apimsg->msg, LWIP_API_MSG_SEM(&apimsg->msg)) == ERR_OK) { if (tcpip_send_api_msg(fn, apimsg, LWIP_API_MSG_SEM(apimsg)) == ERR_OK) {
return apimsg->msg.err; return apimsg->err;
} }
return ERR_VAL; return ERR_VAL;
} }
@ -110,8 +110,8 @@ netconn_new_with_proto_and_callback(enum netconn_type t, u8_t proto, netconn_cal
if (conn != NULL) { if (conn != NULL) {
err_t err; err_t err;
API_MSG_VAR_ALLOC_DONTFAIL(msg); API_MSG_VAR_ALLOC_DONTFAIL(msg);
API_MSG_VAR_REF(msg).msg.msg.n.proto = proto; API_MSG_VAR_REF(msg).msg.n.proto = proto;
API_MSG_VAR_REF(msg).msg.conn = conn; API_MSG_VAR_REF(msg).conn = conn;
err = tcpip_apimsg(lwip_netconn_do_newconn, &API_MSG_VAR_REF(msg)); err = tcpip_apimsg(lwip_netconn_do_newconn, &API_MSG_VAR_REF(msg));
API_MSG_VAR_FREE(msg); API_MSG_VAR_FREE(msg);
if (err != ERR_OK) { if (err != ERR_OK) {
@ -152,14 +152,14 @@ netconn_delete(struct netconn *conn)
} }
API_MSG_VAR_ALLOC(msg); API_MSG_VAR_ALLOC(msg);
API_MSG_VAR_REF(msg).msg.conn = conn; API_MSG_VAR_REF(msg).conn = conn;
#if LWIP_SO_SNDTIMEO || LWIP_SO_LINGER #if LWIP_SO_SNDTIMEO || LWIP_SO_LINGER
/* get the time we started, which is later compared to /* get the time we started, which is later compared to
sys_now() + conn->send_timeout */ sys_now() + conn->send_timeout */
API_MSG_VAR_REF(msg).msg.msg.sd.time_started = sys_now(); API_MSG_VAR_REF(msg).msg.sd.time_started = sys_now();
#else /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */ #else /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */
#if LWIP_TCP #if LWIP_TCP
API_MSG_VAR_REF(msg).msg.msg.sd.polls_left = API_MSG_VAR_REF(msg).msg.sd.polls_left =
((LWIP_TCP_CLOSE_TIMEOUT_MS_DEFAULT + TCP_SLOW_INTERVAL - 1) / TCP_SLOW_INTERVAL) + 1; ((LWIP_TCP_CLOSE_TIMEOUT_MS_DEFAULT + TCP_SLOW_INTERVAL - 1) / TCP_SLOW_INTERVAL) + 1;
#endif /* LWIP_TCP */ #endif /* LWIP_TCP */
#endif /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */ #endif /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */
@ -197,15 +197,15 @@ netconn_getaddr(struct netconn *conn, ip_addr_t *addr, u16_t *port, u8_t local)
LWIP_ERROR("netconn_getaddr: invalid port", (port != NULL), return ERR_ARG;); LWIP_ERROR("netconn_getaddr: invalid port", (port != NULL), return ERR_ARG;);
API_MSG_VAR_ALLOC(msg); API_MSG_VAR_ALLOC(msg);
API_MSG_VAR_REF(msg).msg.conn = conn; API_MSG_VAR_REF(msg).conn = conn;
API_MSG_VAR_REF(msg).msg.msg.ad.local = local; API_MSG_VAR_REF(msg).msg.ad.local = local;
#if LWIP_MPU_COMPATIBLE #if LWIP_MPU_COMPATIBLE
TCPIP_APIMSG(msg, lwip_netconn_do_getaddr, err); TCPIP_APIMSG(msg, lwip_netconn_do_getaddr, err);
*addr = msg->msg.msg.ad.ipaddr; *addr = msg->msg.ad.ipaddr;
*port = msg->msg.msg.ad.port; *port = msg->msg.ad.port;
#else /* LWIP_MPU_COMPATIBLE */ #else /* LWIP_MPU_COMPATIBLE */
msg.msg.msg.ad.ipaddr = addr; msg.msg.ad.ipaddr = addr;
msg.msg.msg.ad.port = port; msg.msg.ad.port = port;
err = tcpip_apimsg(lwip_netconn_do_getaddr, &msg); err = tcpip_apimsg(lwip_netconn_do_getaddr, &msg);
#endif /* LWIP_MPU_COMPATIBLE */ #endif /* LWIP_MPU_COMPATIBLE */
API_MSG_VAR_FREE(msg); API_MSG_VAR_FREE(msg);
@ -237,9 +237,9 @@ netconn_bind(struct netconn *conn, const ip_addr_t *addr, u16_t port)
} }
API_MSG_VAR_ALLOC(msg); API_MSG_VAR_ALLOC(msg);
API_MSG_VAR_REF(msg).msg.conn = conn; API_MSG_VAR_REF(msg).conn = conn;
API_MSG_VAR_REF(msg).msg.msg.bc.ipaddr = API_MSG_VAR_REF(addr); API_MSG_VAR_REF(msg).msg.bc.ipaddr = API_MSG_VAR_REF(addr);
API_MSG_VAR_REF(msg).msg.msg.bc.port = port; API_MSG_VAR_REF(msg).msg.bc.port = port;
err = tcpip_apimsg(lwip_netconn_do_bind, &API_MSG_VAR_REF(msg)); err = tcpip_apimsg(lwip_netconn_do_bind, &API_MSG_VAR_REF(msg));
API_MSG_VAR_FREE(msg); API_MSG_VAR_FREE(msg);
@ -268,9 +268,9 @@ netconn_connect(struct netconn *conn, const ip_addr_t *addr, u16_t port)
} }
API_MSG_VAR_ALLOC(msg); API_MSG_VAR_ALLOC(msg);
API_MSG_VAR_REF(msg).msg.conn = conn; API_MSG_VAR_REF(msg).conn = conn;
API_MSG_VAR_REF(msg).msg.msg.bc.ipaddr = API_MSG_VAR_REF(addr); API_MSG_VAR_REF(msg).msg.bc.ipaddr = API_MSG_VAR_REF(addr);
API_MSG_VAR_REF(msg).msg.msg.bc.port = port; API_MSG_VAR_REF(msg).msg.bc.port = port;
err = tcpip_apimsg(lwip_netconn_do_connect, &API_MSG_VAR_REF(msg)); err = tcpip_apimsg(lwip_netconn_do_connect, &API_MSG_VAR_REF(msg));
API_MSG_VAR_FREE(msg); API_MSG_VAR_FREE(msg);
@ -292,7 +292,7 @@ netconn_disconnect(struct netconn *conn)
LWIP_ERROR("netconn_disconnect: invalid conn", (conn != NULL), return ERR_ARG;); LWIP_ERROR("netconn_disconnect: invalid conn", (conn != NULL), return ERR_ARG;);
API_MSG_VAR_ALLOC(msg); API_MSG_VAR_ALLOC(msg);
API_MSG_VAR_REF(msg).msg.conn = conn; API_MSG_VAR_REF(msg).conn = conn;
err = tcpip_apimsg(lwip_netconn_do_disconnect, &API_MSG_VAR_REF(msg)); err = tcpip_apimsg(lwip_netconn_do_disconnect, &API_MSG_VAR_REF(msg));
API_MSG_VAR_FREE(msg); API_MSG_VAR_FREE(msg);
@ -320,9 +320,9 @@ netconn_listen_with_backlog(struct netconn *conn, u8_t backlog)
LWIP_ERROR("netconn_listen: invalid conn", (conn != NULL), return ERR_ARG;); LWIP_ERROR("netconn_listen: invalid conn", (conn != NULL), return ERR_ARG;);
API_MSG_VAR_ALLOC(msg); API_MSG_VAR_ALLOC(msg);
API_MSG_VAR_REF(msg).msg.conn = conn; API_MSG_VAR_REF(msg).conn = conn;
#if TCP_LISTEN_BACKLOG #if TCP_LISTEN_BACKLOG
API_MSG_VAR_REF(msg).msg.msg.lb.backlog = backlog; API_MSG_VAR_REF(msg).msg.lb.backlog = backlog;
#endif /* TCP_LISTEN_BACKLOG */ #endif /* TCP_LISTEN_BACKLOG */
err = tcpip_apimsg(lwip_netconn_do_listen, &API_MSG_VAR_REF(msg)); err = tcpip_apimsg(lwip_netconn_do_listen, &API_MSG_VAR_REF(msg));
API_MSG_VAR_FREE(msg); API_MSG_VAR_FREE(msg);
@ -386,7 +386,7 @@ netconn_accept(struct netconn *conn, struct netconn **new_conn)
#if TCP_LISTEN_BACKLOG #if TCP_LISTEN_BACKLOG
/* Let the stack know that we have accepted the connection. */ /* Let the stack know that we have accepted the connection. */
API_MSG_VAR_ALLOC_DONTFAIL(msg); API_MSG_VAR_ALLOC_DONTFAIL(msg);
API_MSG_VAR_REF(msg).msg.conn = conn; API_MSG_VAR_REF(msg).conn = conn;
/* don't care for the return value of lwip_netconn_do_recv */ /* don't care for the return value of lwip_netconn_do_recv */
tcpip_apimsg(lwip_netconn_do_recv, &API_MSG_VAR_REF(msg)); tcpip_apimsg(lwip_netconn_do_recv, &API_MSG_VAR_REF(msg));
API_MSG_VAR_FREE(msg); API_MSG_VAR_FREE(msg);
@ -464,11 +464,11 @@ netconn_recv_data(struct netconn *conn, void **new_buf)
/* TODO: Speedup: Don't block and wait for the answer here /* TODO: Speedup: Don't block and wait for the answer here
(to prevent multiple thread-switches). */ (to prevent multiple thread-switches). */
API_MSG_VAR_ALLOC_DONTFAIL(msg); API_MSG_VAR_ALLOC_DONTFAIL(msg);
API_MSG_VAR_REF(msg).msg.conn = conn; API_MSG_VAR_REF(msg).conn = conn;
if (buf != NULL) { if (buf != NULL) {
API_MSG_VAR_REF(msg).msg.msg.r.len = ((struct pbuf *)buf)->tot_len; API_MSG_VAR_REF(msg).msg.r.len = ((struct pbuf *)buf)->tot_len;
} else { } else {
API_MSG_VAR_REF(msg).msg.msg.r.len = 1; API_MSG_VAR_REF(msg).msg.r.len = 1;
} }
/* don't care for the return value of lwip_netconn_do_recv */ /* don't care for the return value of lwip_netconn_do_recv */
tcpip_apimsg(lwip_netconn_do_recv, &API_MSG_VAR_REF(msg)); tcpip_apimsg(lwip_netconn_do_recv, &API_MSG_VAR_REF(msg));
@ -607,8 +607,8 @@ netconn_recved(struct netconn *conn, u32_t length)
/* TODO: Speedup: Don't block and wait for the answer here /* TODO: Speedup: Don't block and wait for the answer here
(to prevent multiple thread-switches). */ (to prevent multiple thread-switches). */
API_MSG_VAR_ALLOC_DONTFAIL(msg); API_MSG_VAR_ALLOC_DONTFAIL(msg);
API_MSG_VAR_REF(msg).msg.conn = conn; API_MSG_VAR_REF(msg).conn = conn;
API_MSG_VAR_REF(msg).msg.msg.r.len = length; API_MSG_VAR_REF(msg).msg.r.len = length;
/* don't care for the return value of lwip_netconn_do_recv */ /* don't care for the return value of lwip_netconn_do_recv */
tcpip_apimsg(lwip_netconn_do_recv, &API_MSG_VAR_REF(msg)); tcpip_apimsg(lwip_netconn_do_recv, &API_MSG_VAR_REF(msg));
API_MSG_VAR_FREE(msg); API_MSG_VAR_FREE(msg);
@ -657,8 +657,8 @@ netconn_send(struct netconn *conn, struct netbuf *buf)
LWIP_DEBUGF(API_LIB_DEBUG, ("netconn_send: sending %"U16_F" bytes\n", buf->p->tot_len)); LWIP_DEBUGF(API_LIB_DEBUG, ("netconn_send: sending %"U16_F" bytes\n", buf->p->tot_len));
API_MSG_VAR_ALLOC(msg); API_MSG_VAR_ALLOC(msg);
API_MSG_VAR_REF(msg).msg.conn = conn; API_MSG_VAR_REF(msg).conn = conn;
API_MSG_VAR_REF(msg).msg.msg.b = buf; API_MSG_VAR_REF(msg).msg.b = buf;
err = tcpip_apimsg(lwip_netconn_do_send, &API_MSG_VAR_REF(msg)); err = tcpip_apimsg(lwip_netconn_do_send, &API_MSG_VAR_REF(msg));
API_MSG_VAR_FREE(msg); API_MSG_VAR_FREE(msg);
@ -700,10 +700,10 @@ netconn_write_partly(struct netconn *conn, const void *dataptr, size_t size,
API_MSG_VAR_ALLOC(msg); API_MSG_VAR_ALLOC(msg);
/* non-blocking write sends as much */ /* non-blocking write sends as much */
API_MSG_VAR_REF(msg).msg.conn = conn; API_MSG_VAR_REF(msg).conn = conn;
API_MSG_VAR_REF(msg).msg.msg.w.dataptr = dataptr; API_MSG_VAR_REF(msg).msg.w.dataptr = dataptr;
API_MSG_VAR_REF(msg).msg.msg.w.apiflags = apiflags; API_MSG_VAR_REF(msg).msg.w.apiflags = apiflags;
API_MSG_VAR_REF(msg).msg.msg.w.len = size; API_MSG_VAR_REF(msg).msg.w.len = size;
#if LWIP_SO_SNDTIMEO #if LWIP_SO_SNDTIMEO
if (conn->send_timeout != 0) { if (conn->send_timeout != 0) {
/* get the time we started, which is later compared to /* get the time we started, which is later compared to
@ -725,7 +725,7 @@ netconn_write_partly(struct netconn *conn, const void *dataptr, size_t size,
#endif /* LWIP_SO_SNDTIMEO */ #endif /* LWIP_SO_SNDTIMEO */
) { ) {
/* nonblocking write: maybe the data has been sent partly */ /* nonblocking write: maybe the data has been sent partly */
*bytes_written = API_MSG_VAR_REF(msg).msg.msg.w.len; *bytes_written = API_MSG_VAR_REF(msg).msg.w.len;
} else { } else {
/* blocking call succeeded: all data has been sent if it */ /* blocking call succeeded: all data has been sent if it */
*bytes_written = size; *bytes_written = size;
@ -753,16 +753,16 @@ netconn_close_shutdown(struct netconn *conn, u8_t how)
LWIP_ERROR("netconn_close: invalid conn", (conn != NULL), return ERR_ARG;); LWIP_ERROR("netconn_close: invalid conn", (conn != NULL), return ERR_ARG;);
API_MSG_VAR_ALLOC(msg); API_MSG_VAR_ALLOC(msg);
API_MSG_VAR_REF(msg).msg.conn = conn; API_MSG_VAR_REF(msg).conn = conn;
#if LWIP_TCP #if LWIP_TCP
/* shutting down both ends is the same as closing */ /* shutting down both ends is the same as closing */
API_MSG_VAR_REF(msg).msg.msg.sd.shut = how; API_MSG_VAR_REF(msg).msg.sd.shut = how;
#if LWIP_SO_SNDTIMEO || LWIP_SO_LINGER #if LWIP_SO_SNDTIMEO || LWIP_SO_LINGER
/* get the time we started, which is later compared to /* get the time we started, which is later compared to
sys_now() + conn->send_timeout */ sys_now() + conn->send_timeout */
API_MSG_VAR_REF(msg).msg.msg.sd.time_started = sys_now(); API_MSG_VAR_REF(msg).msg.sd.time_started = sys_now();
#else /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */ #else /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */
API_MSG_VAR_REF(msg).msg.msg.sd.polls_left = API_MSG_VAR_REF(msg).msg.sd.polls_left =
((LWIP_TCP_CLOSE_TIMEOUT_MS_DEFAULT + TCP_SLOW_INTERVAL - 1) / TCP_SLOW_INTERVAL) + 1; ((LWIP_TCP_CLOSE_TIMEOUT_MS_DEFAULT + TCP_SLOW_INTERVAL - 1) / TCP_SLOW_INTERVAL) + 1;
#endif /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */ #endif /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */
#endif /* LWIP_TCP */ #endif /* LWIP_TCP */
@ -829,10 +829,10 @@ netconn_join_leave_group(struct netconn *conn,
netif_addr = IP_ADDR_ANY; netif_addr = IP_ADDR_ANY;
} }
API_MSG_VAR_REF(msg).msg.conn = conn; API_MSG_VAR_REF(msg).conn = conn;
API_MSG_VAR_REF(msg).msg.msg.jl.multiaddr = API_MSG_VAR_REF(multiaddr); API_MSG_VAR_REF(msg).msg.jl.multiaddr = API_MSG_VAR_REF(multiaddr);
API_MSG_VAR_REF(msg).msg.msg.jl.netif_addr = API_MSG_VAR_REF(netif_addr); API_MSG_VAR_REF(msg).msg.jl.netif_addr = API_MSG_VAR_REF(netif_addr);
API_MSG_VAR_REF(msg).msg.msg.jl.join_or_leave = join_or_leave; API_MSG_VAR_REF(msg).msg.jl.join_or_leave = join_or_leave;
err = tcpip_apimsg(lwip_netconn_do_join_leave_group, &API_MSG_VAR_REF(msg)); err = tcpip_apimsg(lwip_netconn_do_join_leave_group, &API_MSG_VAR_REF(msg));
API_MSG_VAR_FREE(msg); API_MSG_VAR_FREE(msg);

26
src/api/api_msg.c
View File

@ -513,7 +513,7 @@ accept_function(void *arg, struct tcp_pcb *newpcb, err_t err)
* @return msg->conn->err, but the return value is currently ignored * @return msg->conn->err, but the return value is currently ignored
*/ */
static void static void
pcb_new(struct api_msg_msg *msg) pcb_new(struct api_msg *msg)
{ {
LWIP_ASSERT("pcb_new: pcb already allocated", msg->conn->pcb.tcp == NULL); LWIP_ASSERT("pcb_new: pcb already allocated", msg->conn->pcb.tcp == NULL);
@ -579,7 +579,7 @@ pcb_new(struct api_msg_msg *msg)
void void
lwip_netconn_do_newconn(void *m) lwip_netconn_do_newconn(void *m)
{ {
struct api_msg_msg *msg = (struct api_msg_msg*)m; struct api_msg *msg = (struct api_msg*)m;
msg->err = ERR_OK; msg->err = ERR_OK;
if (msg->conn->pcb.tcp == NULL) { if (msg->conn->pcb.tcp == NULL) {
@ -983,7 +983,7 @@ lwip_netconn_do_close_internal(struct netconn *conn WRITE_DELAYED_PARAM)
void void
lwip_netconn_do_delconn(void *m) lwip_netconn_do_delconn(void *m)
{ {
struct api_msg_msg *msg = (struct api_msg_msg*)m; struct api_msg *msg = (struct api_msg*)m;
enum netconn_state state = msg->conn->state; enum netconn_state state = msg->conn->state;
LWIP_ASSERT("netconn state error", /* this only happens for TCP netconns */ LWIP_ASSERT("netconn state error", /* this only happens for TCP netconns */
@ -1085,7 +1085,7 @@ lwip_netconn_do_delconn(void *m)
void void
lwip_netconn_do_bind(void *m) lwip_netconn_do_bind(void *m)
{ {
struct api_msg_msg *msg = (struct api_msg_msg*)m; struct api_msg *msg = (struct api_msg*)m;
if (ERR_IS_FATAL(msg->conn->last_err)) { if (ERR_IS_FATAL(msg->conn->last_err)) {
msg->err = msg->conn->last_err; msg->err = msg->conn->last_err;
@ -1193,7 +1193,7 @@ lwip_netconn_do_connected(void *arg, struct tcp_pcb *pcb, err_t err)
void void
lwip_netconn_do_connect(void *m) lwip_netconn_do_connect(void *m)
{ {
struct api_msg_msg *msg = (struct api_msg_msg*)m; struct api_msg *msg = (struct api_msg*)m;
if (msg->conn->pcb.tcp == NULL) { if (msg->conn->pcb.tcp == NULL) {
/* This may happen when calling netconn_connect() a second time */ /* This may happen when calling netconn_connect() a second time */
@ -1264,7 +1264,7 @@ lwip_netconn_do_connect(void *m)
void void
lwip_netconn_do_disconnect(void *m) lwip_netconn_do_disconnect(void *m)
{ {
struct api_msg_msg *msg = (struct api_msg_msg*)m; struct api_msg *msg = (struct api_msg*)m;
#if LWIP_UDP #if LWIP_UDP
if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_UDP) { if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_UDP) {
@ -1288,7 +1288,7 @@ lwip_netconn_do_disconnect(void *m)
void void
lwip_netconn_do_listen(void *m) lwip_netconn_do_listen(void *m)
{ {
struct api_msg_msg *msg = (struct api_msg_msg*)m; struct api_msg *msg = (struct api_msg*)m;
if (ERR_IS_FATAL(msg->conn->last_err)) { if (ERR_IS_FATAL(msg->conn->last_err)) {
msg->err = msg->conn->last_err; msg->err = msg->conn->last_err;
@ -1371,7 +1371,7 @@ lwip_netconn_do_listen(void *m)
void void
lwip_netconn_do_send(void *m) lwip_netconn_do_send(void *m)
{ {
struct api_msg_msg *msg = (struct api_msg_msg*)m; struct api_msg *msg = (struct api_msg*)m;
if (ERR_IS_FATAL(msg->conn->last_err)) { if (ERR_IS_FATAL(msg->conn->last_err)) {
msg->err = msg->conn->last_err; msg->err = msg->conn->last_err;
@ -1426,7 +1426,7 @@ lwip_netconn_do_send(void *m)
void void
lwip_netconn_do_recv(void *m) lwip_netconn_do_recv(void *m)
{ {
struct api_msg_msg *msg = (struct api_msg_msg*)m; struct api_msg *msg = (struct api_msg*)m;
msg->err = ERR_OK; msg->err = ERR_OK;
if (msg->conn->pcb.tcp != NULL) { if (msg->conn->pcb.tcp != NULL) {
@ -1614,7 +1614,7 @@ err_mem:
void void
lwip_netconn_do_write(void *m) lwip_netconn_do_write(void *m)
{ {
struct api_msg_msg *msg = (struct api_msg_msg*)m; struct api_msg *msg = (struct api_msg*)m;
if (ERR_IS_FATAL(msg->conn->last_err)) { if (ERR_IS_FATAL(msg->conn->last_err)) {
msg->err = msg->conn->last_err; msg->err = msg->conn->last_err;
@ -1670,7 +1670,7 @@ lwip_netconn_do_write(void *m)
void void
lwip_netconn_do_getaddr(void *m) lwip_netconn_do_getaddr(void *m)
{ {
struct api_msg_msg *msg = (struct api_msg_msg*)m; struct api_msg *msg = (struct api_msg*)m;
if (msg->conn->pcb.ip != NULL) { if (msg->conn->pcb.ip != NULL) {
if (msg->msg.ad.local) { if (msg->msg.ad.local) {
@ -1736,7 +1736,7 @@ lwip_netconn_do_getaddr(void *m)
void void
lwip_netconn_do_close(void *m) lwip_netconn_do_close(void *m)
{ {
struct api_msg_msg *msg = (struct api_msg_msg*)m; struct api_msg *msg = (struct api_msg*)m;
#if LWIP_TCP #if LWIP_TCP
enum netconn_state state = msg->conn->state; enum netconn_state state = msg->conn->state;
@ -1812,7 +1812,7 @@ lwip_netconn_do_close(void *m)
void void
lwip_netconn_do_join_leave_group(void *m) lwip_netconn_do_join_leave_group(void *m)
{ {
struct api_msg_msg *msg = (struct api_msg_msg*)m; struct api_msg *msg = (struct api_msg*)m;
if (ERR_IS_FATAL(msg->conn->last_err)) { if (ERR_IS_FATAL(msg->conn->last_err)) {
msg->err = msg->conn->last_err; msg->err = msg->conn->last_err;

5
src/api/tcpip.c
View File

@ -313,8 +313,9 @@ tcpip_untimeout(sys_timeout_handler h, void *arg)
/** /**
* Synchronously calls function in TCPIP thread and waits for its completion * Sends a message to TCPIP thread to call a function. Caller thread blocks on
* by blocking on a provided semaphore pointer. * on a provided semaphore, which ist NOT automatically signalled by TCPIP thread,
* this has to be done by the user.
* It is recommended to use LWIP_TCPIP_CORE_LOCKING since this is the way * It is recommended to use LWIP_TCPIP_CORE_LOCKING since this is the way
* with least runtime overhead. * with least runtime overhead.
* *

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

@ -160,7 +160,6 @@ struct tcp_pcb;
struct udp_pcb; struct udp_pcb;
struct raw_pcb; struct raw_pcb;
struct netconn; struct netconn;
struct api_msg_msg;
/** A callback prototype to inform about events for a netconn */ /** A callback prototype to inform about events for a netconn */
typedef void (* netconn_callback)(struct netconn *, enum netconn_evt, u16_t len); typedef void (* netconn_callback)(struct netconn *, enum netconn_evt, u16_t len);
@ -228,7 +227,7 @@ struct netconn {
/** TCP: when data passed to netconn_write doesn't fit into the send buffer, /** TCP: when data passed to netconn_write doesn't fit into the send buffer,
this temporarily stores the message. this temporarily stores the message.
Also used during connect and close. */ Also used during connect and close. */
struct api_msg_msg *current_msg; struct api_msg *current_msg;
#endif /* LWIP_TCP */ #endif /* LWIP_TCP */
/** A callback function that is informed about events for this netconn */ /** A callback function that is informed about events for this netconn */
netconn_callback callback; netconn_callback callback;

10
src/include/lwip/priv/api_msg.h
View File

@ -75,7 +75,7 @@ extern "C" {
/** This struct includes everything that is necessary to execute a function /** This struct includes everything that is necessary to execute a function
for a netconn in another thread context (mainly used to process netconns for a netconn in another thread context (mainly used to process netconns
in the tcpip_thread context to be thread safe). */ in the tcpip_thread context to be thread safe). */
struct api_msg_msg { struct api_msg {
/** The netconn which to process - always needed: it includes the semaphore /** The netconn which to process - always needed: it includes the semaphore
which is used to block the application thread until the function finished. */ which is used to block the application thread until the function finished. */
struct netconn *conn; struct netconn *conn;
@ -150,14 +150,6 @@ struct api_msg_msg {
#endif /* LWIP_NETCONN_SEM_PER_THREAD */ #endif /* LWIP_NETCONN_SEM_PER_THREAD */
/** This struct contains a function to execute in another thread context and
a struct api_msg_msg that serves as an argument for this function.
This is passed to tcpip_apimsg to execute functions in tcpip_thread context. */
struct api_msg {
/** arguments for this function */
struct api_msg_msg msg;
};
#if LWIP_DNS #if LWIP_DNS
/** As lwip_netconn_do_gethostbyname requires more arguments but doesn't require a netconn, /** As lwip_netconn_do_gethostbyname requires more arguments but doesn't require a netconn,
it has its own struct (to avoid struct api_msg getting bigger than necessary). it has its own struct (to avoid struct api_msg getting bigger than necessary).