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
TLS: rework client-side use with an explicit context rather than a global
[exim.git]
/
src
/
src
/
transports
/
smtp.h
diff --git
a/src/src/transports/smtp.h
b/src/src/transports/smtp.h
index 88b608bcc54130584c3be36f9345a7a01ea814cb..a33ef437f7940bf8a143a12d2b6230734f3b7f82 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
7
*/
+/* 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
@@
-90,6
+91,9
@@
typedef struct {
#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 connect context */
} smtp_transport_options_block;
/* smtp connect context */
@@
-115,7
+119,7
@@
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)
+#if defined(SUPPORT_TLS) && defined(
SUPPORT
_DANE)
BOOL dane:1;
BOOL dane_required:1;
#endif
BOOL dane:1;
BOOL dane_required:1;
#endif
@@
-130,6
+134,7
@@
typedef struct {
int cmd_count;
uschar peer_offered;
int cmd_count;
uschar peer_offered;
+ uschar avoid_option;
uschar * igquotstr;
uschar * helo_data;
#ifdef EXPERIMENTAL_DSN_INFO
uschar * igquotstr;
uschar * helo_data;
#ifdef EXPERIMENTAL_DSN_INFO
@@
-141,8
+146,9
@@
typedef struct {
address_item * next_addr;
address_item * sync_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];