Add callback for session connection result

[claws.git] / src / common / session.c

diff --git a/src/common/session.c b/src/common/session.c
index 9173d528dc99d7764c18139caa10f25a167fd763..8569148a5fdba10f8dd3a597335337245c7c0a0d 100644 (file)
--- a/src/common/session.c
+++ b/src/common/session.c
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -99,6 +100,8 @@ void session_init(Session *session, const void *prefs_account, gboolean is_smtp)
        session->data = NULL;
        session->account = prefs_account;
        session->is_smtp = is_smtp;
+
+       session->ping_tag = -1;
 }
 
 /*!
@@ -125,6 +128,8 @@ gint session_connect(Session *session, const gchar *server, gushort port)
        if (session->conn_id < 0) {
                g_warning("can't connect to server.");
                session_close(session);
+               if (session->connect_finished)
+                       session->connect_finished(session, FALSE);
                return -1;
        }
 
@@ -139,6 +144,8 @@ gint session_connect(Session *session, const gchar *server, gushort port)
        if (sock == NULL) {
                g_warning("can't connect to server.");
                session_close(session);
+               if (session->connect_finished)
+                       session->connect_finished(session, FALSE);
                return -1;
        }
        sock->is_smtp = session->is_smtp;
@@ -156,19 +163,27 @@ static gint session_connect_cb(SockInfo *sock, gpointer data)
        if (!sock) {
                g_warning("can't connect to server.");
                session->state = SESSION_ERROR;
+               if (session->connect_finished)
+                       session->connect_finished(session, FALSE);
                return -1;
        }
 
        session->sock = sock;
        sock->account = session->account;
        sock->is_smtp = session->is_smtp;
+       sock->ssl_cert_auto_accept = session->ssl_cert_auto_accept;
+
 #ifdef USE_GNUTLS
+       sock->gnutls_priority = session->gnutls_priority;
+
        if (session->ssl_type == SSL_TUNNEL) {
                sock_set_nonblocking_mode(sock, FALSE);
                if (!ssl_init_socket(sock)) {
                        g_warning("can't initialize SSL.");
                        log_error(LOG_PROTOCOL, _("SSL handshake failed\n"));
                        session->state = SESSION_ERROR;
+                       if (session->connect_finished)
+                               session->connect_finished(session, FALSE);
                        return -1;
                }
        }
@@ -176,8 +191,11 @@ static gint session_connect_cb(SockInfo *sock, gpointer data)
 
        /* we could have gotten a timeout while waiting for user input in 
         * an SSL certificate dialog */
-       if (session->state == SESSION_TIMEOUT)
+       if (session->state == SESSION_TIMEOUT) {
+               if (session->connect_finished)
+                       session->connect_finished(session, FALSE);
                return -1;
+       }
 
        sock_set_nonblocking_mode(sock, session->nonblocking);
 
@@ -188,6 +206,8 @@ static gint session_connect_cb(SockInfo *sock, gpointer data)
                                         session_read_msg_cb,
                                         session);
 
+       if (session->connect_finished)
+               session->connect_finished(session, TRUE);
        return 0;
 }
 
@@ -214,6 +234,8 @@ void session_destroy(Session *session)
        cm_return_if_fail(session != NULL);
        cm_return_if_fail(session->destroy != NULL);
 
+       session_register_ping(session, NULL);
+
        session_close(session);
        session->destroy(session);
        g_free(session->server);
@@ -221,6 +243,9 @@ void session_destroy(Session *session)
        g_byte_array_free(session->read_data_buf, TRUE);
        g_free(session->read_data_terminator);
        g_free(session->write_buf);
+#ifdef USE_GNUTLS
+       g_free(session->gnutls_priority);
+#endif
 
        debug_print("session (%p): destroyed\n", session);
 
@@ -252,14 +277,12 @@ void session_set_timeout(Session *session, guint interval)
 
        session->timeout_interval = interval;
        if (interval > 0) {
-#if GLIB_CHECK_VERSION(2,14,0)
                if (interval % 1000 == 0)
                        session->timeout_tag =
                                g_timeout_add_seconds(interval/1000, session_timeout_cb, session);
                else
-#endif
-               session->timeout_tag =
-                       g_timeout_add(interval, session_timeout_cb, session);
+                       session->timeout_tag =
+                               g_timeout_add(interval, session_timeout_cb, session);
        } else
                session->timeout_tag = 0;
 }
@@ -363,10 +386,13 @@ gint session_start_tls(Session *session)
 
        nb_mode = sock_is_nonblocking_mode(session->sock);
 
+       session->sock->ssl_cert_auto_accept = session->ssl_cert_auto_accept;
+       session->sock->gnutls_priority = session->gnutls_priority;
+
        if (nb_mode)
                sock_set_nonblocking_mode(session->sock, FALSE);
 
-       if (!ssl_init_socket_with_method(session->sock, SSL_METHOD_TLSv1)) {
+       if (!ssl_init_socket(session->sock)) {
                g_warning("couldn't start TLS session.\n");
                if (nb_mode)
                        sock_set_nonblocking_mode(session->sock, session->nonblocking);
@@ -518,9 +544,10 @@ static gboolean session_read_msg_cb(SockInfo *source, GIOCondition condition,
        session_set_timeout(session, session->timeout_interval);
 
        if (session->read_buf_len == 0) {
-               gint read_len;
+               gint read_len = -1;
 
-               read_len = sock_read(session->sock, session->read_buf,
+               if (session->sock)
+                       read_len = sock_read(session->sock, session->read_buf,
                                     SESSION_BUFFSIZE - 1);
 
                if (read_len == -1 && session->state == SESSION_DISCONNECTED) {
@@ -866,3 +893,16 @@ static gboolean session_write_data_cb(SockInfo *source,
 
        return FALSE;
 }
+
+void session_register_ping(Session *session, gboolean (*ping_cb)(gpointer data))
+{
+       if (!session)
+               return;
+       if (session->ping_tag > -1)
+               g_source_remove(session->ping_tag);
+
+       session->ping_tag = -1;
+
+       if (ping_cb != NULL)
+               session->ping_tag = g_timeout_add_seconds(60, ping_cb, session);
+}