mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-25 18:14:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

altcp_tcp: free altcp_pcb struct in altcp_tcp_close()

Browse Source 
Signed-off-by: goldsimon <goldsimon@gmx.de>
This commit is contained in:
David Girault 2017-09-20 20:50:03 +02:00 committed by goldsimon
parent 8faf765632
commit f48c71e17f
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/altcp_tcp.c
View File

@ -152,6 +152,17 @@ altcp_tcp_err(void *arg, err_t err)
} }
/* setup functions */ /* setup functions */
static void
altcp_tcp_remove_callbacks(struct tcp_pcb *tpcb)
{
tcp_arg(tpcb, NULL);
tcp_recv(tpcb, NULL);
tcp_sent(tpcb, NULL);
tcp_err(tpcb, NULL);
tcp_poll(tpcb, NULL, tpcb->pollinterval);
}
static void static void
altcp_tcp_setup_callbacks(struct altcp_pcb *conn, struct tcp_pcb *tpcb) altcp_tcp_setup_callbacks(struct altcp_pcb *conn, struct tcp_pcb *tpcb)
{ {
@ -288,7 +299,22 @@ altcp_tcp_close(struct altcp_pcb *conn)
} }
ALTCP_TCP_ASSERT_CONN(conn); ALTCP_TCP_ASSERT_CONN(conn);
pcb = (struct tcp_pcb *)conn->state; pcb = (struct tcp_pcb *)conn->state;
return tcp_close(pcb); if (pcb) {
err_t err;
tcp_poll_fn oldpoll = pcb->poll;
altcp_tcp_remove_callbacks(pcb);
err = tcp_close(pcb);
if (err != ERR_OK) {
/* not closed, set up all callbacks again */
altcp_tcp_setup_callbacks(conn, pcb);
/* poll callback is not included in the above */
tcp_poll(pcb, oldpoll, pcb->pollinterval);
return err;
}
conn->state = NULL; /* unsafe to reference pcb after tcp_close(). */
}
altcp_free(conn);
return ERR_OK;
} }
static err_t static err_t