/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2009 DINH Viet Hoa and the Claws Mail team
+ * Copyright (C) 2005-2012 DINH Viet Hoa 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
#ifdef HAVE_LIBETPAN
+#include <glib.h>
+#include <glib/gi18n.h>
#include "imap-thread.h"
#include <imap.h>
#include <sys/types.h>
#include "ssl_certificate.h"
#include "socket.h"
#include "remotefolder.h"
+#include "tags.h"
#define DISABLE_LOG_DURING_LOGIN
static void delete_imap(Folder *folder, mailimap *imap)
{
chashdatum key;
- chashdatum value;
key.data = &folder;
key.len = sizeof(folder);
- value.data = imap;
- value.len = 0;
chash_delete(session_hash, &key, NULL);
key.data = &imap;
mailstream_network_delay.tv_usec = 0;
}
-void imap_main_done(void)
+void imap_main_done(gboolean have_connectivity)
{
- imap_disconnect_all();
+ imap_disconnect_all(have_connectivity);
etpan_thread_manager_stop(thread_manager);
#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
return;
static int etpan_certificate_check(const unsigned char *certificate, int len, void *data)
{
-#ifdef USE_OPENSSL
- struct connect_param *param = (struct connect_param *)data;
- X509 *cert = NULL;
-
- if (certificate == NULL || len < 0) {
- g_warning("no cert presented.\n");
- return 0;
- }
- cert = d2i_X509(NULL, (const unsigned char **)&certificate, len);
- if (cert == NULL) {
- g_warning("IMAP: can't get cert\n");
- return 0;
- } else if (ssl_certificate_check(cert, NULL,
- (gchar *)param->server, (gushort)param->port) == TRUE) {
- X509_free(cert);
- return 0;
- } else {
- X509_free(cert);
- return -1;
- }
-#elif USE_GNUTLS
+#ifdef USE_GNUTLS
struct connect_param *param = (struct connect_param *)data;
gnutls_x509_crt cert = NULL;
gnutls_datum tmp;
if (gnutls_x509_crt_import(cert, &tmp, GNUTLS_X509_FMT_DER) < 0) {
g_warning("IMAP: can't get cert\n");
return 0;
- } else if (ssl_certificate_check(cert, (guint)-1, NULL,
- (gchar *)param->server, (gushort)param->port) == TRUE) {
+ } else if (ssl_certificate_check(cert, (guint)-1, (gchar *)param->server,
+ (gushort)param->port) == TRUE) {
gnutls_x509_crt_deinit(cert);
return 0;
} else {
static void connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context, void * data)
{
-#if (defined(USE_OPENSSL) || defined(USE_GNUTLS))
+#ifdef USE_GNUTLS
PrefsAccount *account = (PrefsAccount *)data;
const gchar *cert_path = NULL;
const gchar *password = NULL;
-#ifdef USE_OPENSSL
- X509 *x509 = NULL;
- EVP_PKEY *pkey = NULL;
-#else
gnutls_x509_crt x509 = NULL;
gnutls_x509_privkey pkey = NULL;
-#endif
if (account->in_ssl_client_cert_file && *account->in_ssl_client_cert_file)
cert_path = account->in_ssl_client_cert_file;
unsigned char *x509_der = NULL, *pkey_der = NULL;
size_t x509_len, pkey_len;
-#ifndef USE_GNUTLS
- x509_len = (size_t)i2d_X509(x509, &x509_der);
- pkey_len = (size_t)i2d_PrivateKey(pkey, &pkey_der);
-#else
x509_len = (size_t)gnutls_i2d_X509(x509, &x509_der);
pkey_len = (size_t)gnutls_i2d_PrivateKey(pkey, &pkey_der);
-#endif
if (x509_len > 0 && pkey_len > 0) {
if (mailstream_ssl_set_client_certificate_data(ssl_context, x509_der, x509_len) < 0 ||
mailstream_ssl_set_client_private_key_data(ssl_context, pkey_der, pkey_len) < 0)
- log_error(LOG_PROTOCOL, "Impossible to set the client certificate.\n");
+ log_error(LOG_PROTOCOL, _("Impossible to set the client certificate.\n"));
g_free(x509_der);
g_free(pkey_der);
}
-#ifdef USE_GNUTLS
gnutls_x509_crt_deinit(x509);
gnutls_x509_privkey_deinit(pkey);
-#endif
}
#endif
}
struct connect_param param;
struct starttls_result result;
int cert_len;
- unsigned char *certificate;
+ unsigned char *certificate = NULL;
debug_print("imap starttls - begin\n");
c_flag = IMAP_FLAG_SEEN;
break;
case MAILIMAP_FLAG_KEYWORD:
- if (!strcasecmp(flag->fl_flag->fl_data.fl_keyword, "$Forwarded"))
+ if (!strcasecmp(flag->fl_flag->fl_data.fl_keyword, RTAG_FORWARDED))
c_flag = IMAP_FLAG_FORWARDED;
- if (!strcasecmp(flag->fl_flag->fl_data.fl_keyword, "Junk"))
+ if (!strcasecmp(flag->fl_flag->fl_data.fl_keyword, RTAG_JUNK))
c_flag = IMAP_FLAG_SPAM;
- if (!strcasecmp(flag->fl_flag->fl_data.fl_keyword, "NonJunk") ||
- !strcasecmp(flag->fl_flag->fl_data.fl_keyword, "NoJunk") ||
- !strcasecmp(flag->fl_flag->fl_data.fl_keyword, "NotJunk"))
+ if (!strcasecmp(flag->fl_flag->fl_data.fl_keyword, RTAG_NON_JUNK) ||
+ !strcasecmp(flag->fl_flag->fl_data.fl_keyword, RTAG_NO_JUNK) ||
+ !strcasecmp(flag->fl_flag->fl_data.fl_keyword, RTAG_NOT_JUNK))
c_flag = IMAP_FLAG_HAM;
break;
default:
case IMAP_SEARCH_TYPE_FORWARDED:
search_type_key = mailimap_search_key_new(MAILIMAP_SEARCH_KEY_KEYWORD,
NULL, NULL, NULL, NULL, NULL,
- strdup("$Forwarded"), NULL, NULL, NULL, NULL,
+ strdup(RTAG_FORWARDED), NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, 0,
NULL, NULL, NULL, NULL, NULL,
NULL, 0, NULL, NULL, NULL);
case IMAP_SEARCH_TYPE_SPAM:
search_type_key = mailimap_search_key_new(MAILIMAP_SEARCH_KEY_KEYWORD,
NULL, NULL, NULL, NULL, NULL,
- strdup("Junk"), NULL, NULL, NULL, NULL,
+ strdup(RTAG_JUNK), NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, 0,
NULL, NULL, NULL, NULL, NULL,
NULL, 0, NULL, NULL, NULL);
flags &= ~MSG_NEW;
break;
case MAILIMAP_FLAG_KEYWORD:
- if (!strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, "$Forwarded"))
+ if (!strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, RTAG_FORWARDED))
flags |= MSG_FORWARDED;
- else if (!strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, "Junk"))
+ else if (!strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, RTAG_JUNK))
flags |= MSG_SPAM;
- else if (!strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, "NonJunk") ||
- !strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, "NoJunk") ||
- !strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, "NotJunk"))
+ else if (!strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, RTAG_NON_JUNK) ||
+ !strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, RTAG_NO_JUNK) ||
+ !strcasecmp(flag_fetch->fl_flag->fl_data.fl_keyword, RTAG_NOT_JUNK))
flags &= ~MSG_SPAM;
else if (s_tags)
tags = g_slist_prepend(tags, g_strdup(flag_fetch->fl_flag->fl_data.fl_keyword));
carray ** p_env_list)
{
clistiter * cur;
- unsigned int i;
carray * env_list;
- i = 0;
env_list = carray_new(16);
if (fetch_result) {
static int imap_add_envelope_fetch_att(struct mailimap_fetch_type * fetch_type)
{
struct mailimap_fetch_att * fetch_att;
- int r;
+ int i;
char * header;
clist * hdrlist;
struct mailimap_header_list * imap_hdrlist;
struct mailimap_section * section;
+ char *headers[] = {
+ "Date", "From", "To", "Cc", "Subject", "Message-ID",
+ "References", "In-Reply-To", NULL
+ };
hdrlist = clist_new();
-
- header = strdup("Date");
- r = clist_append(hdrlist, header);
- header = strdup("From");
- r = clist_append(hdrlist, header);
- header = strdup("To");
- r = clist_append(hdrlist, header);
- header = strdup("Cc");
- r = clist_append(hdrlist, header);
- header = strdup("Subject");
- r = clist_append(hdrlist, header);
- header = strdup("Message-ID");
- r = clist_append(hdrlist, header);
- header = strdup("References");
- r = clist_append(hdrlist, header);
- header = strdup("In-Reply-To");
- r = clist_append(hdrlist, header);
+ i = 0;
+ while (headers[i] != NULL) {
+ header = strdup(headers[i]);
+ if (header == NULL || clist_append(hdrlist, header) != 0)
+ return MAIL_ERROR_MEMORY;
+ ++i;
+ }
imap_hdrlist = mailimap_header_list_new(hdrlist);
section = mailimap_section_new_header_fields(imap_hdrlist);
void imap_main_init(void)
{
}
-void imap_main_done(void)
+void imap_main_done(gboolean have_connectivity)
{
}
void imap_main_set_timeout(int sec)
projects / claws.git / blobdiff