2008-07-05 [colin] 3.5.0cvs8

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

diff --git a/src/common/session.h b/src/common/session.h
index 3f4a0e11a0a8893aa01815f0f4fc400c296445d5..7f0b957a42f2ad82260dea7bc9b635e09bf468e4 100644 (file)
--- a/src/common/session.h
+++ b/src/common/session.h
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifndef __SESSION_H__
@@ -27,7 +27,6 @@
 #include <glib.h>
 
 #include <time.h>
-#include <sys/time.h>
 #include <unistd.h>
 
 #include "socket.h"
@@ -50,6 +49,8 @@ typedef enum {
        SESSION_READY,
        SESSION_SEND,
        SESSION_RECV,
+       SESSION_EOF,
+       SESSION_TIMEOUT,
        SESSION_ERROR,
        SESSION_DISCONNECTED
 } SessionState;
@@ -91,29 +92,42 @@ struct _Session
        gchar *server;
        gushort port;
 
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
        SSLType ssl_type;
 #endif
 
+       gboolean nonblocking;
+
        SessionState state;
 
        time_t last_access_time;
-       struct timeval tv_prev;
+       GTimeVal tv_prev;
 
        gint conn_id;
 
-       /* I/O channel for socket */
-       GIOChannel *sock_ch;
        gint io_tag;
 
-       GString *read_buf;
+       gchar read_buf[SESSION_BUFFSIZE];
+       gchar *read_buf_p;
+       gint read_buf_len;
+
+       GString *read_msg_buf;
        GByteArray *read_data_buf;
        gchar *read_data_terminator;
 
+       /* buffer for short messages */
        gchar *write_buf;
        gchar *write_buf_p;
        gint write_buf_len;
 
+       /* buffer for large data */
+       const guchar *write_data;
+       const guchar *write_data_p;
+       gint write_data_len;
+
+       guint timeout_tag;
+       guint timeout_interval;
+
        gpointer data;
 
        /* virtual methods to parse server responses */
@@ -140,14 +154,25 @@ struct _Session
        gpointer recv_data_notify_data;
        gpointer send_data_progressive_notify_data;
        gpointer send_data_notify_data;
+       
+       const void *account;
+       gboolean is_smtp;
 };
 
-void session_init      (Session        *session);
-gint session_connect   (Session        *session,
-                        const gchar    *server,
-                        gushort         port);
-gint session_disconnect        (Session        *session);
-void session_destroy   (Session        *session);
+void session_init              (Session        *session, 
+                                const void     *prefs_account,
+                                gboolean        is_smtp);
+gint session_connect           (Session        *session,
+                                const gchar    *server,
+                                gushort         port);
+gint session_disconnect                (Session        *session);
+void session_destroy           (Session        *session);
+gboolean session_is_connected  (Session        *session);
+
+void session_set_access_time   (Session        *session);
+
+void session_set_timeout       (Session        *session,
+                                guint           interval);
 
 void session_set_recv_message_notify   (Session        *session,
                                         RecvMsgNotify   notify_func,
@@ -167,7 +192,7 @@ void session_set_send_data_notify   (Session        *session,
                                         SendDataNotify  notify_func,
                                         gpointer        data);
 
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
 gint session_start_tls (Session        *session);
 #endif