mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-02 21:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed check for conn->err for functions whose counterparts in api_msg.c also do the check (1. remove redundant code, 2. check is better done in tcpip thread context)

Browse Source
This commit is contained in:
goldsimon 2007-10-22 20:01:16 +00:00
parent 2d3a64815f
commit 270c7c1110
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/api_lib.c
View File

@ -96,6 +96,7 @@ netconn *netconn_new_with_proto_and_callback(enum netconn_type t, u8_t proto,
TCPIP_APIMSG(&msg); TCPIP_APIMSG(&msg);
if (conn->err != ERR_OK) { if (conn->err != ERR_OK) {
LWIP_ASSERT("freeing conn without freeing pcb", conn->pcb.tcp == NULL);
sys_mbox_free(conn->mbox); sys_mbox_free(conn->mbox);
memp_free(MEMP_NETCONN, conn); memp_free(MEMP_NETCONN, conn);
return NULL; return NULL;
@ -448,13 +449,14 @@ netconn_recv(struct netconn *conn)
} }
/* Register event with callback */ /* Register event with callback */
if (conn->callback) if (conn->callback) {
(*conn->callback)(conn, NETCONN_EVT_RCVMINUS, len); (*conn->callback)(conn, NETCONN_EVT_RCVMINUS, len);
}
/* If we are closed, we indicate that we no longer wish to use the socket */ /* If we are closed, we indicate that we no longer wish to use the socket */
if (p == NULL) { if (p == NULL) {
memp_free(MEMP_NETBUF, buf); memp_free(MEMP_NETBUF, buf);
/* Avoid to lost any previous error code */ /* Avoid to loose any previous error code */
if (conn->err == ERR_OK) { if (conn->err == ERR_OK) {
conn->err = ERR_CLSD; conn->err = ERR_CLSD;
} }
@ -534,10 +536,6 @@ netconn_send(struct netconn *conn, struct netbuf *buf)
LWIP_ERROR("netconn_send: invalid conn", (conn != NULL), return ERR_ARG;); LWIP_ERROR("netconn_send: invalid conn", (conn != NULL), return ERR_ARG;);
if (conn->err != ERR_OK) {
return conn->err;
}
LWIP_DEBUGF(API_LIB_DEBUG, ("netconn_send: sending %d bytes\n", buf->p->tot_len)); LWIP_DEBUGF(API_LIB_DEBUG, ("netconn_send: sending %d bytes\n", buf->p->tot_len));
msg.function = do_send; msg.function = do_send;
msg.msg.conn = conn; msg.msg.conn = conn;
@ -563,10 +561,6 @@ netconn_write(struct netconn *conn, const void *dataptr, int size, u8_t copy)
LWIP_ERROR("netconn_write: invalid conn", (conn != NULL), return ERR_ARG;); LWIP_ERROR("netconn_write: invalid conn", (conn != NULL), return ERR_ARG;);
LWIP_ERROR("netconn_write: invalid conn->type", (conn->type == NETCONN_TCP), return ERR_VAL;); LWIP_ERROR("netconn_write: invalid conn->type", (conn->type == NETCONN_TCP), return ERR_VAL;);
if (conn->err != ERR_OK) {
return conn->err;
}
msg.function = do_write; msg.function = do_write;
msg.msg.conn = conn; msg.msg.conn = conn;
msg.msg.msg.w.dataptr = dataptr; msg.msg.msg.w.dataptr = dataptr;
@ -620,10 +614,6 @@ netconn_join_leave_group(struct netconn *conn,
LWIP_ERROR("netconn_join_leave_group: invalid conn", (conn != NULL), return ERR_ARG;); LWIP_ERROR("netconn_join_leave_group: invalid conn", (conn != NULL), return ERR_ARG;);
if (conn->err != ERR_OK) {
return conn->err;
}
msg.function = do_join_leave_group; msg.function = do_join_leave_group;
msg.msg.conn = conn; msg.msg.conn = conn;
msg.msg.msg.jl.multiaddr = multiaddr; msg.msg.msg.jl.multiaddr = multiaddr;