Fix QUIT messages with SSL connections.

git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@212 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Tim Cava
2012-09-20 02:36:48 +00:00
parent c604db14e5
commit 416fcda578

View File

@@ -107,14 +107,6 @@ void BX_close_server (int cs_index, char *message)
if (cs_index < 0 || cs_index > number_of_servers) if (cs_index < 0 || cs_index > number_of_servers)
return; 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) if (serv_close_func)
(*serv_close_func)(cs_index, server_list[cs_index].local_addr, server_list[cs_index].port); (*serv_close_func)(cs_index, server_list[cs_index].local_addr, server_list[cs_index].port);
clean_server_queues(from_server); 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); strlcat(buffer, "\r\n", IRCD_BUFFER_SIZE + 1);
#ifdef HAVE_SSL #ifdef HAVE_SSL
if (get_server_ssl(cs_index)) if (get_server_ssl(cs_index))
{
SSL_write(server_list[cs_index].ssl_fd, buffer, strlen(buffer)); SSL_write(server_list[cs_index].ssl_fd, buffer, strlen(buffer));
say("Closing SSL connection");
SSL_shutdown(server_list[cs_index].ssl_fd);
}
else else
#endif #endif
send(server_list[cs_index].write, buffer, strlen(buffer), 0); send(server_list[cs_index].write, buffer, strlen(buffer), 0);