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

Synchronized with IMAP4 support (some SSL fixes)

Browse Source
This commit is contained in:
Pierre Pronchery 2012-10-16 12:37:43 +00:00
parent d6edbc2e0c
commit a80d9f7482
1 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/account/pop3.c
View File

@ -905,7 +905,8 @@ static gboolean _on_watch_can_read_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_IN || source != pop3->channel) if((condition != G_IO_IN && condition != G_IO_OUT)
|| source != pop3->channel)
return FALSE; /* should not happen */ return FALSE; /* should not happen */
if((p = realloc(pop3->rd_buf, pop3->rd_buf_cnt + inc)) == NULL) if((p = realloc(pop3->rd_buf, pop3->rd_buf_cnt + inc)) == NULL)
return TRUE; /* XXX retries immediately (delay?) */ return TRUE; /* XXX retries immediately (delay?) */
@ -913,23 +914,18 @@ static gboolean _on_watch_can_read_ssl(GIOChannel * source,
if((cnt = SSL_read(pop3->ssl, &pop3->rd_buf[pop3->rd_buf_cnt], inc)) if((cnt = SSL_read(pop3->ssl, &pop3->rd_buf[pop3->rd_buf_cnt], inc))
<= 0) <= 0)
{ {
if(cnt < 0 && SSL_get_error(pop3->ssl, cnt) if(SSL_get_error(pop3->ssl, cnt) == SSL_ERROR_WANT_WRITE)
== SSL_ERROR_WANT_WRITE)
{
pop3->rd_source = g_io_add_watch(pop3->channel, pop3->rd_source = g_io_add_watch(pop3->channel,
G_IO_OUT, _on_watch_can_read_ssl, pop3); G_IO_OUT, _on_watch_can_read_ssl, pop3);
return FALSE; else if(SSL_get_error(pop3->ssl, cnt) == SSL_ERROR_WANT_READ)
}
else if(cnt < 0 && SSL_get_error(pop3->ssl, cnt)
== SSL_ERROR_WANT_READ)
{
pop3->rd_source = g_io_add_watch(pop3->channel, G_IO_IN, pop3->rd_source = g_io_add_watch(pop3->channel, G_IO_IN,
_on_watch_can_read_ssl, pop3); _on_watch_can_read_ssl, pop3);
return FALSE; else
} {
ERR_error_string(SSL_get_error(pop3->ssl, cnt), buf); ERR_error_string(SSL_get_error(pop3->ssl, cnt), buf);
pop3->helper->error(NULL, buf, 1); pop3->helper->error(NULL, buf, 1);
pop3->rd_source = g_idle_add(_on_reset, pop3); pop3->rd_source = g_idle_add(_on_reset, pop3);
}
return FALSE; return FALSE;
} }
#ifdef DEBUG #ifdef DEBUG
@ -1033,29 +1029,25 @@ 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 != pop3->channel if((condition != G_IO_OUT && condition != G_IO_IN)
|| pop3->queue_cnt == 0 || cmd->buf_cnt == 0) || source != pop3->channel || pop3->queue_cnt == 0
|| cmd->buf_cnt == 0)
return FALSE; /* should not happen */ return FALSE; /* should not happen */
if((cnt = SSL_write(pop3->ssl, cmd->buf, cmd->buf_cnt)) <= 0) if((cnt = SSL_write(pop3->ssl, cmd->buf, cmd->buf_cnt)) <= 0)
{ {
if(cnt < 0 && SSL_get_error(pop3->ssl, cnt) if(SSL_get_error(pop3->ssl, cnt) == SSL_ERROR_WANT_READ)
== SSL_ERROR_WANT_READ)
{
pop3->wr_source = g_io_add_watch(pop3->channel, G_IO_IN, pop3->wr_source = g_io_add_watch(pop3->channel, G_IO_IN,
_on_watch_can_write_ssl, pop3); _on_watch_can_write_ssl, pop3);
return FALSE; else if(SSL_get_error(pop3->ssl, cnt) == SSL_ERROR_WANT_WRITE)
}
else if(cnt < 0 && SSL_get_error(pop3->ssl, cnt)
== SSL_ERROR_WANT_WRITE)
{
pop3->wr_source = g_io_add_watch(pop3->channel, pop3->wr_source = g_io_add_watch(pop3->channel,
G_IO_OUT, _on_watch_can_write_ssl, G_IO_OUT, _on_watch_can_write_ssl,
pop3); pop3);
return FALSE; else
} {
ERR_error_string(SSL_get_error(pop3->ssl, cnt), buf); ERR_error_string(SSL_get_error(pop3->ssl, cnt), buf);
pop3->helper->error(NULL, buf, 1); pop3->helper->error(NULL, buf, 1);
pop3->wr_source = g_idle_add(_on_reset, pop3); pop3->wr_source = g_idle_add(_on_reset, pop3);
}
return FALSE; return FALSE;
} }
#ifdef DEBUG #ifdef DEBUG