git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PIPE_CONNECT: promote from experimental
[exim.git]
/
src
/
src
/
transports
/
smtp.h
diff --git
a/src/src/transports/smtp.h
b/src/src/transports/smtp.h
index 7127fe31f9145086429bd9f90d7c78e3f3238464..79d674fa1ed556fd7664b1a1b0e2983bcbc27cd5 100644
(file)
--- a/
src/src/transports/smtp.h
+++ b/
src/src/transports/smtp.h
@@
-46,8
+46,11
@@
typedef struct {
uschar *hosts_avoid_tls;
uschar *hosts_verify_avoid_tls;
uschar *hosts_avoid_pipelining;
uschar *hosts_avoid_tls;
uschar *hosts_verify_avoid_tls;
uschar *hosts_avoid_pipelining;
+#ifdef SUPPORT_PIPE_CONNECT
+ uschar *hosts_pipe_connect;
+#endif
uschar *hosts_avoid_esmtp;
uschar *hosts_avoid_esmtp;
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
uschar *hosts_nopass_tls;
uschar *hosts_noproxy_tls;
#endif
uschar *hosts_nopass_tls;
uschar *hosts_noproxy_tls;
#endif
@@
-75,11
+78,14
@@
typedef struct {
#ifdef SUPPORT_SOCKS
uschar *socks_proxy;
#endif
#ifdef SUPPORT_SOCKS
uschar *socks_proxy;
#endif
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
uschar *tls_certificate;
uschar *tls_crl;
uschar *tls_privatekey;
uschar *tls_require_ciphers;
uschar *tls_certificate;
uschar *tls_crl;
uschar *tls_privatekey;
uschar *tls_require_ciphers;
+# ifdef EXPERIMENTAL_TLS_RESUME
+ uschar *tls_resumption_hosts;
+# endif
uschar *tls_sni;
uschar *tls_verify_certificates;
int tls_dh_min_bits;
uschar *tls_sni;
uschar *tls_verify_certificates;
int tls_dh_min_bits;
@@
-99,20
+105,26
@@
typedef struct {
#endif
} smtp_transport_options_block;
#endif
} smtp_transport_options_block;
+#define SOB (smtp_transport_options_block *)
+
+
/* smtp connect context */
typedef struct {
uschar * from_addr;
address_item * addrlist;
/* smtp connect context */
typedef struct {
uschar * from_addr;
address_item * addrlist;
- host_item * host;
-
int host_af
;
+
+
smtp_connect_args conn_args
;
int port;
int port;
- uschar * interface;
BOOL verify:1;
BOOL lmtp:1;
BOOL smtps:1;
BOOL ok:1;
BOOL setting_up:1;
BOOL verify:1;
BOOL lmtp:1;
BOOL smtps:1;
BOOL ok:1;
BOOL setting_up:1;
+#ifdef SUPPORT_PIPE_CONNECT
+ BOOL early_pipe_ok:1;
+ BOOL early_pipe_active:1;
+#endif
BOOL esmtp:1;
BOOL esmtp_sent:1;
BOOL pipelining_used:1;
BOOL esmtp:1;
BOOL esmtp_sent:1;
BOOL pipelining_used:1;
@@
-123,9
+135,12
@@
typedef struct {
BOOL utf8_needed:1;
#endif
BOOL dsn_all_lasthop:1;
BOOL utf8_needed:1;
#endif
BOOL dsn_all_lasthop:1;
-#if defined(SUPPORT_TLS) && defined(SUPPORT_DANE)
- BOOL dane:1;
+#if !defined(DISABLE_TLS) && defined(SUPPORT_DANE)
BOOL dane_required:1;
BOOL dane_required:1;
+#endif
+#ifdef SUPPORT_PIPE_CONNECT
+ BOOL pending_BANNER:1;
+ BOOL pending_EHLO:1;
#endif
BOOL pending_MAIL:1;
BOOL pending_BDAT:1;
#endif
BOOL pending_MAIL:1;
BOOL pending_BDAT:1;
@@
-145,6
+160,9
@@
typedef struct {
uschar * smtp_greeting;
uschar * helo_response;
#endif
uschar * smtp_greeting;
uschar * helo_response;
#endif
+#ifdef SUPPORT_PIPE_CONNECT
+ ehlo_resp_precis ehlo_resp;
+#endif
address_item * first_addr;
address_item * next_addr;
address_item * first_addr;
address_item * next_addr;
@@
-156,13
+174,11
@@
typedef struct {
uschar buffer[DELIVER_BUFFER_SIZE];
uschar inbuffer[4096];
uschar outbuffer[4096];
uschar buffer[DELIVER_BUFFER_SIZE];
uschar inbuffer[4096];
uschar outbuffer[4096];
-
- transport_instance * tblock;
- smtp_transport_options_block * ob;
} smtp_context;
extern int smtp_setup_conn(smtp_context *, BOOL);
extern int smtp_write_mail_and_rcpt_cmds(smtp_context *, int *);
} smtp_context;
extern int smtp_setup_conn(smtp_context *, BOOL);
extern int smtp_write_mail_and_rcpt_cmds(smtp_context *, int *);
+extern int smtp_reap_early_pipe(smtp_context *, int *);
/* Data for reading the private options. */
/* Data for reading the private options. */
@@
-182,9
+198,6
@@
extern void smtp_transport_closedown(transport_instance *);
-extern int smtp_auth(uschar *, unsigned, address_item *, host_item *,
- smtp_transport_options_block *, BOOL,
- smtp_inblock *, smtp_outblock *);
extern BOOL smtp_mail_auth_str(uschar *, unsigned,
address_item *, smtp_transport_options_block *);
extern BOOL smtp_mail_auth_str(uschar *, unsigned,
address_item *, smtp_transport_options_block *);