/*
* 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
session->data = NULL;
session->account = prefs_account;
session->is_smtp = is_smtp;
+
+ session->ping_tag = -1;
}
/*!
sock->account = session->account;
sock->is_smtp = session->is_smtp;
#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)) {
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);
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);
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) {
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)
+#if GLIB_CHECK_VERSION(2,14,0)
+ session->ping_tag =
+ g_timeout_add_seconds(60, ping_cb, session);
+#else
+ session->ping_tag =
+ g_timeout_add(60*1000, ping_cb, session);
+#endif
+}