/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 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
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/types.h>
#include <unistd.h>
-#include <sys/signal.h>
-#include <sys/wait.h>
-#include <sys/time.h>
+#include <time.h>
#include <errno.h>
#include "session.h"
#include "utils.h"
+#include "log.h"
static gint session_connect_cb (SockInfo *sock,
gpointer data);
static gint session_close (Session *session);
-static gboolean session_read_msg_idle_cb (gpointer data);
-static gboolean session_read_data_idle_cb (gpointer data);
+static gboolean session_timeout_cb (gpointer data);
-static gboolean session_read_msg_cb (GIOChannel *source,
+static gboolean session_recv_msg_idle_cb (gpointer data);
+static gboolean session_recv_data_idle_cb (gpointer data);
+
+static gboolean session_read_msg_cb (SockInfo *source,
GIOCondition condition,
gpointer data);
-static gboolean session_read_data_cb (GIOChannel *source,
+static gboolean session_read_data_cb (SockInfo *source,
GIOCondition condition,
gpointer data);
-static gboolean session_write_msg_cb (GIOChannel *source,
+static gboolean session_write_msg_cb (SockInfo *source,
GIOCondition condition,
gpointer data);
-static gboolean session_write_data_cb (GIOChannel *source,
+static gboolean session_write_data_cb (SockInfo *source,
GIOCondition condition,
gpointer data);
#if USE_OPENSSL
session->ssl_type = SSL_NONE;
#endif
+ session->nonblocking = TRUE;
session->state = SESSION_READY;
session->last_access_time = time(NULL);
- gettimeofday(&session->tv_prev, NULL);
+ g_get_current_time(&session->tv_prev);
session->conn_id = 0;
- session->sock_ch = NULL;
session->io_tag = 0;
- session->read_buf = g_string_sized_new(1024);
+ session->read_buf_p = session->read_buf;
+ session->read_buf_len = 0;
+
+ session->read_msg_buf = g_string_sized_new(1024);
session->read_data_buf = g_byte_array_new();
+
session->write_buf = NULL;
session->write_buf_p = NULL;
session->write_buf_len = 0;
+ session->write_data = NULL;
+ session->write_data_p = NULL;
+ session->write_data_len = 0;
+
+ session->timeout_tag = 0;
+ session->timeout_interval = 0;
+
session->data = NULL;
}
*/
gint session_connect(Session *session, const gchar *server, gushort port)
{
+#ifdef G_OS_UNIX
session->server = g_strdup(server);
session->port = port;
}
return 0;
+#else
+ SockInfo *sock;
+
+ session->server = g_strdup(server);
+ session->port = port;
+
+ sock = sock_connect(server, port);
+ if (sock == NULL) {
+ g_warning("can't connect to server.");
+ session_close(session);
+ return -1;
+ }
+
+ return session_connect_cb(sock, session);
+#endif
}
static gint session_connect_cb(SockInfo *sock, gpointer data)
session->sock = sock;
#if USE_OPENSSL
- sock_set_nonblocking_mode(sock, FALSE);
- if (session->ssl_type == SSL_TUNNEL && !ssl_init_socket(sock)) {
- g_warning("can't initialize SSL.");
- session->state = SESSION_ERROR;
- return -1;
+ 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(_("SSL handshake failed\n"));
+ session->state = SESSION_ERROR;
+ return -1;
+ }
}
#endif
- debug_print("session: child: connected\n");
+ sock_set_nonblocking_mode(sock, session->nonblocking);
- debug_print("session: connected\n");
+ debug_print("session (%p): connected\n", session);
session->state = SESSION_RECV;
- session->sock_ch = g_io_channel_unix_new(sock->sock);
- session->io_tag = g_io_add_watch(session->sock_ch, G_IO_IN,
+ session->io_tag = sock_add_watch(session->sock, G_IO_IN,
session_read_msg_cb,
session);
g_return_if_fail(session != NULL);
g_return_if_fail(session->destroy != NULL);
- debug_print("session: session_destroy()\n");
session_close(session);
session->destroy(session);
g_free(session->server);
- g_string_free(session->read_buf, TRUE);
+ g_string_free(session->read_msg_buf, TRUE);
g_byte_array_free(session->read_data_buf, TRUE);
g_free(session->read_data_terminator);
g_free(session->write_buf);
+
+ debug_print("session (%p): destroyed\n", session);
+
g_free(session);
}
+gboolean session_is_connected(Session *session)
+{
+ return (session->state == SESSION_READY ||
+ session->state == SESSION_SEND ||
+ session->state == SESSION_RECV);
+}
+
+void session_set_access_time(Session *session)
+{
+ session->last_access_time = time(NULL);
+}
+
+void session_set_timeout(Session *session, guint interval)
+{
+ if (session->timeout_tag > 0)
+ 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
+ session->timeout_tag = 0;
+}
+
+static gboolean session_timeout_cb(gpointer data)
+{
+ Session *session = SESSION(data);
+
+ g_warning("session timeout.\n");
+
+ if (session->io_tag > 0) {
+ g_source_remove(session->io_tag);
+ session->io_tag = 0;
+ }
+
+ session->timeout_tag = 0;
+ session->state = SESSION_TIMEOUT;
+
+ return FALSE;
+}
+
void session_set_recv_message_notify(Session *session,
RecvMsgNotify notify_func, gpointer data)
{
{
g_return_val_if_fail(session != NULL, -1);
- debug_print("session_close\n");
-
+#ifdef G_OS_UNIX
if (session->conn_id > 0) {
sock_connect_async_cancel(session->conn_id);
session->conn_id = 0;
+ debug_print("session (%p): connection cancelled\n", session);
}
+#endif
+
+ session_set_timeout(session, 0);
if (session->io_tag > 0) {
g_source_remove(session->io_tag);
session->io_tag = 0;
}
- if (session->sock_ch) {
- g_io_channel_unref(session->sock_ch);
- session->sock_ch = NULL;
- }
-
if (session->sock) {
sock_close(session->sock);
session->sock = NULL;
session->state = SESSION_DISCONNECTED;
+ debug_print("session (%p): closed\n", session);
}
return 0;
sock_set_nonblocking_mode(session->sock, FALSE);
if (!ssl_init_socket_with_method(session->sock, SSL_METHOD_TLSv1)) {
- g_warning("can't start TLS session.\n");
+ g_warning("couldn't start TLS session.\n");
if (nb_mode)
sock_set_nonblocking_mode(session->sock, TRUE);
return -1;
}
if (nb_mode)
- sock_set_nonblocking_mode(session->sock, TRUE);
+ sock_set_nonblocking_mode(session->sock, session->nonblocking);
return 0;
}
session->write_buf_p = session->write_buf;
session->write_buf_len = strlen(msg) + 2;
- ret = session_write_msg_cb(session->sock_ch, G_IO_OUT, session);
+ ret = session_write_msg_cb(session->sock, G_IO_OUT, session);
if (ret == TRUE)
- session->io_tag = g_io_add_watch(session->sock_ch, G_IO_OUT,
+ session->io_tag = sock_add_watch(session->sock, G_IO_OUT,
session_write_msg_cb, session);
else if (session->state == SESSION_ERROR)
return -1;
gint session_recv_msg(Session *session)
{
- g_return_val_if_fail(session->read_buf->len == 0, -1);
+ g_return_val_if_fail(session->read_msg_buf->len == 0, -1);
session->state = SESSION_RECV;
- if (sock_has_pending_data(session->sock))
- g_idle_add(session_read_msg_idle_cb, session);
+ if (session->read_buf_len > 0)
+ g_idle_add(session_recv_msg_idle_cb, session);
else
- session->io_tag = g_io_add_watch(session->sock_ch, G_IO_IN,
+ session->io_tag = sock_add_watch(session->sock, G_IO_IN,
session_read_msg_cb, session);
return 0;
}
-static gboolean session_read_msg_idle_cb(gpointer data)
+static gboolean session_recv_msg_idle_cb(gpointer data)
{
Session *session = SESSION(data);
gboolean ret;
- ret = session_read_msg_cb(session->sock_ch, G_IO_IN, data);
+ ret = session_read_msg_cb(session->sock, G_IO_IN, session);
if (ret == TRUE)
- session->io_tag = g_io_add_watch(session->sock_ch, G_IO_IN,
+ session->io_tag = sock_add_watch(session->sock, G_IO_IN,
session_read_msg_cb, session);
return FALSE;
{
gboolean ret;
- g_return_val_if_fail(session->write_buf == NULL, -1);
+ 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);
session->state = SESSION_SEND;
- session->write_buf = g_malloc(size);
- session->write_buf_p = session->write_buf;
- memcpy(session->write_buf, data, size);
- session->write_buf_len = size;
- gettimeofday(&session->tv_prev, NULL);
+ session->write_data = data;
+ session->write_data_p = session->write_data;
+ session->write_data_len = size;
+ g_get_current_time(&session->tv_prev);
- ret = session_write_data_cb(session->sock_ch, G_IO_OUT, session);
+ ret = session_write_data_cb(session->sock, G_IO_OUT, session);
if (ret == TRUE)
- session->io_tag = g_io_add_watch(session->sock_ch, G_IO_OUT,
+ session->io_tag = sock_add_watch(session->sock, G_IO_OUT,
session_write_data_cb,
session);
else if (session->state == SESSION_ERROR)
g_free(session->read_data_terminator);
session->read_data_terminator = g_strdup(terminator);
- gettimeofday(&session->tv_prev, NULL);
+ g_get_current_time(&session->tv_prev);
- if (sock_has_pending_data(session->sock))
- g_idle_add(session_read_data_idle_cb, session);
+ if (session->read_buf_len > 0)
+ g_idle_add(session_recv_data_idle_cb, session);
else
- session->io_tag = g_io_add_watch(session->sock_ch, G_IO_IN,
+ session->io_tag = sock_add_watch(session->sock, G_IO_IN,
session_read_data_cb, session);
return 0;
}
-static gboolean session_read_data_idle_cb(gpointer data)
+static gboolean session_recv_data_idle_cb(gpointer data)
{
Session *session = SESSION(data);
gboolean ret;
- ret = session_read_data_cb(session->sock_ch, G_IO_IN, data);
+ ret = session_read_data_cb(session->sock, G_IO_IN, session);
if (ret == TRUE)
- session->io_tag = g_io_add_watch(session->sock_ch, G_IO_IN,
+ session->io_tag = sock_add_watch(session->sock, G_IO_IN,
session_read_data_cb, session);
return FALSE;
}
-static gboolean session_read_msg_cb(GIOChannel *source, GIOCondition condition,
+static gboolean session_read_msg_cb(SockInfo *source, GIOCondition condition,
gpointer data)
{
Session *session = SESSION(data);
gchar buf[SESSION_BUFFSIZE];
- gint read_len;
- gint to_read_len;
+ gint line_len;
gchar *newline;
gchar *msg;
gint ret;
g_return_val_if_fail(condition == G_IO_IN, FALSE);
- read_len = sock_peek(session->sock, buf, sizeof(buf) - 1);
+ session_set_timeout(session, session->timeout_interval);
- if (read_len < 0) {
- switch (errno) {
- case EAGAIN:
- return TRUE;
- default:
- g_warning("sock_peek: %s\n", g_strerror(errno));
- session->state = SESSION_ERROR;
+ if (session->read_buf_len == 0) {
+ gint read_len;
+
+ 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");
+ if (session->io_tag > 0) {
+ g_source_remove(session->io_tag);
+ session->io_tag = 0;
+ }
+ return FALSE;
+ }
+
+ if (read_len == 0) {
+ g_warning("sock_read: received EOF\n");
+ session->state = SESSION_EOF;
return FALSE;
}
+
+ if (read_len < 0) {
+ switch (errno) {
+ case EAGAIN:
+ return TRUE;
+ default:
+ g_warning("sock_read: %s\n", g_strerror(errno));
+ session->state = SESSION_ERROR;
+ return FALSE;
+ }
+ }
+
+ session->read_buf_len = read_len;
}
- if ((newline = memchr(buf, '\n', read_len)) != NULL)
- to_read_len = newline - buf + 1;
+ if ((newline = memchr(session->read_buf_p, '\n', session->read_buf_len))
+ != NULL)
+ line_len = newline - session->read_buf_p + 1;
else
- to_read_len = read_len;
+ line_len = session->read_buf_len;
- read_len = sock_read(session->sock, buf, to_read_len);
+ if (line_len == 0)
+ return TRUE;
- /* this should always succeed */
- if (read_len < 0) {
- switch (errno) {
- case EAGAIN:
- return TRUE;
- default:
- g_warning("sock_read: %s\n", g_strerror(errno));
- session->state = SESSION_ERROR;
- return FALSE;
- }
- }
+ memcpy(buf, session->read_buf_p, line_len);
+ buf[line_len] = '\0';
- buf[read_len] = '\0';
+ g_string_append(session->read_msg_buf, buf);
+
+ session->read_buf_len -= line_len;
+ if (session->read_buf_len == 0)
+ session->read_buf_p = session->read_buf;
+ else
+ session->read_buf_p += line_len;
/* incomplete read */
- if (read_len == 0 || buf[read_len - 1] != '\n') {
- g_string_append(session->read_buf, buf);
+ if (buf[line_len - 1] != '\n')
return TRUE;
- }
/* complete */
- strretchomp(buf);
- g_string_append(session->read_buf, buf);
-
if (session->io_tag > 0) {
g_source_remove(session->io_tag);
session->io_tag = 0;
}
/* callback */
- msg = g_strdup(session->read_buf->str);
- g_string_truncate(session->read_buf, 0);
+ msg = g_strdup(session->read_msg_buf->str);
+ strretchomp(msg);
+ g_string_truncate(session->read_msg_buf, 0);
ret = session->recv_msg(session, msg);
session->recv_msg_notify(session, msg, session->recv_msg_notify_data);
return FALSE;
}
-static gboolean session_read_data_cb(GIOChannel *source, GIOCondition condition,
+static gboolean session_read_data_cb(SockInfo *source, GIOCondition condition,
gpointer data)
{
Session *session = SESSION(data);
- gchar buf[SESSION_BUFFSIZE];
GByteArray *data_buf;
- gint read_len;
gint terminator_len;
gboolean complete = FALSE;
+ guint data_len;
gint ret;
- gchar *ret_data;
- gint data_len;
g_return_val_if_fail(condition == G_IO_IN, FALSE);
- read_len = sock_read(session->sock, buf, sizeof(buf));
+ session_set_timeout(session, session->timeout_interval);
- if (read_len < 0) {
- switch (errno) {
- case EAGAIN:
- return TRUE;
- default:
- g_warning("sock_read: %s\n", g_strerror(errno));
- session->state = SESSION_ERROR;
+ if (session->read_buf_len == 0) {
+ gint read_len;
+
+ read_len = sock_read(session->sock, session->read_buf,
+ SESSION_BUFFSIZE);
+
+ if (read_len == 0) {
+ g_warning("sock_read: received EOF\n");
+ session->state = SESSION_EOF;
return FALSE;
}
- }
- g_print("session_read_data_cb(): read %d bytes\n", read_len);
+ if (read_len < 0) {
+ switch (errno) {
+ case EAGAIN:
+ return TRUE;
+ default:
+ g_warning("sock_read: %s\n", g_strerror(errno));
+ session->state = SESSION_ERROR;
+ return FALSE;
+ }
+ }
- data_buf = session->read_data_buf;
+ session->read_buf_len = read_len;
+ }
- g_byte_array_append(data_buf, buf, read_len);
+ data_buf = session->read_data_buf;
terminator_len = strlen(session->read_data_terminator);
+ if (session->read_buf_len == 0)
+ return TRUE;
+
+ g_byte_array_append(data_buf, session->read_buf_p,
+ session->read_buf_len);
+
+ session->read_buf_len = 0;
+ session->read_buf_p = session->read_buf;
+
/* check if data is terminated */
- if (read_len > 0 && data_buf->len >= terminator_len) {
+ if (data_buf->len >= terminator_len) {
if (memcmp(data_buf->data, session->read_data_terminator,
terminator_len) == 0)
complete = TRUE;
/* incomplete read */
if (!complete) {
- struct timeval tv_cur;
+ GTimeVal tv_cur;
- gettimeofday(&tv_cur, NULL);
+ g_get_current_time(&tv_cur);
if (tv_cur.tv_sec - session->tv_prev.tv_sec > 0 ||
tv_cur.tv_usec - session->tv_prev.tv_usec >
UI_REFRESH_INTERVAL) {
session->recv_data_progressive_notify
(session, data_buf->len, 0,
session->recv_data_progressive_notify_data);
- gettimeofday(&session->tv_prev, NULL);
+ g_get_current_time(&session->tv_prev);
}
return TRUE;
}
session->io_tag = 0;
}
- /* callback */
- ret_data = g_malloc(data_buf->len);
- memcpy(ret_data, data_buf->data, data_buf->len);
data_len = data_buf->len - terminator_len;
+
+ /* callback */
+ ret = session->recv_data_finished(session, (gchar *)data_buf->data,
+ data_len);
+
g_byte_array_set_size(data_buf, 0);
- ret = session->recv_data_finished(session, ret_data, data_len);
session->recv_data_notify(session, data_len,
session->recv_data_notify_data);
- g_free(ret_data);
-
if (ret < 0)
session->state = SESSION_ERROR;
return 0;
}
-static gboolean session_write_msg_cb(GIOChannel *source, GIOCondition condition,
+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);
+
+ to_write_len = session->write_data_len -
+ (session->write_data_p - session->write_data);
+ to_write_len = MIN(to_write_len, SESSION_BUFFSIZE);
+
+ write_len = sock_write(session->sock, session->write_data_p,
+ to_write_len);
+
+ if (write_len < 0) {
+ switch (errno) {
+ case EAGAIN:
+ write_len = 0;
+ break;
+ default:
+ g_warning("sock_write: %s\n", g_strerror(errno));
+ session->state = SESSION_ERROR;
+ return -1;
+ }
+ }
+
+ /* incomplete write */
+ if (session->write_data_p - session->write_data + write_len <
+ session->write_data_len) {
+ session->write_data_p += write_len;
+ return 1;
+ }
+
+ session->write_data = NULL;
+ session->write_data_p = NULL;
+ session->write_data_len = 0;
+
+ return 0;
+}
+
+static gboolean session_write_msg_cb(SockInfo *source, GIOCondition condition,
gpointer data)
{
Session *session = SESSION(data);
return FALSE;
}
-static gboolean session_write_data_cb(GIOChannel *source,
+static gboolean session_write_data_cb(SockInfo *source,
GIOCondition condition, gpointer data)
{
Session *session = SESSION(data);
- guint write_buf_len;
+ guint write_data_len;
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);
+ 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);
- write_buf_len = session->write_buf_len;
+ write_data_len = session->write_data_len;
- ret = session_write_buf(session);
+ ret = session_write_data(session);
if (ret < 0) {
session->state = SESSION_ERROR;
return FALSE;
} else if (ret > 0) {
- struct timeval tv_cur;
+ GTimeVal tv_cur;
- gettimeofday(&tv_cur, NULL);
+ g_get_current_time(&tv_cur);
if (tv_cur.tv_sec - session->tv_prev.tv_sec > 0 ||
tv_cur.tv_usec - session->tv_prev.tv_usec >
UI_REFRESH_INTERVAL) {
+ session_set_timeout(session, session->timeout_interval);
session->send_data_progressive_notify
(session,
- session->write_buf_p - session->write_buf,
- write_buf_len,
+ session->write_data_p - session->write_data,
+ write_data_len,
session->send_data_progressive_notify_data);
- gettimeofday(&session->tv_prev, NULL);
+ g_get_current_time(&session->tv_prev);
}
return TRUE;
}
}
/* callback */
- ret = session->send_data_finished(session, write_buf_len);
- session->send_data_notify(session, write_buf_len,
+ ret = session->send_data_finished(session, write_data_len);
+ session->send_data_notify(session, write_data_len,
session->send_data_notify_data);
return FALSE;