Delivery: quieten smtp transport conn reuse vs. delivery race. Bug 1810

[users/jgh/exim.git] / src / src / transports / smtp.h

diff --git a/src/src/transports/smtp.h b/src/src/transports/smtp.h
index 6912ad83e260d25aaa615876e592061228bb149b..07b601a969f246e37a1a2f21e29fe46403763467 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 - 2014 */
+/* Copyright (c) University of Cambridge 1995 - 2015 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Private structure for the private options and other private data. */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Private structure for the private options and other private data. */


@@ -21,10 +21,15 @@ typedef struct {
   uschar *serialize_hosts;
   uschar *hosts_try_auth;
   uschar *hosts_require_auth;
   uschar *serialize_hosts;
   uschar *hosts_try_auth;
   uschar *hosts_require_auth;

-#ifdef EXPERIMENTAL_PRDR
+#ifdef EXPERIMENTAL_DANE
+  uschar *hosts_try_dane;
+  uschar *hosts_require_dane;
+#endif
+#ifndef DISABLE_PRDR

   uschar *hosts_try_prdr;
 #endif
   uschar *hosts_try_prdr;
 #endif

-#ifdef EXPERIMENTAL_OCSP
+#ifndef DISABLE_OCSP
+  uschar *hosts_request_ocsp;

   uschar *hosts_require_ocsp;
 #endif
   uschar *hosts_require_tls;
   uschar *hosts_require_ocsp;
 #endif
   uschar *hosts_require_tls;


@@ -46,15 +51,18 @@ typedef struct {
   BOOL    gethostbyname;
   BOOL    dns_qualify_single;
   BOOL    dns_search_parents;
   BOOL    gethostbyname;
   BOOL    dns_qualify_single;
   BOOL    dns_search_parents;

-  uschar *dnssec_request_domains;
-  uschar *dnssec_require_domains;
+  dnssec_domains dnssec;

   BOOL    delay_after_cutoff;
   BOOL    hosts_override;
   BOOL    hosts_randomize;
   BOOL    keepalive;
   BOOL    lmtp_ignore_quota;
   BOOL    delay_after_cutoff;
   BOOL    hosts_override;
   BOOL    hosts_randomize;
   BOOL    keepalive;
   BOOL    lmtp_ignore_quota;

+  uschar *expand_retry_include_ip_address;

   BOOL    retry_include_ip_address;
   BOOL    retry_include_ip_address;

-  #ifdef SUPPORT_TLS
+#ifdef SUPPORT_SOCKS
+  uschar *socks_proxy;
+#endif
+#ifdef SUPPORT_TLS

   uschar *tls_certificate;
   uschar *tls_crl;
   uschar *tls_privatekey;
   uschar *tls_certificate;
   uschar *tls_crl;
   uschar *tls_privatekey;


@@ -68,18 +76,16 @@ typedef struct {
   BOOL    tls_tempfail_tryclear;
   uschar *tls_verify_hosts;
   uschar *tls_try_verify_hosts;
   BOOL    tls_tempfail_tryclear;
   uschar *tls_verify_hosts;
   uschar *tls_try_verify_hosts;

-  #endif
-  #ifndef DISABLE_DKIM
+  uschar *tls_verify_cert_hostnames;
+#endif
+#ifndef DISABLE_DKIM

   uschar *dkim_domain;
   uschar *dkim_private_key;
   uschar *dkim_selector;
   uschar *dkim_canon;
   uschar *dkim_sign_headers;
   uschar *dkim_strict;
   uschar *dkim_domain;
   uschar *dkim_private_key;
   uschar *dkim_selector;
   uschar *dkim_canon;
   uschar *dkim_sign_headers;
   uschar *dkim_strict;

-  #endif
-  #ifdef EXPERIMENTAL_TPDA
-  uschar *tpda_host_defer_action;
-  #endif
+#endif

 } smtp_transport_options_block;
 
 /* Data for reading the private options. */
 } smtp_transport_options_block;
 
 /* Data for reading the private options. */


@@ -105,4 +111,9 @@ extern int     smtp_auth(uschar *, unsigned, address_item *, host_item *,
 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 *);
 

+#ifdef SUPPORT_SOCKS
+extern int     socks_sock_connect(host_item *, int, int, uschar *,
+                transport_instance *, int);
+#endif
+

 /* End of transports/smtp.h */
 /* End of transports/smtp.h */