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

Fix session lost issue (#36) 

This fixes unstability issues. Still need to refactor
coap_security_handler_read()-function to work as specified in mbedTLS
documentation. This commit should be treated as a temporary fix.
pull/3240/head
Tero Heinonen 2016-10-11 09:30:17 +03:00 committed by GitHub
parent 07d72229de
commit b3419e058a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/coap_connection_handler.c
View File

@ -490,8 +490,11 @@ static void secure_recv_sckt_msg(void *cb_res)
int len = 0; int len = 0;
len = coap_security_handler_read(session->sec_handler, data, sock->data_len); len = coap_security_handler_read(session->sec_handler, data, sock->data_len);
if( len < 0 ){ if( len < 0 ){
if (len != MBEDTLS_ERR_SSL_WANT_READ && len != MBEDTLS_ERR_SSL_WANT_WRITE &&
len != MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE) {
secure_session_delete(session);
}
ns_dyn_mem_free(data); ns_dyn_mem_free(data);
secure_session_delete( session );
}else{ }else{
if( sock->parent->_recv_cb ){ if( sock->parent->_recv_cb ){
sock->parent->_recv_cb(sock->listen_socket, src_address.address, src_address.identifier, data, len); sock->parent->_recv_cb(sock->listen_socket, src_address.address, src_address.identifier, data, len);
@ -593,11 +596,14 @@ int coap_connection_handler_virtual_recv(coap_conn_handler_t *handler, uint8_t a
int len = 0; int len = 0;
len = coap_security_handler_read(session->sec_handler, data, sock->data_len); len = coap_security_handler_read(session->sec_handler, data, sock->data_len);
if( len < 0 ){ if( len < 0 ){
if (len != MBEDTLS_ERR_SSL_WANT_READ && len != MBEDTLS_ERR_SSL_WANT_WRITE &&
len != MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE) {
secure_session_delete(session);
}
ns_dyn_mem_free(data); ns_dyn_mem_free(data);
secure_session_delete( session );
return 0; return 0;
}else{ } else {
if( sock->parent->_recv_cb ){ if (sock->parent->_recv_cb) {
sock->parent->_recv_cb(sock->listen_socket, address, port, data, len); sock->parent->_recv_cb(sock->listen_socket, address, port, data, len);
} }
ns_dyn_mem_free(data); ns_dyn_mem_free(data);