diff options
author | Alexander Færøy <ahf@irssi.org> | 2013-06-23 23:50:26 +0000 |
---|---|---|
committer | ahf <ahf@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2013-06-23 23:50:26 +0000 |
commit | cb873d5b917eb464e7911fe0d2a3e4603738dc8b (patch) | |
tree | 902da866db39933dc0c3adb3a6b1b72058f0ea91 /src/core/servers.c | |
parent | d826896f74925f2e77536d69a3d1a4b86b0cec61 (diff) | |
download | irssi-cb873d5b917eb464e7911fe0d2a3e4603738dc8b.zip |
Pass SERVER_REC directly to net_connect_ip_ssl
This patch refactors how we are passing connection information for SSL
connections. This will allow us to emit signals with a SERVER_REC as
parameter during SSL handshake.
git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@5219 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core/servers.c')
-rw-r--r-- | src/core/servers.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/servers.c b/src/core/servers.c index d4827b61..d0e6bb7e 100644 --- a/src/core/servers.c +++ b/src/core/servers.c @@ -224,9 +224,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip, port = server->connrec->proxy != NULL ? server->connrec->proxy_port : server->connrec->port; handle = server->connrec->use_ssl ? - net_connect_ip_ssl(ip, port, server->connrec->address, own_ip, server->connrec->ssl_cert, server->connrec->ssl_pkey, -server->connrec->ssl_cafile, server->connrec->ssl_capath, server->connrec->ssl_verify) : - net_connect_ip(ip, port, own_ip); + net_connect_ip_ssl(ip, port, own_ip, server) : net_connect_ip(ip, port, own_ip); } else { handle = net_connect_unix(unix_socket); } |