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

Kill legacy proxy support.

Browse source
This commit is contained in:
Alexander Færøy 2016-10-18 22:12:27 +02:00
commit d6b0dd2b32
No known key found for this signature in database
GPG key ID: E15081D5D3C3DB53
13 changed files with 8 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/core/servers.c
View file

@ -217,8 +217,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
if (ip != NULL) {
own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4;
port = server->connrec->proxy != NULL ?
server->connrec->proxy_port : server->connrec->port;
port = server->connrec->port;
handle = server->connrec->use_tls ?
net_connect_ip_ssl(ip, port, own_ip, server) : net_connect_ip(ip, port, own_ip);
} else {
@ -414,8 +413,7 @@ int server_start_connect(SERVER_REC *server)
server->connect_pipe[0] = g_io_channel_new(fd[0]);
server->connect_pipe[1] = g_io_channel_new(fd[1]);
connect_address = server->connrec->proxy != NULL ?
server->connrec->proxy : server->connrec->address;
connect_address = server->connrec->address;
server->connect_pid =
net_gethostbyname_nonblock(connect_address,
server->connect_pipe[1],
@ -610,11 +608,6 @@ void server_connect_unref(SERVER_CONNECT_REC *conn)
if (conn->connect_handle != NULL)
net_disconnect(conn->connect_handle);
g_free_not_null(conn->proxy);
g_free_not_null(conn->proxy_string);
g_free_not_null(conn->proxy_string_after);
g_free_not_null(conn->proxy_password);
g_free_not_null(conn->tag);
g_free_not_null(conn->address);
g_free_not_null(conn->chatnet);