From 416fcda578400ffbcfb6145a4586add8a7067993 Mon Sep 17 00:00:00 2001 From: Tim Cava Date: Thu, 20 Sep 2012 02:36:48 +0000 Subject: [PATCH] Fix QUIT messages with SSL connections. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@212 13b04d17-f746-0410-82c6-800466cd88b0 --- source/server.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/source/server.c b/source/server.c index f02c8bb..8192e6f 100644 --- a/source/server.c +++ b/source/server.c @@ -107,14 +107,6 @@ void BX_close_server (int cs_index, char *message) if (cs_index < 0 || cs_index > number_of_servers) return; -#ifdef HAVE_SSL - if (get_server_ssl(cs_index) && server_list[cs_index].ssl_fd) - { - say("Closing SSL connection"); - SSL_shutdown(server_list[cs_index].ssl_fd); - } -#endif - if (serv_close_func) (*serv_close_func)(cs_index, server_list[cs_index].local_addr, server_list[cs_index].port); clean_server_queues(from_server); @@ -159,7 +151,11 @@ void BX_close_server (int cs_index, char *message) strlcat(buffer, "\r\n", IRCD_BUFFER_SIZE + 1); #ifdef HAVE_SSL if (get_server_ssl(cs_index)) + { SSL_write(server_list[cs_index].ssl_fd, buffer, strlen(buffer)); + say("Closing SSL connection"); + SSL_shutdown(server_list[cs_index].ssl_fd); + } else #endif send(server_list[cs_index].write, buffer, strlen(buffer), 0);