Removed SessionMsgType enum and its use, since it is useless.

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

diff --git a/src/common/session.c b/src/common/session.c
index 21213f7e9ac965929ddc7585428e3845d7031f30..356c32187e780ee50548d2a34c21b81f639bbd44 100644 (file)
--- a/src/common/session.c
+++ b/src/common/session.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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,19 +243,28 @@ 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);
 
        g_free(session);
 }
 
-gboolean session_is_connected(Session *session)
+gboolean session_is_running(Session *session)
 {
        return (session->state == SESSION_READY ||
                session->state == SESSION_SEND ||
                session->state == SESSION_RECV);
 }
 
+gboolean session_is_connected(Session *session)
+{
+       return (session->state == SESSION_SEND ||
+               session->state == SESSION_RECV);
+}
+
 void session_set_access_time(Session *session)
 {
        session->last_access_time = time(NULL);
@@ -246,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;
 }
@@ -262,7 +291,7 @@ static gboolean session_timeout_cb(gpointer data)
 {
        Session *session = SESSION(data);
 
-       g_warning("session timeout.\n");
+       g_warning("session timeout.");
 
        if (session->io_tag > 0) {
                g_source_remove(session->io_tag);
@@ -357,11 +386,14 @@ 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)) {
-               g_warning("couldn't start TLS session.\n");
+       if (!ssl_init_socket(session->sock)) {
+               g_warning("couldn't start TLS session.");
                if (nb_mode)
                        sock_set_nonblocking_mode(session->sock, session->nonblocking);
                return -1;
@@ -374,7 +406,7 @@ gint session_start_tls(Session *session)
 }
 #endif
 
-gint session_send_msg(Session *session, SessionMsgType type, const gchar *msg)
+gint session_send_msg(Session *session, const gchar *msg)
 {
        gboolean ret;
 
@@ -512,13 +544,14 @@ 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) {
-                       g_warning ("sock_read: session disconnected\n");
+                       g_warning ("sock_read: session disconnected");
                        if (session->io_tag > 0) {
                                g_source_remove(session->io_tag);
                                session->io_tag = 0;
@@ -527,7 +560,7 @@ static gboolean session_read_msg_cb(SockInfo *source, GIOCondition condition,
                }
                
                if (read_len == 0) {
-                       g_warning("sock_read: received EOF\n");
+                       g_warning("sock_read: received EOF");
                        session->state = SESSION_EOF;
                        return FALSE;
                }
@@ -537,7 +570,7 @@ static gboolean session_read_msg_cb(SockInfo *source, GIOCondition condition,
                        case EAGAIN:
                                return TRUE;
                        default:
-                               g_warning("sock_read: %s\n", g_strerror(errno));
+                               g_warning("sock_read: %s", g_strerror(errno));
                                session->state = SESSION_ERROR;
                                return FALSE;
                        }
@@ -613,7 +646,7 @@ static gboolean session_read_data_cb(SockInfo *source, GIOCondition condition,
                                     SESSION_BUFFSIZE);
 
                if (read_len == 0) {
-                       g_warning("sock_read: received EOF\n");
+                       g_warning("sock_read: received EOF");
                        session->state = SESSION_EOF;
                        return FALSE;
                }
@@ -623,7 +656,7 @@ static gboolean session_read_data_cb(SockInfo *source, GIOCondition condition,
                        case EAGAIN:
                                return TRUE;
                        default:
-                               g_warning("sock_read: %s\n", g_strerror(errno));
+                               g_warning("sock_read: %s", g_strerror(errno));
                                session->state = SESSION_ERROR;
                                return FALSE;
                        }
@@ -719,7 +752,7 @@ static gint session_write_buf(Session *session)
                        write_len = 0;
                        break;
                default:
-                       g_warning("sock_write: %s\n", g_strerror(errno));
+                       g_warning("sock_write: %s", g_strerror(errno));
                        session->state = SESSION_ERROR;
                        return -1;
                }
@@ -762,7 +795,7 @@ static gint session_write_data(Session *session)
                        write_len = 0;
                        break;
                default:
-                       g_warning("sock_write: %s\n", g_strerror(errno));
+                       g_warning("sock_write: %s", g_strerror(errno));
                        session->state = SESSION_ERROR;
                        return -1;
                }
@@ -860,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);
+}