yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ssl_server2 now exits on signal during a read too

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-09-20 12:03:00 +02:00
parent 403a86f73d
commit 3a3066c3ee
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
programs/ssl/ssl_server2.c
View file

@ -572,7 +572,7 @@ int psk_callback( void *p_info, ssl_context *ssl,
} }
#endif /* POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED */ #endif /* POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED */
static int listen_fd; static int listen_fd, client_fd = -1;
/* Interruption handler to ensure clean exit (for valgrind testing) */ /* Interruption handler to ensure clean exit (for valgrind testing) */
#if !defined(_WIN32) #if !defined(_WIN32)
@ -582,13 +582,13 @@ void term_handler( int sig )
((void) sig); ((void) sig);
received_sigterm = 1; received_sigterm = 1;
net_close( listen_fd ); /* causes net_accept() to abort */ net_close( listen_fd ); /* causes net_accept() to abort */
net_close( client_fd ); /* causes net_read() to abort */
} }
#endif #endif
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
int ret = 0, len, written, frags, exchanges; int ret = 0, len, written, frags, exchanges;
int client_fd = -1;
int version_suites[4][2]; int version_suites[4][2];
unsigned char buf[IO_BUF_LEN]; unsigned char buf[IO_BUF_LEN];
#if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED) #if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)
@ -1386,6 +1386,15 @@ int main( int argc, char *argv[] )
printf( " ok\n" ); printf( " ok\n" );
reset: reset:
#if !defined(_WIN32)
if( received_sigterm )
{
printf( " interrupted by SIGTERM\n" );
ret = 0;
goto exit;
}
#endif
#ifdef POLARSSL_ERROR_C #ifdef POLARSSL_ERROR_C
if( ret != 0 ) if( ret != 0 )
{ {