Rename mbedtls_net_close() to mbedtls_net_free()

close() may be more meaningful, but free() is symmetric with _init(), and more
consistent with all other modules
parent 5db64328
......@@ -2157,7 +2157,7 @@
#define mpi_write_string mbedtls_mpi_write_string
#define net_accept mbedtls_net_accept
#define net_bind mbedtls_net_bind
#define net_close mbedtls_net_close
#define net_close mbedtls_net_free
#define net_connect mbedtls_net_connect
#define net_recv mbedtls_net_recv
#define net_recv_timeout mbedtls_net_recv_timeout
......
......@@ -216,11 +216,11 @@ int mbedtls_net_recv_timeout( void *ctx, unsigned char *buf, size_t len,
uint32_t timeout );
/**
* \brief Gracefully shutdown the connection
* \brief Gracefully shutdown the connection and free associated data
*
* \param ctx The socket to close
* \param ctx The context to free
*/
void mbedtls_net_close( mbedtls_net_context *ctx );
void mbedtls_net_free( mbedtls_net_context *ctx );
#ifdef __cplusplus
}
......
......@@ -521,7 +521,7 @@ int mbedtls_net_send( void *ctx, const unsigned char *buf, size_t len )
/*
* Gracefully close the connection
*/
void mbedtls_net_close( mbedtls_net_context *ctx )
void mbedtls_net_free( mbedtls_net_context *ctx )
{
if( ctx->fd == -1 )
return;
......
......@@ -281,7 +281,7 @@ int main( void )
exit:
mbedtls_net_close( &server_fd );
mbedtls_net_free( &server_fd );
mbedtls_aes_free( &aes );
mbedtls_rsa_free( &rsa );
......
......@@ -283,8 +283,8 @@ int main( void )
exit:
mbedtls_net_close( &client_fd );
mbedtls_net_close( &listen_fd );
mbedtls_net_free( &client_fd );
mbedtls_net_free( &listen_fd );
mbedtls_aes_free( &aes );
mbedtls_rsa_free( &rsa );
......
......@@ -326,7 +326,7 @@ exit:
}
#endif
mbedtls_net_close( &server_fd );
mbedtls_net_free( &server_fd );
mbedtls_x509_crt_free( &cacert );
mbedtls_ssl_free( &ssl );
......
......@@ -256,7 +256,7 @@ reset:
}
#endif
mbedtls_net_close( &client_fd );
mbedtls_net_free( &client_fd );
mbedtls_ssl_session_reset( &ssl );
......@@ -401,8 +401,8 @@ exit:
}
#endif
mbedtls_net_close( &client_fd );
mbedtls_net_close( &listen_fd );
mbedtls_net_free( &client_fd );
mbedtls_net_free( &listen_fd );
mbedtls_x509_crt_free( &srvcert );
mbedtls_pk_free( &pkey );
......
......@@ -280,7 +280,7 @@ int main( void )
mbedtls_ssl_close_notify( &ssl );
exit:
mbedtls_net_close( &server_fd );
mbedtls_net_free( &server_fd );
mbedtls_ssl_free( &ssl );
mbedtls_ssl_config_free( &conf );
......
......@@ -290,7 +290,7 @@ exit:
}
#endif
mbedtls_net_close( &server_fd );
mbedtls_net_free( &server_fd );
mbedtls_x509_crt_free( &cacert );
mbedtls_ssl_free( &ssl );
......
......@@ -1503,7 +1503,7 @@ reconnect:
{
--opt.reconnect;
mbedtls_net_close( &server_fd );
mbedtls_net_free( &server_fd );
#if defined(MBEDTLS_TIMING_C)
if( opt.reco_delay > 0 )
......@@ -1572,7 +1572,7 @@ exit:
}
#endif
mbedtls_net_close( &server_fd );
mbedtls_net_free( &server_fd );
#if defined(MBEDTLS_X509_CRT_PARSE_C)
mbedtls_x509_crt_free( &clicert );
......
......@@ -259,11 +259,11 @@ int main( void )
goto exit;
}
mbedtls_net_close( &client_fd );
mbedtls_net_free( &client_fd );
continue;
}
mbedtls_net_close( &listen_fd );
mbedtls_net_free( &listen_fd );
/*
* 4. Setup stuff
......@@ -385,8 +385,8 @@ int main( void )
}
exit:
mbedtls_net_close( &client_fd );
mbedtls_net_close( &listen_fd );
mbedtls_net_free( &client_fd );
mbedtls_net_free( &listen_fd );
mbedtls_x509_crt_free( &srvcert );
mbedtls_pk_free( &pkey );
......
......@@ -819,7 +819,7 @@ int main( int argc, char *argv[] )
exit:
mbedtls_net_close( &server_fd );
mbedtls_net_free( &server_fd );
mbedtls_x509_crt_free( &clicert );
mbedtls_x509_crt_free( &cacert );
mbedtls_pk_free( &pkey );
......
......@@ -265,7 +265,7 @@ thread_exit:
}
#endif
mbedtls_net_close( client_fd );
mbedtls_net_free( client_fd );
mbedtls_ssl_free( &ssl );
thread_info->thread_complete = 1;
......@@ -491,7 +491,7 @@ reset:
if( ( ret = thread_create( &client_fd ) ) != 0 )
{
mbedtls_printf( " [ main ] failed: thread_create returned %d\n", ret );
mbedtls_net_close( &client_fd );
mbedtls_net_free( &client_fd );
goto reset;
}
......
......@@ -237,7 +237,7 @@ reset:
}
#endif
mbedtls_net_close( &client_fd );
mbedtls_net_free( &client_fd );
mbedtls_ssl_session_reset( &ssl );
......@@ -373,8 +373,8 @@ exit:
}
#endif
mbedtls_net_close( &client_fd );
mbedtls_net_close( &listen_fd );
mbedtls_net_free( &client_fd );
mbedtls_net_free( &listen_fd );
mbedtls_x509_crt_free( &srvcert );
mbedtls_pk_free( &pkey );
......
......@@ -755,8 +755,8 @@ void term_handler( int sig )
{
((void) sig);
received_sigterm = 1;
mbedtls_net_close( &listen_fd ); /* causes mbedtls_net_accept() to abort */
mbedtls_net_close( &client_fd ); /* causes net_read() to abort */
mbedtls_net_free( &listen_fd ); /* causes mbedtls_net_accept() to abort */
mbedtls_net_free( &client_fd ); /* causes net_read() to abort */
}
#endif
......@@ -1843,7 +1843,7 @@ reset:
}
#endif
mbedtls_net_close( &client_fd );
mbedtls_net_free( &client_fd );
mbedtls_ssl_session_reset( &ssl );
......@@ -2252,8 +2252,8 @@ exit:
mbedtls_printf( " . Cleaning up..." );
fflush( stdout );
mbedtls_net_close( &client_fd );
mbedtls_net_close( &listen_fd );
mbedtls_net_free( &client_fd );
mbedtls_net_free( &listen_fd );
#if defined(MBEDTLS_DHM_C) && defined(MBEDTLS_FS_IO)
mbedtls_dhm_free( &dhm );
......
......@@ -615,9 +615,9 @@ exit:
}
#endif
mbedtls_net_close( &client_fd );
mbedtls_net_close( &server_fd );
mbedtls_net_close( &listen_fd );
mbedtls_net_free( &client_fd );
mbedtls_net_free( &server_fd );
mbedtls_net_free( &listen_fd );
#if defined(_WIN32)
mbedtls_printf( " Press Enter to exit this program.\n" );
......
......@@ -475,7 +475,7 @@ ssl_exit:
exit:
mbedtls_net_close( &server_fd );
mbedtls_net_free( &server_fd );
mbedtls_x509_crt_free( &cacert );
mbedtls_x509_crt_free( &clicert );
#if defined(MBEDTLS_X509_CRL_PARSE_C)
......
......@@ -1701,7 +1701,7 @@ mpi_write_file mbedtls_mpi_write_file
mpi_write_string mbedtls_mpi_write_string
net_accept mbedtls_net_accept
net_bind mbedtls_net_bind
net_close mbedtls_net_close
net_close mbedtls_net_free
net_connect mbedtls_net_connect
net_recv mbedtls_net_recv
net_recv_timeout mbedtls_net_recv_timeout
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment