Merge Irssi 0.8.16-rc1

[silc.git] / apps / irssi / src / core / network.h

diff --git a/apps/irssi/src/core/network.h b/apps/irssi/src/core/network.h
index 5e445e8383603eb5864d0213f2b005746ee84624..fa7e96750825c871f75cb5fa0dfcb6af3176e387 100644 (file)
--- a/apps/irssi/src/core/network.h
+++ b/apps/irssi/src/core/network.h
@@ -41,22 +41,22 @@ struct _IPADDR {
 
 extern IPADDR ip4_any;
 
+GIOChannel *g_io_channel_new(int handle);
+
 /* returns 1 if IPADDRs are the same */
 int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
 
 /* Connect to socket */
 GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip);
 /* Connect to socket with ip address and SSL*/
-GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, const char *cert, const char *pkey, const char *cafile, const char *capath, gboolean verify);
+GIOChannel *net_connect_ip_ssl(IPADDR *ip, int port, IPADDR *my_ip, SERVER_REC *server);
+int irssi_ssl_handshake(GIOChannel *handle);
 /* Connect to socket with ip address */
 GIOChannel *net_connect_ip(IPADDR *ip, int port, IPADDR *my_ip);
 /* Connect to named UNIX socket */
 GIOChannel *net_connect_unix(const char *path);
 /* Disconnect socket */
 void net_disconnect(GIOChannel *handle);
-/* Try to let the other side close the connection, if it still isn't
-   disconnected after certain amount of time, close it ourself */
-void net_disconnect_later(GIOChannel *handle);
 
 /* Listen for connections on a socket */
 GIOChannel *net_listen(IPADDR *my_ip, int *port);