diff options
author | Steve Holme <steve_holme@hotmail.com> | 2013-02-06 20:02:36 +0000 |
---|---|---|
committer | Steve Holme <steve_holme@hotmail.com> | 2013-02-06 20:02:36 +0000 |
commit | de0410fe9a6f8d5d24a90c12b0e7a335ad6a26b9 (patch) | |
tree | b862341116c7a30a14a03715a064baba5f5eb7bc /lib/pop3.c | |
parent | 12dbb8aedc67c1e0df35964f8c151e487fc78f7f (diff) |
email: Moved starttls code in separate functions
To help maintain the readability of the code in imap.c, pop3.c and
smtp.c moved the starttls code into state_starttls() functions.
Diffstat (limited to 'lib/pop3.c')
-rw-r--r-- | lib/pop3.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/lib/pop3.c b/lib/pop3.c index f0c6155c0..a268d399c 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -372,6 +372,19 @@ static void state(struct connectdata *conn, pop3state newstate) pop3c->state = newstate; } +static CURLcode pop3_state_starttls(struct connectdata *conn) +{ + CURLcode result = CURLE_OK; + + /* Send the STLS command */ + result = Curl_pp_sendf(&conn->proto.pop3c.pp, "STLS"); + + if(!result) + state(conn, POP3_STARTTLS); + + return result; +} + static CURLcode pop3_state_capa(struct connectdata *conn) { CURLcode result = CURLE_OK; @@ -541,7 +554,6 @@ static CURLcode pop3_state_servergreet_resp(struct connectdata *conn, { CURLcode result = CURLE_OK; struct SessionHandle *data = conn->data; - struct pop3_conn *pop3c = &conn->proto.pop3c; (void)instate; /* no use for this yet */ @@ -553,9 +565,7 @@ static CURLcode pop3_state_servergreet_resp(struct connectdata *conn, 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(&pop3c->pp, "STLS"); - if(!result) - state(conn, POP3_STARTTLS); + result = pop3_state_starttls(conn); } else result = pop3_state_capa(conn); |