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

altcp_mbedtls: close and error related fixes

Browse Source 
- call conn->err() instead of conn->recv() if handshake fail and free conn
- close inner_conn and free current conn in altcp_mbedtls_close()

Signed-off-by: goldsimon <goldsimon@gmx.de>
This commit is contained in:
David Girault 2017-11-15 21:58:12 +01:00 committed by goldsimon
parent 245a6835f3
commit 5290eacf08
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/apps/altcp_tls/altcp_tls_mbedtls.c
View File

@ -210,7 +210,7 @@ altcp_mbedtls_lower_recv(void *arg, struct altcp_pcb *inner_conn, struct pbuf *p
return ERR_CLSD; return ERR_CLSD;
} }
/* handle NULL pbuf (connection closed) */ /* handle NULL pbuf (inner connection closed) */
if (p == NULL) { if (p == NULL) {
/* remote host sent FIN, remember this (SSL state is destroyed /* remote host sent FIN, remember this (SSL state is destroyed
when both sides are closed only!) */ when both sides are closed only!) */
@ -276,9 +276,12 @@ altcp_mbedtls_lower_recv_process(struct altcp_pcb *conn, altcp_mbedtls_state_t *
if (ret != 0) { if (ret != 0) {
LWIP_DEBUGF(ALTCP_MBEDTLS_DEBUG, ("mbedtls_ssl_handshake failed: %d\n", ret)); LWIP_DEBUGF(ALTCP_MBEDTLS_DEBUG, ("mbedtls_ssl_handshake failed: %d\n", ret));
/* handshake failed, connection has to be closed */ /* handshake failed, connection has to be closed */
conn->recv(conn->arg, conn, NULL, ERR_OK); if (conn->err) {
if (altcp_close(conn->inner_conn) != ERR_OK) { conn->err(conn->arg, ERR_CLSD);
altcp_abort(conn->inner_conn); }
if (altcp_close(conn) != ERR_OK) {
altcp_abort(conn);
} }
return ERR_OK; return ERR_OK;
} }
@ -543,6 +546,17 @@ altcp_mbedtls_lower_err(void *arg, err_t err)
} }
/* setup functions */ /* setup functions */
static void
altcp_tcp_remove_callbacks(struct altcp_pcb *inner_conn)
{
altcp_arg(inner_conn, NULL);
altcp_recv(inner_conn, NULL);
altcp_sent(inner_conn, NULL);
altcp_err(inner_conn, NULL);
altcp_poll(inner_conn, NULL, inner_conn->pollinterval);
}
static void static void
altcp_mbedtls_setup_callbacks(struct altcp_pcb *conn, struct altcp_pcb *inner_conn) altcp_mbedtls_setup_callbacks(struct altcp_pcb *conn, struct altcp_pcb *inner_conn)
{ {
@ -844,9 +858,25 @@ static err_t
altcp_mbedtls_close(struct altcp_pcb *conn) altcp_mbedtls_close(struct altcp_pcb *conn)
{ {
altcp_mbedtls_state_t *state; altcp_mbedtls_state_t *state;
struct altcp_pcb *inner_conn;
if (conn == NULL) { if (conn == NULL) {
return ERR_VAL; return ERR_VAL;
} }
inner_conn = conn->inner_conn;
if (inner_conn) {
err_t err;
altcp_poll_fn oldpoll = inner_conn->poll;
altcp_tcp_remove_callbacks(conn->inner_conn);
err = altcp_close(conn->inner_conn);
if (err != ERR_OK) {
/* not closed, set up all callbacks again */
altcp_mbedtls_setup_callbacks(conn, inner_conn);
/* poll callback is not included in the above */
altcp_poll(inner_conn, oldpoll, inner_conn->pollinterval);
return err;
}
conn->inner_conn = NULL;
}
state = (altcp_mbedtls_state_t *)conn->state; state = (altcp_mbedtls_state_t *)conn->state;
if (state != NULL) { if (state != NULL) {
state->flags |= ALTCP_MBEDTLS_FLAGS_TX_CLOSED; state->flags |= ALTCP_MBEDTLS_FLAGS_TX_CLOSED;
@ -854,7 +884,8 @@ altcp_mbedtls_close(struct altcp_pcb *conn)
altcp_mbedtls_dealloc(conn); altcp_mbedtls_dealloc(conn);
} }
} }
return altcp_close(conn->inner_conn); altcp_free(conn);
return ERR_OK;
} }
/** Write data to a TLS connection. Calls into mbedTLS, which in turn calls into /** Write data to a TLS connection. Calls into mbedTLS, which in turn calls into