Use enum for cutthrough receive processing state.

[exim.git] / src / src / receive.c

diff --git a/src/src/receive.c b/src/src/receive.c
index 4cea6d58ee038f19a11c35a2c01eea328d78df32..48c83db03c4b1bb0cdb6596536ffedc9464574bd 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -13,6 +13,10 @@
 extern int dcc_ok;
 #endif
 
+#ifdef EXPERIMENTAL_DMARC
+#include "dmarc.h"
+#endif /* EXPERIMENTAL_DMARC */
+
 /*************************************************
 *                Local static variables          *
 *************************************************/
@@ -1449,7 +1453,7 @@ BOOL resents_exist = FALSE;
 uschar *resent_prefix = US"";
 uschar *blackholed_by = NULL;
 uschar *blackhole_log_msg = US"";
-int  cutthrough_done = 0;
+enum {NOT_TRIED, TMP_REJ, PERM_REJ, ACCEPTED} cutthrough_done;
 
 flock_t lock_data;
 error_block *bad_addresses = NULL;
@@ -1480,6 +1484,10 @@ header_line *subject_header = NULL;
 header_line *msgid_header = NULL;
 header_line *received_header;
 
+#ifdef EXPERIMENTAL_DMARC
+int dmarc_up = 0;
+#endif /* EXPERIMENTAL_DMARC */
+
 /* Variables for use when building the Received: header. */
 
 uschar *timestamp;
@@ -1536,6 +1544,11 @@ message_linecount = body_linecount = body_zerocount =
 if (smtp_input && !smtp_batched_input && !dkim_disable_verify) dkim_exim_verify_init();
 #endif
 
+#ifdef EXPERIMENTAL_DMARC
+/* initialize libopendmarc */
+dmarc_up = dmarc_init();
+#endif
+
 /* Remember the time of reception. Exim uses time+pid for uniqueness of message
 ids, and fractions of a second are required. See the comments that precede the
 message id creation below. */
@@ -2706,7 +2719,6 @@ if (from_header != NULL &&
     }
   }
 
-
 /* If there are any rewriting rules, apply them to the sender address, unless
 it has already been rewritten as part of verification for SMTP input. */
 
@@ -3247,6 +3259,10 @@ else
       goto TIDYUP;
 #endif /* WITH_CONTENT_SCAN */
 
+#ifdef EXPERIMENTAL_DMARC
+    dmarc_up = dmarc_store_data(from_header);
+#endif /* EXPERIMENTAL_DMARC */
+
 #ifdef EXPERIMENTAL_PRDR
     if (prdr_requested && recipients_count > 1 && acl_smtp_data_prdr != NULL )
       {
@@ -3932,7 +3948,7 @@ for this message. */
 
    XXX We do not handle queue-only, freezing, or blackholes.
 */
-cutthrough_done = 0;
+cutthrough_done = NOT_TRIED;
 if(cutthrough_fd >= 0)
   {
   uschar * msg= cutthrough_finaldot(); /* Ask the target system to accept the messsage */
@@ -3940,17 +3956,17 @@ if(cutthrough_fd >= 0)
   switch(msg[0])
     {
     case '2':  /* Accept. Do the same to the source; dump any spoolfiles.   */
-      cutthrough_done = 3;
+      cutthrough_done = ACCEPTED;
       break;                                   /* message_id needed for SMTP accept below */
 
     default:   /* Unknown response, or error.  Treat as temp-reject.         */
     case '4':  /* Temp-reject. Keep spoolfiles and accept. */
-      cutthrough_done = 1;                     /* Avoid the usual immediate delivery attempt */
+      cutthrough_done = TMP_REJ;               /* Avoid the usual immediate delivery attempt */
       break;                                   /* message_id needed for SMTP accept below */
 
     case '5':  /* Perm-reject.  Do the same to the source.  Dump any spoolfiles */
       smtp_reply= msg;         /* Pass on the exact error */
-      cutthrough_done = 2;
+      cutthrough_done = PERM_REJ;
       break;
     }
   }
@@ -4064,8 +4080,8 @@ if (smtp_input)
 
     switch (cutthrough_done)
       {
-      case 3: log_write(0, LOG_MAIN, "Completed");     /* Delivery was done */
-      case 2: {                                                /* Delete spool files */
+      case ACCEPTED: log_write(0, LOG_MAIN, "Completed");/* Delivery was done */
+      case PERM_REJ: {                                 /* Delete spool files */
              sprintf(CS spool_name, "%s/input/%s/%s-D", spool_directory,
                message_subdir, message_id);
              Uunlink(spool_name);
@@ -4076,7 +4092,7 @@ if (smtp_input)
                message_subdir, message_id);
              Uunlink(spool_name);
              }
-      case 1: message_id[0] = 0;                       /* Prevent a delivery from starting */
+      case TMP_REJ: message_id[0] = 0;   /* Prevent a delivery from starting */
       default:break;
       }
     cutthrough_delivery = FALSE;