From a9d7d03e3098b6be2fff9cf54297330418778034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Thu, 9 Oct 2014 16:07:08 +0200 Subject: [PATCH] SIGTERM also interrupts server2 during net_read() --- programs/ssl/ssl_server2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index 330abbe5a..738c51ffb 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -618,7 +618,7 @@ int psk_callback( void *p_info, ssl_context *ssl, } #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) */ #if !defined(_WIN32) @@ -628,13 +628,13 @@ void term_handler( int sig ) ((void) sig); received_sigterm = 1; net_close( listen_fd ); /* causes net_accept() to abort */ + net_close( client_fd ); /* causes net_read() to abort */ } #endif int main( int argc, char *argv[] ) { int ret = 0, len, written, frags, exchanges; - int client_fd = -1; int version_suites[4][2]; unsigned char buf[IO_BUF_LEN]; #if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)