projects
/
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 f158e701cea6c4e670935f0b9473ed00f5ea6f43..79d674fa1ed556fd7664b1a1b0e2983bcbc27cd5 100644
(file)
--- a/
src/src/transports/smtp.h
+++ b/
src/src/transports/smtp.h
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
5
*/
+/* Copyright (c) University of Cambridge 1995 - 201
8
*/
/* See the file NOTICE for conditions of use and distribution. */
#define DELIVER_BUFFER_SIZE 4096
/* See the file NOTICE for conditions of use and distribution. */
#define DELIVER_BUFFER_SIZE 4096
@@
-29,9
+29,10
@@
typedef struct {
uschar *hosts_try_auth;
uschar *hosts_require_auth;
uschar *hosts_try_chunking;
uschar *hosts_try_auth;
uschar *hosts_require_auth;
uschar *hosts_try_chunking;
-#ifdef
EXPERIMENTAL
_DANE
+#ifdef
SUPPORT
_DANE
uschar *hosts_try_dane;
uschar *hosts_require_dane;
uschar *hosts_try_dane;
uschar *hosts_require_dane;
+ uschar *dane_require_tls_ciphers;
#endif
uschar *hosts_try_fastopen;
#ifndef DISABLE_PRDR
#endif
uschar *hosts_try_fastopen;
#ifndef DISABLE_PRDR
@@
-45,8
+46,14
@@
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;
+#ifndef DISABLE_TLS
uschar *hosts_nopass_tls;
uschar *hosts_nopass_tls;
+ uschar *hosts_noproxy_tls;
+#endif
int command_timeout;
int connect_timeout;
int data_timeout;
int command_timeout;
int connect_timeout;
int data_timeout;
@@
-71,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;
@@
-84,29
+94,40
@@
typedef struct {
uschar *tls_try_verify_hosts;
uschar *tls_verify_cert_hostnames;
#endif
uschar *tls_try_verify_hosts;
uschar *tls_verify_cert_hostnames;
#endif
+#ifdef SUPPORT_I18N
+ uschar *utf8_downconvert;
+#endif
#ifndef DISABLE_DKIM
struct ob_dkim dkim;
#endif
#ifndef DISABLE_DKIM
struct ob_dkim dkim;
#endif
+#ifdef EXPERIMENTAL_ARC
+ uschar *arc_sign;
+#endif
} smtp_transport_options_block;
} 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 lmtp:1;
BOOL smtps:1;
BOOL ok:1;
- BOOL send_rset:1;
- BOOL send_quit:1;
BOOL setting_up: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 esmtp:1;
BOOL esmtp_sent:1;
- BOOL p
ending_MAIL
:1;
+ BOOL p
ipelining_used
:1;
#ifndef DISABLE_PRDR
BOOL prdr_active:1;
#endif
#ifndef DISABLE_PRDR
BOOL prdr_active:1;
#endif
@@
-114,37
+135,50
@@
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(EXPERIMENTAL_DANE)
- BOOL dane:1;
+#if !defined(DISABLE_TLS) && defined(SUPPORT_DANE)
BOOL dane_required:1;
#endif
BOOL dane_required:1;
#endif
- BOOL completed_addr; /* pointer to this used by BDAT callback */
+#ifdef SUPPORT_PIPE_CONNECT
+ BOOL pending_BANNER:1;
+ BOOL pending_EHLO:1;
+#endif
+ BOOL pending_MAIL:1;
+ BOOL pending_BDAT:1;
+ BOOL good_RCPT:1;
+ BOOL completed_addr:1;
+ BOOL send_rset:1;
+ BOOL send_quit:1;
int max_rcpt;
int max_rcpt;
+ int cmd_count;
- uschar peer_offered;
+ unsigned peer_offered;
+ unsigned avoid_option;
uschar * igquotstr;
uschar * helo_data;
#ifdef EXPERIMENTAL_DSN_INFO
uschar * smtp_greeting;
uschar * helo_response;
#endif
uschar * igquotstr;
uschar * helo_data;
#ifdef EXPERIMENTAL_DSN_INFO
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 * sync_addr;
address_item * first_addr;
address_item * next_addr;
address_item * sync_addr;
- smtp_inblock inblock;
- smtp_outblock outblock;
+ client_conn_ctx cctx;
+ smtp_inblock inblock;
+ smtp_outblock outblock;
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;
} smtp_context;
-extern int smtp_setup_conn(smtp_context *, BOOL, BOOL);
+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. */
@@
-164,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 *);