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

email: Moved starttls code in separate functions

Browse Source 
To help maintain the readability of the code in imap.c, pop3.c and
smtp.c moved the starttls code into state_starttls() functions.
This commit is contained in:
Steve Holme
2013-02-06 20:02:36 +00:00
parent 12dbb8aedc
commit de0410fe9a
3 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/smtp.c
View File

@@ -355,6 +355,19 @@ static CURLcode smtp_state_helo(struct connectdata *conn)
return CURLE_OK;
}
static CURLcode smtp_state_starttls(struct connectdata *conn)
{
CURLcode result = CURLE_OK;
/* Send the STARTTLS command */
result = Curl_pp_sendf(&conn->proto.smtpc.pp, "STARTTLS");
if(!result)
state(conn, SMTP_STARTTLS);
return result;
}
static CURLcode smtp_authenticate(struct connectdata *conn)
{
CURLcode result = CURLE_OK;
@@ -545,9 +558,7 @@ static CURLcode smtp_state_ehlo_resp(struct connectdata *conn, int smtpcode,
else if(data->set.use_ssl && !conn->ssl[FIRSTSOCKET].use) {
/* We don't have a SSL/TLS connection yet, but SSL is requested. Switch
to TLS connection now */
result = Curl_pp_sendf(&conn->proto.smtpc.pp, "STARTTLS");
if(!result)
state(conn, SMTP_STARTTLS);
result = smtp_state_starttls(conn);
}
else
result = smtp_authenticate(conn);