Use gnutls_priority override for STARTTLS as well.

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

diff --git a/src/common/session.c b/src/common/session.c
index 6e1e2b9d83bf981df84606fbb0265741c5d99825..15d4fba16cbebed946f6f96f233dcd72ba268bf8 100644 (file)
--- a/src/common/session.c
+++ b/src/common/session.c
@@ -165,7 +165,11 @@ static gint session_connect_cb(SockInfo *sock, gpointer data)
        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)) {
@@ -226,6 +230,9 @@ 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);
 
@@ -257,14 +264,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;
 }
@@ -368,10 +373,13 @@ 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)) {
+       if (!ssl_init_socket(session->sock)) {
                g_warning("couldn't start TLS session.\n");
                if (nb_mode)
                        sock_set_nonblocking_mode(session->sock, session->nonblocking);
@@ -523,9 +531,10 @@ 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) {
@@ -882,11 +891,5 @@ void session_register_ping(Session *session, gboolean (*ping_cb)(gpointer data))
        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
+               session->ping_tag = g_timeout_add_seconds(60, ping_cb, session);
 }