aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-11-03 04:27:19 -05:00
Code

Porting some stuff to modern git version

Browse Source
This commit is contained in:
hawken93 2014-10-03 17:34:24 +02:00
parent 9fcd69b9ef
commit d5727e1648
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/network-openssl.c
View File

@ -551,8 +551,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
return gchan;
}
GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip, const char *cert, const char *pkey, const char *cafile, const char *capath, gboolean verify)
GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port,
IPADDR *ip, IPADDR *my_ip, SERVER_REC *server)
{
GIOChannel *handle, *ssl_handle;

2
src/core/network.h
View File

@ -51,7 +51,7 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip);
/* Connect to socket with ip address and SSL*/
GIOChannel *net_connect_ip(IPADDR const *ip, int port, IPADDR *my_ip);
GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip, const char *cert, const char *pkey, const char *cafile, const char *capath, gboolean verify);
GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip, SERVER_REC *server);
int irssi_ssl_handshake(GIOChannel *handle);
/* Connect to socket with ip address */
GIOChannel *net_connect_proxy(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip);

5
src/core/servers.c
View File

@ -227,10 +227,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
net_connect_proxy_ssl(server->connrec->proxy,
server->connrec->address, port,
ip, own_ip,
server->connrec->ssl_cert,
server->connrec->ssl_pkey,
server->connrec->ssl_cafile,
server->connrec->ssl_capath, server->connrec->ssl_verify) :
server->connrec) :
net_connect_proxy(server->connrec->proxy,
server->connrec->address, port,
ip, own_ip);

5
src/irc/core/irc-servers.c
View File

@ -313,6 +313,11 @@ void irc_server_connect(SERVER_REC *server)
}
}
void irc_send_cmd_now_wrapper(void *server, const char *cmd)
{
return irc_send_cmd_now((IRC_SERVER_REC *)server, cmd);
}
/* Returns TRUE if `command' is sent to `target' */
static int command_has_target(const char *cmd, const char *target)
{

3
src/irc/core/irc-servers.h
View File

@ -109,6 +109,7 @@ struct _IRC_SERVER_REC {
SERVER_REC *irc_server_init_connect(SERVER_CONNECT_REC *conn);
void irc_server_connect(SERVER_REC *server);
/* Purge server output, either all or for specified target */
void irc_server_purge_output(IRC_SERVER_REC *server, const char *target);
@ -125,6 +126,8 @@ void irc_server_send_away(IRC_SERVER_REC *server, const char *reason);
void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len);
void irc_server_init_isupport(IRC_SERVER_REC *server);
void irc_send_cmd_now_wrapper(void *server, const char *cmd);
void irc_servers_start_cmd_timeout(void);
void irc_servers_init(void);