cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-11-04 04:32:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

SIGTERM also interrupts server2 during net_read()

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-10-09 16:07:08 +02:00 committed by Paul Bakker
parent 6a2bc23f63
commit a9d7d03e30
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/ssl/ssl_server2.c
View File

@ -618,7 +618,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)
@ -628,13 +628,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)