zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-23 02:22:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 9e88c65c44 into b58be939d2

Browse source
This commit is contained in:
Italo Carlo Lopes Silva 2016-09-16 21:45:17 +00:00 • committed by GitHub
commit 548dc4504f
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/core/servers.c
View file

@ -209,6 +209,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
char *errmsg2; char *errmsg2;
char ipaddr[MAX_IP_LEN]; char ipaddr[MAX_IP_LEN];
int port; int port;
int failed_use_ssl = 1;
g_return_if_fail(ip != NULL || unix_socket != NULL); g_return_if_fail(ip != NULL || unix_socket != NULL);
@ -248,15 +249,18 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
} else { } else {
server->handle = net_sendbuffer_create(handle, 0); server->handle = net_sendbuffer_create(handle, 0);
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
if (server->connrec->use_ssl) if (server->connrec->use_ssl){
server_connect_callback_init_ssl(server, handle); server_connect_callback_init_ssl(server, handle);
else failed_use_ssl = 0;
}
#endif #endif
server->connect_tag = if (failed_use_ssl)
g_input_add(handle, G_INPUT_WRITE | G_INPUT_READ, server->connect_tag =
(GInputFunction) g_input_add(handle, G_INPUT_WRITE | G_INPUT_READ,
server_connect_callback_init, (GInputFunction)
server); server_connect_callback_init,
server);
} }
} }