Split out smtp_write_mail_and_rcpt_cmds() from smtp_deliver()

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

diff --git a/src/src/transports/smtp.h b/src/src/transports/smtp.h
index e12c0ab946f7572d59636e6b11942ee310e09783..f158e701cea6c4e670935f0b9473ed00f5ea6f43 100644 (file)
--- a/src/src/transports/smtp.h
+++ b/src/src/transports/smtp.h
@@ -91,6 +91,7 @@ typedef struct {
 
 /* smtp connect context */
 typedef struct {
+  uschar *             from_addr;
   address_item *       addrlist;
   host_item *          host;
   int                  host_af;
@@ -117,6 +118,7 @@ typedef struct {
   BOOL dane:1;
   BOOL dane_required:1;
 #endif
+  BOOL completed_addr; /* pointer to this used by BDAT callback */
 
   int          max_rcpt;
 
@@ -128,6 +130,10 @@ typedef struct {
   uschar *     helo_response;
 #endif
 
+  address_item *       first_addr;
+  address_item *       next_addr;
+  address_item *       sync_addr;
+
   smtp_inblock  inblock;
   smtp_outblock outblock;
   uschar       buffer[DELIVER_BUFFER_SIZE];