X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/f9ba5e2255cf18092750fffacb6a9603571a2be5..251b9eb4698f569864c35127ddb7c309b92ccecb:/src/src/structs.h

diff --git a/src/src/structs.h b/src/src/structs.h
index c8798e366..b1df408be 100644
--- a/src/src/structs.h
+++ b/src/src/structs.h
@@ -32,6 +32,17 @@ typedef struct gstring {
   uschar * s;		/* The string memory */
 } gstring;
 
+/* Structure for remembering macros for the configuration file */
+
+typedef struct macro_item {
+  struct  macro_item * next;
+  BOOL     	command_line;
+  unsigned	namelen;
+  unsigned	replen;
+  const uschar * name;
+  const uschar * replacement;
+} macro_item;
+
 /* Structure for bit tables for debugging and logging */
 
 typedef struct bit_table {
@@ -409,8 +420,7 @@ typedef struct auth_info {
     uschar *);                    /* rest of AUTH command */
   int (*clientcode)(              /* client function */
     struct auth_instance *,
-    struct smtp_inblock *,        /* socket and input buffer */
-    struct smtp_outblock *,       /* socket and output buffer */
+    void *,			  /* smtp conn, with socket, output and input buffers */
     int,                          /* command timeout */
     uschar *,                     /* buffer for reading response */
     int);                         /* sizeof buffer */
@@ -603,13 +613,14 @@ typedef struct address_item {
     BOOL af_pass_message:1;		/* pass message in bounces */
     BOOL af_bad_reply:1;		/* filter could not generate autoreply */
     BOOL af_tcp_fastopen_conn:1;	/* delivery connection used TCP Fast Open */
-    BOOL af_tcp_fastopen:1;		/* delivery usefuly used TCP Fast Open */
+    BOOL af_tcp_fastopen:1;		/* delivery usefully used TCP Fast Open */
+    BOOL af_pipelining:1;		/* delivery used (traditional) pipelining */
 #ifndef DISABLE_PRDR
     BOOL af_prdr_used:1;		/* delivery used SMTP PRDR */
 #endif
     BOOL af_chunking_used:1;		/* delivery used SMTP CHUNKING */
     BOOL af_force_command:1;		/* force_command in pipe transport */
-#ifdef EXPERIMENTAL_DANE
+#ifdef SUPPORT_DANE
     BOOL af_dane_verified:1;		/* TLS cert verify done with DANE */
 #endif
 #ifdef SUPPORT_I18N
@@ -694,38 +705,6 @@ typedef struct tree_node {
   uschar  name[1];                /* node name - variable length */
 } tree_node;
 
-typedef struct tree_node_64 {
-  struct tree_node_64 *left;      /* pointer to left child */
-  struct tree_node_64 *right;     /* pointer to right child */
-  union
-    {
-    void  *ptr;                   /* pointer to data */
-    int val;                      /* or integer data */
-    } data;
-  uschar  balance;                /* balancing factor */
-  uschar  name[64];               /* node name - bounded length */
-} tree_node_64;
-
-/* Structure for remembering macros for the configuration file */
-
-typedef struct macro_item {
-  BOOL     	command_line;
-  unsigned	namelen;
-  unsigned	replen;
-  unsigned	m_number;
-  tree_node	tnode;		/* contains name; ptr indicates val */
-} macro_item;
-
-typedef struct macro_item_64 {
-  BOOL     	command_line;
-  unsigned	namelen;
-  unsigned	replen;
-  unsigned	m_number;
-  tree_node_64	tnode;		/* contains name; ptr indicates val */
-} macro_item_64;
-
-#define tnode_to_mitem(tp) (tp ? (macro_item *) (CS(tp) - offsetof(macro_item, tnode)) : NULL)
-
 /* Structure for holding time-limited data such as DNS returns.
 We use this rather than extending tree_node to avoid wasting
 space for most tree use (variables...) at the cost of complexity
@@ -801,15 +780,21 @@ md5;
 typedef struct sha1 {
   unsigned int H[5];
   unsigned int length;
-  }
-sha1;
+} sha1;
+
+/* A client-initiated connection. If TLS, the second element is non-NULL */
+typedef struct {
+  int	sock;
+  void * tls_ctx;
+} client_conn_ctx;
+
 
 /* Structure used to hold incoming packets of SMTP responses for a specific
 socket. The packets which may contain multiple lines (and in some cases,
 multiple responses). */
 
 typedef struct smtp_inblock {
-  int     sock;                   /* the socket */
+  client_conn_ctx * cctx;	  /* the connection */
   int     buffersize;             /* the size of the buffer */
   uschar *ptr;                    /* current position in the buffer */
   uschar *ptrend;                 /* end of data in the buffer */
@@ -821,7 +806,7 @@ specific socket. The packets which may contain multiple lines when pipelining
 is in use. */
 
 typedef struct smtp_outblock {
-  int     sock;                   /* the socket */
+  client_conn_ctx * cctx;	  /* the connection */
   int     cmd_count;              /* count of buffered commands */
   int     buffersize;             /* the size of the buffer */
   BOOL    authenticating;         /* TRUE when authenticating */
@@ -899,7 +884,12 @@ struct ob_dkim {
   uschar *dkim_sign_headers;
   uschar *dkim_strict;
   uschar *dkim_hash;
+  uschar *dkim_timestamps;
   BOOL    dot_stuffed;
+  BOOL    force_bodyhash;
+#ifdef EXPERIMENTAL_ARC
+  uschar *arc_signspec;
+#endif
 };
 
 /* End of structs.h */