#include <imap.h>
#include <sys/types.h>
#include <sys/stat.h>
-#if (defined (__NetBSD__) || defined (__FreeBSD__) || defined (__CYGWIN__))
+#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__CYGWIN__))
#include <sys/socket.h>
#endif
#include <fcntl.h>
return TRUE;
}
-void imap_logger(int direction, const char * str, size_t size)
+void imap_logger_cmd(int direction, const char * str, size_t size)
{
- gchar buf[512];
+ gchar *buf;
+ gchar **lines;
+ int i = 0;
+
+ buf = malloc(size+1);
+ memset(buf, 0, size+1);
+ strncpy(buf, str, size);
+ buf[size] = '\0';
- memset(buf, 0, 512);
- strncpy(buf, str, size > 510 ? 510:size);
- buf[511] = '\0';
- if (size < 511)
- buf[size] = '\0';
if (!strncmp(buf, "<<<<<<<", 7)
- || !strncmp(buf, ">>>>>>>", 7)
- || buf[0] == '\r' || buf[0] == '\n')
+ || !strncmp(buf, ">>>>>>>", 7)) {
+ free(buf);
return;
+ }
+ while (strstr(buf, "\r"))
+ *strstr(buf, "\r") = ' ';
+ while (strlen(buf) > 0 && buf[strlen(buf)-1] == '\n')
+ buf[strlen(buf)-1] = '\0';
+
+ lines = g_strsplit(buf, "\n", -1);
+ while (lines[i] && *lines[i]) {
+ log_print("IMAP4%c %s\n", direction?'>':'<', lines[i]);
+ i++;
+ }
+ g_strfreev(lines);
+ free(buf);
+}
+
+void imap_logger_fetch(int direction, const char * str, size_t size)
+{
+ gchar *buf;
+ gchar **lines;
+ int i = 0;
+
+ buf = malloc(size+1);
+ memset(buf, 0, size+1);
+ strncpy(buf, str, size);
+ buf[size] = '\0';
+ if (!strncmp(buf, "<<<<<<<", 7)
+ || !strncmp(buf, ">>>>>>>", 7)) {
+ free(buf);
+ return;
+ }
while (strstr(buf, "\r"))
*strstr(buf, "\r") = ' ';
- while (strstr(buf, "\n"))
- *strstr(buf, "\n") = ' ';
+ while (strlen(buf) > 0 && buf[strlen(buf)-1] == '\n')
+ buf[strlen(buf)-1] = '\0';
+
+ lines = g_strsplit(buf, "\n", -1);
- log_print("IMAP4%c %s\n", direction?'>':'<', buf);
+ if (direction != 0 || (buf[0] == '*' && buf[1] == ' ') || size < 32) {
+ while (lines[i] && *lines[i]) {
+ log_print("IMAP4%c %s\n", direction?'>':'<', lines[i]);
+ i++;
+ }
+ } else {
+ log_print("IMAP4%c [data - %zd bytes]\n", direction?'>':'<', size);
+ }
+ g_strfreev(lines);
+ free(buf);
}
#define ETPAN_DEFAULT_NETWORK_TIMEOUT 60
mailstream_network_delay.tv_usec = 0;
mailstream_debug = 1;
- mailstream_logger = imap_logger;
+ mailstream_logger = imap_logger_cmd;
imap_hash = chash_new(CHASH_COPYKEY, CHASH_DEFAULTSIZE);
session_hash = chash_new(CHASH_COPYKEY, CHASH_DEFAULTSIZE);
return result.error;
}
-static int etpan_certificate_check(unsigned char *certificate, int len, void *data)
+static int etpan_certificate_check(const unsigned char *certificate, int len, void *data)
{
#ifdef USE_OPENSSL
struct connect_param *param = (struct connect_param *)data;
g_warning("no cert presented.\n");
return 0;
}
- cert = d2i_X509(NULL, &certificate, len);
+ cert = d2i_X509(NULL, (unsigned char **) &certificate, len);
if (cert == NULL) {
g_warning("can't get cert\n");
return 0;
goto free_fetch_att;
}
+ mailstream_logger = imap_logger_fetch;
+
r = mailimap_uid_fetch(imap, set,
fetch_type, &fetch_result);
+ mailstream_logger = imap_logger_cmd;
+
mailimap_fetch_type_free(fetch_type);
mailimap_set_free(set);
}
r = mailimap_connect(imap, s);
- if (r != MAILIMAP_NO_ERROR) {
+ if (r != MAILIMAP_NO_ERROR_AUTHENTICATED
+ && r != MAILIMAP_NO_ERROR_NON_AUTHENTICATED) {
mailstream_close(s);
return r;
}
- return MAILIMAP_NO_ERROR;
+ return r;
}
/* connect cmd */