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

protocols: use CURLPROTO_ internally

Browse Source 
The PROT_* set of internal defines for the protocols is no longer
used. We now use the same bits internally as we have defined in the
public header using the CURLPROTO_ prefix. This is for simplicity and
because the PROT_* prefix was already used duplicated internally for a
set of KRB4 values.

The PROTOPT_* defines were moved up to just below the struct definition
within which they are used.
This commit is contained in:
Daniel Stenberg
2011-03-14 22:52:14 +01:00
parent 8831000bc0
commit 13b64d7558
18 changed files with 94 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/smtp.c
View File

@@ -135,7 +135,7 @@ const struct Curl_handler Curl_handler_smtp = {
ZERO_NULL, /* perform_getsock */
smtp_disconnect, /* disconnect */
PORT_SMTP, /* defport */
PROT_SMTP, /* protocol */
CURLPROTO_SMTP, /* protocol */
PROTOPT_CLOSEACTION /* flags */
};
@@ -159,7 +159,7 @@ const struct Curl_handler Curl_handler_smtps = {
ZERO_NULL, /* perform_getsock */
smtp_disconnect, /* disconnect */
PORT_SMTPS, /* defport */
PROT_SMTP | PROT_SMTPS, /* protocol */
CURLPROTO_SMTP | CURLPROTO_SMTPS, /* protocol */
PROTOPT_CLOSEACTION | PROTOPT_SSL /* flags */
};
#endif
@@ -183,7 +183,7 @@ static const struct Curl_handler Curl_handler_smtp_proxy = {
ZERO_NULL, /* perform_getsock */
ZERO_NULL, /* disconnect */
PORT_SMTP, /* defport */
PROT_HTTP, /* protocol */
CURLPROTO_HTTP, /* protocol */
PROTOPT_NONE /* flags */
};
@@ -207,7 +207,7 @@ static const struct Curl_handler Curl_handler_smtps_proxy = {
ZERO_NULL, /* perform_getsock */
ZERO_NULL, /* disconnect */
PORT_SMTPS, /* defport */
PROT_HTTP, /* protocol */
CURLPROTO_HTTP, /* protocol */
PROTOPT_NONE /* flags */
};
#endif
@@ -1105,7 +1105,7 @@ static CURLcode smtp_connect(struct connectdata *conn,
}
#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_PROXY */
if(conn->handler->protocol & PROT_SMTPS) {
if(conn->handler->protocol & CURLPROTO_SMTPS) {
/* BLOCKING */
/* SMTPS is simply smtp with SSL for the control channel */
/* now, perform the SSL initialization for this socket */