email: Slight reordering of connection based variables
Reordered the state and ssl_done variables in order to provide more consistency between the email protocols as well as for for an upcoming change.
This commit is contained in:
Родитель
05c03e7edd
Коммит
aa44ec62aa
|
@ -67,12 +67,12 @@ struct IMAP {
|
||||||
struct */
|
struct */
|
||||||
struct imap_conn {
|
struct imap_conn {
|
||||||
struct pingpong pp;
|
struct pingpong pp;
|
||||||
|
imapstate state; /* Always use imap.c:state() to change state! */
|
||||||
|
bool ssldone; /* Is connect() over SSL done? */
|
||||||
unsigned int authmechs; /* Accepted authentication mechanisms */
|
unsigned int authmechs; /* Accepted authentication mechanisms */
|
||||||
unsigned int authused; /* Auth mechanism used for the connection */
|
unsigned int authused; /* Auth mechanism used for the connection */
|
||||||
imapstate state; /* Always use imap.c:state() to change state! */
|
|
||||||
int cmdid; /* Last used command ID */
|
int cmdid; /* Last used command ID */
|
||||||
char resptag[5]; /* Response tag to wait for */
|
char resptag[5]; /* Response tag to wait for */
|
||||||
bool ssldone; /* Is connect() over SSL done? */
|
|
||||||
bool tls_supported; /* StartTLS capability supported by server */
|
bool tls_supported; /* StartTLS capability supported by server */
|
||||||
bool login_disabled; /* LOGIN command disabled by server */
|
bool login_disabled; /* LOGIN command disabled by server */
|
||||||
bool ir_supported; /* Initial response supported by server */
|
bool ir_supported; /* Initial response supported by server */
|
||||||
|
|
|
@ -66,6 +66,8 @@ struct POP3 {
|
||||||
struct */
|
struct */
|
||||||
struct pop3_conn {
|
struct pop3_conn {
|
||||||
struct pingpong pp;
|
struct pingpong pp;
|
||||||
|
pop3state state; /* Always use pop3.c:state() to change state! */
|
||||||
|
bool ssldone; /* Is connect() over SSL done? */
|
||||||
size_t eob; /* Number of bytes of the EOB (End Of Body) that
|
size_t eob; /* Number of bytes of the EOB (End Of Body) that
|
||||||
have been received so far */
|
have been received so far */
|
||||||
size_t strip; /* Number of bytes from the start to ignore as
|
size_t strip; /* Number of bytes from the start to ignore as
|
||||||
|
@ -74,8 +76,6 @@ struct pop3_conn {
|
||||||
unsigned int authmechs; /* Accepted SASL authentication mechanisms */
|
unsigned int authmechs; /* Accepted SASL authentication mechanisms */
|
||||||
unsigned int authused; /* SASL auth mechanism used for the connection */
|
unsigned int authused; /* SASL auth mechanism used for the connection */
|
||||||
char *apoptimestamp; /* APOP timestamp from the server greeting */
|
char *apoptimestamp; /* APOP timestamp from the server greeting */
|
||||||
pop3state state; /* Always use pop3.c:state() to change state! */
|
|
||||||
bool ssldone; /* Is connect() over SSL done? */
|
|
||||||
bool tls_supported; /* StartTLS capability supported by server */
|
bool tls_supported; /* StartTLS capability supported by server */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -66,13 +66,13 @@ struct SMTP {
|
||||||
struct */
|
struct */
|
||||||
struct smtp_conn {
|
struct smtp_conn {
|
||||||
struct pingpong pp;
|
struct pingpong pp;
|
||||||
|
smtpstate state; /* Always use smtp.c:state() to change state! */
|
||||||
|
bool ssldone; /* Is connect() over SSL done? */
|
||||||
char *domain; /* Client address/name to send in the EHLO */
|
char *domain; /* Client address/name to send in the EHLO */
|
||||||
size_t eob; /* Number of bytes of the EOB (End Of Body) that
|
size_t eob; /* Number of bytes of the EOB (End Of Body) that
|
||||||
have been received so far */
|
have been received so far */
|
||||||
unsigned int authmechs; /* Accepted authentication mechanisms */
|
unsigned int authmechs; /* Accepted authentication mechanisms */
|
||||||
unsigned int authused; /* Auth mechanism used for the connection */
|
unsigned int authused; /* Auth mechanism used for the connection */
|
||||||
smtpstate state; /* Always use smtp.c:state() to change state! */
|
|
||||||
bool ssldone; /* Is connect() over SSL done? */
|
|
||||||
bool tls_supported; /* StartTLS capability supported by server */
|
bool tls_supported; /* StartTLS capability supported by server */
|
||||||
bool size_supported; /* If server supports SIZE extension according to
|
bool size_supported; /* If server supports SIZE extension according to
|
||||||
RFC 1870 */
|
RFC 1870 */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче