generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

IMAP in multi mode: use Curl_ssl_connect_nonblocking() when upgrading the connection to TLS/SSL.

Browse Source
This commit is contained in:
Ben Noordhuis 2011-02-16 00:56:46 +01:00
parent 45ca048f44
commit dd3760f2eb
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/imap.c
View File

@ -108,6 +108,7 @@ static int imap_getsock(struct connectdata *conn,
static CURLcode imap_doing(struct connectdata *conn, static CURLcode imap_doing(struct connectdata *conn,
bool *dophase_done); bool *dophase_done);
static CURLcode imap_setup_connection(struct connectdata * conn); static CURLcode imap_setup_connection(struct connectdata * conn);
static CURLcode imap_state_upgrade_tls(struct connectdata *conn);
/* /*
* IMAP protocol handler. * IMAP protocol handler.
@ -342,17 +343,38 @@ static CURLcode imap_state_starttls_resp(struct connectdata *conn,
result = CURLE_LOGIN_DENIED; result = CURLE_LOGIN_DENIED;
} }
else { else {
/* Curl_ssl_connect is BLOCKING */ if(data->state.used_interface == Curl_if_multi) {
result = Curl_ssl_connect(conn, FIRSTSOCKET); state(conn, IMAP_UPGRADETLS);
if(CURLE_OK == result) { return imap_state_upgrade_tls(conn);
conn->protocol |= PROT_IMAPS; }
result = imap_state_login(conn); else {
result = Curl_ssl_connect(conn, FIRSTSOCKET);
if(CURLE_OK == result) {
conn->protocol |= PROT_IMAPS;
result = imap_state_login(conn);
}
} }
} }
state(conn, IMAP_STOP); state(conn, IMAP_STOP);
return result; return result;
} }
static CURLcode imap_state_upgrade_tls(struct connectdata *conn)
{
struct imap_conn *imapc = &conn->proto.imapc;
CURLcode result;
result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &imapc->ssldone);
if(imapc->ssldone) {
conn->protocol |= PROT_IMAPS;
result = imap_state_login(conn);
state(conn, IMAP_STOP);
}
return result;
}
/* for LOGIN responses */ /* for LOGIN responses */
static CURLcode imap_state_login_resp(struct connectdata *conn, static CURLcode imap_state_login_resp(struct connectdata *conn,
int imapcode, int imapcode,
@ -524,6 +546,10 @@ static CURLcode imap_statemach_act(struct connectdata *conn)
struct pingpong *pp = &imapc->pp; struct pingpong *pp = &imapc->pp;
size_t nread = 0; size_t nread = 0;
/* busy upgrading the connection; right now all I/O is SSL/TLS, not IMAP */
if(imapc->state == IMAP_UPGRADETLS)
return imap_state_upgrade_tls(conn);
if(pp->sendleft) if(pp->sendleft)
return Curl_pp_flushsend(pp); return Curl_pp_flushsend(pp);

1
lib/imap.h
View File

@ -33,6 +33,7 @@ typedef enum {
a connect */ a connect */
IMAP_LOGIN, IMAP_LOGIN,
IMAP_STARTTLS, IMAP_STARTTLS,
IMAP_UPGRADETLS, /* asynchronously upgrade the connection to SSL/TLS (multi mode only) */
IMAP_SELECT, IMAP_SELECT,
IMAP_FETCH, IMAP_FETCH,
IMAP_LOGOUT, IMAP_LOGOUT,