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 5bc00982c982dc702ea8e87411f9f4204f5ea961..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-2007 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"
@@ -60,13 +61,13 @@ static gboolean session_write_data_cb       (SockInfo       *source,
                                         gpointer        data);
 
 
-void session_init(Session *session)
+void session_init(Session *session, const void *prefs_account, gboolean is_smtp)
 {
        session->type = SESSION_UNKNOWN;
        session->sock = NULL;
        session->server = NULL;
        session->port = 0;
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
        session->ssl_type = SSL_NONE;
 #endif
        session->nonblocking = TRUE;
@@ -97,6 +98,10 @@ void session_init(Session *session)
        session->timeout_interval = 0;
 
        session->data = NULL;
+       session->account = prefs_account;
+       session->is_smtp = is_smtp;
+
+       session->ping_tag = -1;
 }
 
 /*!
@@ -123,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;
        }
 
@@ -137,8 +144,11 @@ 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;
 
        return session_connect_cb(sock, session);
 #endif
@@ -153,23 +163,40 @@ 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 (defined(USE_OPENSSL) || defined (USE_GNUTLS))
        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;
                }
        }
 #endif
 
+       /* we could have gotten a timeout while waiting for user input in 
+        * an SSL certificate dialog */
+       if (session->state == SESSION_TIMEOUT) {
+               if (session->connect_finished)
+                       session->connect_finished(session, FALSE);
+               return -1;
+       }
+
        sock_set_nonblocking_mode(sock, session->nonblocking);
 
        debug_print("session (%p): connected\n", session);
@@ -179,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;
 }
 
@@ -202,8 +231,10 @@ gint session_disconnect(Session *session)
  */
 void session_destroy(Session *session)
 {
-       g_return_if_fail(session != NULL);
-       g_return_if_fail(session->destroy != NULL);
+       cm_return_if_fail(session != NULL);
+       cm_return_if_fail(session->destroy != NULL);
+
+       session_register_ping(session, NULL);
 
        session_close(session);
        session->destroy(session);
@@ -212,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);
@@ -236,10 +276,14 @@ void session_set_timeout(Session *session, guint interval)
                g_source_remove(session->timeout_tag);
 
        session->timeout_interval = interval;
-       if (interval > 0)
-               session->timeout_tag =
-                       g_timeout_add(interval, session_timeout_cb, session);
-       else
+       if (interval > 0) {
+               if (interval % 1000 == 0)
+                       session->timeout_tag =
+                               g_timeout_add_seconds(interval/1000, session_timeout_cb, session);
+               else
+                       session->timeout_tag =
+                               g_timeout_add(interval, session_timeout_cb, session);
+       } else
                session->timeout_tag = 0;
 }
 
@@ -247,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);
@@ -308,7 +352,7 @@ void session_set_send_data_notify(Session *session, SendDataNotify notify_func,
  */
 static gint session_close(Session *session)
 {
-       g_return_val_if_fail(session != NULL, -1);
+       cm_return_val_if_fail(session != NULL, -1);
 
 #ifdef G_OS_UNIX
        if (session->conn_id > 0) {
@@ -335,20 +379,23 @@ static gint session_close(Session *session)
        return 0;
 }
 
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
 gint session_start_tls(Session *session)
 {
        gboolean nb_mode;
 
        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, TRUE);
+                       sock_set_nonblocking_mode(session->sock, session->nonblocking);
                return -1;
        }
 
@@ -359,13 +406,13 @@ 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;
 
-       g_return_val_if_fail(session->write_buf == NULL, -1);
-       g_return_val_if_fail(msg != NULL, -1);
-       g_return_val_if_fail(msg[0] != '\0', -1);
+       cm_return_val_if_fail(session->write_buf == NULL, -1);
+       cm_return_val_if_fail(msg != NULL, -1);
+       cm_return_val_if_fail(msg[0] != '\0', -1);
 
        session->state = SESSION_SEND;
        session->write_buf = g_strconcat(msg, "\r\n", NULL);
@@ -385,7 +432,7 @@ gint session_send_msg(Session *session, SessionMsgType type, const gchar *msg)
 
 gint session_recv_msg(Session *session)
 {
-       g_return_val_if_fail(session->read_msg_buf->len == 0, -1);
+       cm_return_val_if_fail(session->read_msg_buf->len == 0, -1);
 
        session->state = SESSION_RECV;
 
@@ -426,9 +473,9 @@ gint session_send_data(Session *session, const guchar *data, guint size)
 {
        gboolean ret;
 
-       g_return_val_if_fail(session->write_data == NULL, -1);
-       g_return_val_if_fail(data != NULL, -1);
-       g_return_val_if_fail(size != 0, -1);
+       cm_return_val_if_fail(session->write_data == NULL, -1);
+       cm_return_val_if_fail(data != NULL, -1);
+       cm_return_val_if_fail(size != 0, -1);
 
        session->state = SESSION_SEND;
 
@@ -451,7 +498,7 @@ gint session_send_data(Session *session, const guchar *data, guint size)
 
 gint session_recv_data(Session *session, guint size, const gchar *terminator)
 {
-       g_return_val_if_fail(session->read_data_buf->len == 0, -1);
+       cm_return_val_if_fail(session->read_data_buf->len == 0, -1);
 
        session->state = SESSION_RECV;
 
@@ -492,18 +539,19 @@ static gboolean session_read_msg_cb(SockInfo *source, GIOCondition condition,
        gchar *msg;
        gint ret;
 
-       g_return_val_if_fail(condition == G_IO_IN, FALSE);
+       cm_return_val_if_fail(condition == G_IO_IN, FALSE);
 
        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;
@@ -512,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;
                }
@@ -522,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;
                        }
@@ -587,7 +635,7 @@ static gboolean session_read_data_cb(SockInfo *source, GIOCondition condition,
        guint data_len;
        gint ret;
 
-       g_return_val_if_fail(condition == G_IO_IN, FALSE);
+       cm_return_val_if_fail(condition == G_IO_IN, FALSE);
 
        session_set_timeout(session, session->timeout_interval);
 
@@ -598,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;
                }
@@ -608,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;
                        }
@@ -687,9 +735,9 @@ static gint session_write_buf(Session *session)
        gint write_len;
        gint to_write_len;
 
-       g_return_val_if_fail(session->write_buf != NULL, -1);
-       g_return_val_if_fail(session->write_buf_p != NULL, -1);
-       g_return_val_if_fail(session->write_buf_len > 0, -1);
+       cm_return_val_if_fail(session->write_buf != NULL, -1);
+       cm_return_val_if_fail(session->write_buf_p != NULL, -1);
+       cm_return_val_if_fail(session->write_buf_len > 0, -1);
 
        to_write_len = session->write_buf_len -
                (session->write_buf_p - session->write_buf);
@@ -704,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;
                }
@@ -730,9 +778,9 @@ static gint session_write_data(Session *session)
        gint write_len;
        gint to_write_len;
 
-       g_return_val_if_fail(session->write_data != NULL, -1);
-       g_return_val_if_fail(session->write_data_p != NULL, -1);
-       g_return_val_if_fail(session->write_data_len > 0, -1);
+       cm_return_val_if_fail(session->write_data != NULL, -1);
+       cm_return_val_if_fail(session->write_data_p != NULL, -1);
+       cm_return_val_if_fail(session->write_data_len > 0, -1);
 
        to_write_len = session->write_data_len -
                (session->write_data_p - session->write_data);
@@ -747,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;
                }
@@ -773,10 +821,10 @@ static gboolean session_write_msg_cb(SockInfo *source, GIOCondition condition,
        Session *session = SESSION(data);
        gint ret;
 
-       g_return_val_if_fail(condition == G_IO_OUT, FALSE);
-       g_return_val_if_fail(session->write_buf != NULL, FALSE);
-       g_return_val_if_fail(session->write_buf_p != NULL, FALSE);
-       g_return_val_if_fail(session->write_buf_len > 0, FALSE);
+       cm_return_val_if_fail(condition == G_IO_OUT, FALSE);
+       cm_return_val_if_fail(session->write_buf != NULL, FALSE);
+       cm_return_val_if_fail(session->write_buf_p != NULL, FALSE);
+       cm_return_val_if_fail(session->write_buf_len > 0, FALSE);
 
        ret = session_write_buf(session);
 
@@ -803,10 +851,10 @@ static gboolean session_write_data_cb(SockInfo *source,
        guint write_data_len;
        gint ret;
 
-       g_return_val_if_fail(condition == G_IO_OUT, FALSE);
-       g_return_val_if_fail(session->write_data != NULL, FALSE);
-       g_return_val_if_fail(session->write_data_p != NULL, FALSE);
-       g_return_val_if_fail(session->write_data_len > 0, FALSE);
+       cm_return_val_if_fail(condition == G_IO_OUT, FALSE);
+       cm_return_val_if_fail(session->write_data != NULL, FALSE);
+       cm_return_val_if_fail(session->write_data_p != NULL, FALSE);
+       cm_return_val_if_fail(session->write_data_len > 0, FALSE);
 
        write_data_len = session->write_data_len;
 
@@ -845,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);
+}