DeforaOS/Mailer
DeforaOS/Mailer
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Improving SSL support

Browse Source
This commit is contained in:
Pierre Pronchery 2011-09-15 11:01:46 +00:00
parent cd56aa22d7
commit e0fd6cdd6e
1 changed files with 54 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/account/imap4.c
View File

@ -562,7 +562,7 @@ static int _context_list(AccountPlugin * plugin, char const * answer)
AccountFolder * parent = cmd->data.list.parent; AccountFolder * parent = cmd->data.list.parent;
char const * p; char const * p;
gchar * q; gchar * q;
char const haschildren[] = "(\\HasChildren) "; char const haschildren[] = "\\HasChildren";
int recurse = 0; int recurse = 0;
char reference = '\0'; char reference = '\0';
char buf[64]; char buf[64];
@ -576,12 +576,19 @@ static int _context_list(AccountPlugin * plugin, char const * answer)
if(strncmp("LIST ", p, 5) != 0) if(strncmp("LIST ", p, 5) != 0)
return -1; return -1;
p += 5; p += 5;
if(*p == '(') /* skip flags */ if(*p == '(') /* parse flags */
{ {
/* FIXME there may be other flags set */ for(p++; *p != '\0' && *p != ')'; p++)
if(strncmp(p, haschildren, sizeof(haschildren) - 1) == 0) if(*p != '\\')
recurse = 1; continue;
for(p++; *p != '\0' && *p++ != ')';); else if(strncmp(p, haschildren, sizeof(haschildren) - 1)
== 0) /* FIXME */
{
p += sizeof(haschildren) - 2;
recurse = 1;
}
/* FIXME else skip until end of flag */
p++;
} }
if(*p == ' ') /* skip spaces */ if(*p == ' ') /* skip spaces */
for(p++; *p != '\0' && *p == ' '; p++); for(p++; *p != '\0' && *p == ' '; p++);
@ -859,6 +866,7 @@ static gboolean _on_connect(gpointer data)
struct hostent * he; struct hostent * he;
unsigned short port; unsigned short port;
struct sockaddr_in sa; struct sockaddr_in sa;
int res;
char buf[128]; char buf[128];
#ifdef DEBUG #ifdef DEBUG
@ -895,7 +903,8 @@ static gboolean _on_connect(gpointer data)
sa.sin_addr.s_addr = *((uint32_t*)he->h_addr_list[0]); sa.sin_addr.s_addr = *((uint32_t*)he->h_addr_list[0]);
helper->status(helper->account, "Connecting to %s (%s:%u)", hostname, helper->status(helper->account, "Connecting to %s (%s:%u)", hostname,
inet_ntoa(sa.sin_addr), port); inet_ntoa(sa.sin_addr), port);
if(fcntl(imap4->fd, F_SETFL, O_NONBLOCK) == -1) if((res = fcntl(imap4->fd, F_GETFL)) >= 0
&& fcntl(imap4->fd, F_SETFL, res | O_NONBLOCK) == -1)
helper->error(NULL, strerror(errno), 1); helper->error(NULL, strerror(errno), 1);
if((connect(imap4->fd, (struct sockaddr *)&sa, sizeof(sa)) != 0 if((connect(imap4->fd, (struct sockaddr *)&sa, sizeof(sa)) != 0
&& errno != EINPROGRESS) && errno != EINPROGRESS)
@ -1146,23 +1155,37 @@ static gboolean _on_watch_can_read_ssl(GIOChannel * source,
int cnt; int cnt;
IMAP4Command * cmd; IMAP4Command * cmd;
char buf[128]; char buf[128];
const int inc = 1024; /* FIXME does not work with smaller values */
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s()\n", __func__); fprintf(stderr, "DEBUG: %s()\n", __func__);
#endif #endif
if(condition != G_IO_IN || source != imap4->channel) if(source != imap4->channel)
return FALSE; /* should not happen */ return FALSE; /* should not happen */
if((p = realloc(imap4->rd_buf, imap4->rd_buf_cnt + 256)) == NULL) if((p = realloc(imap4->rd_buf, imap4->rd_buf_cnt + inc)) == NULL)
return TRUE; /* XXX retries immediately (delay?) */ return TRUE; /* XXX retries immediately (delay?) */
imap4->rd_buf = p; imap4->rd_buf = p;
if((cnt = SSL_read(imap4->ssl, &imap4->rd_buf[imap4->rd_buf_cnt], 256)) if((cnt = SSL_read(imap4->ssl, &imap4->rd_buf[imap4->rd_buf_cnt], inc))
<= 0) <= 0)
{ {
if(cnt < 0) if(cnt < 0 && SSL_get_error(imap4->ssl, cnt)
== SSL_ERROR_WANT_WRITE)
{ {
ERR_error_string(SSL_get_error(imap4->ssl, cnt), buf); imap4->rd_source = g_io_add_watch(imap4->channel,
plugin->helper->error(NULL, buf, 1); G_IO_OUT, _on_watch_can_read_ssl,
plugin);
return FALSE;
} }
else if(cnt < 0 && SSL_get_error(imap4->ssl, cnt)
== SSL_ERROR_WANT_READ)
{
imap4->rd_source = g_io_add_watch(imap4->channel,
G_IO_IN, _on_watch_can_read_ssl,
plugin);
return FALSE;
}
ERR_error_string(SSL_get_error(imap4->ssl, cnt), buf);
plugin->helper->error(NULL, buf, 1);
imap4->rd_source = g_idle_add(_on_reset, plugin); imap4->rd_source = g_idle_add(_on_reset, plugin);
return FALSE; return FALSE;
} }
@ -1269,16 +1292,29 @@ static gboolean _on_watch_can_write_ssl(GIOChannel * source,
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s()\n", __func__); fprintf(stderr, "DEBUG: %s()\n", __func__);
#endif #endif
if(condition != G_IO_OUT || source != imap4->channel if(source != imap4->channel || imap4->queue_cnt == 0
|| imap4->queue_cnt == 0 || cmd->buf_cnt == 0) || cmd->buf_cnt == 0)
return FALSE; /* should not happen */ return FALSE; /* should not happen */
if((cnt = SSL_write(imap4->ssl, cmd->buf, cmd->buf_cnt)) <= 0) if((cnt = SSL_write(imap4->ssl, cmd->buf, cmd->buf_cnt)) <= 0)
{ {
if(cnt < 0) if(cnt < 0 && SSL_get_error(imap4->ssl, cnt)
== SSL_ERROR_WANT_READ)
{ {
ERR_error_string(SSL_get_error(imap4->ssl, cnt), buf); imap4->wr_source = g_io_add_watch(imap4->channel,
plugin->helper->error(NULL, buf, 1); G_IO_IN, _on_watch_can_write_ssl,
plugin);
return FALSE;
} }
else if(cnt < 0 && SSL_get_error(imap4->ssl, cnt)
== SSL_ERROR_WANT_WRITE)
{
imap4->wr_source = g_io_add_watch(imap4->channel,
G_IO_OUT, _on_watch_can_write_ssl,
plugin);
return FALSE;
}
ERR_error_string(SSL_get_error(imap4->ssl, cnt), buf);
plugin->helper->error(NULL, buf, 1);
imap4->wr_source = g_idle_add(_on_reset, plugin); imap4->wr_source = g_idle_add(_on_reset, plugin);
return FALSE; return FALSE;
} }