Revert "Revert "SMTP-Client: make shure everything is finished before we terminate...

[citadel.git] / citadel / modules / smtp / serv_smtpeventclient.c

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index 76b8235a90572cff299cb86e2a636a83fd92f5fc..c8da5590e63b62841f30a3cfccf81331957679bc 100644 (file)
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -106,7 +106,7 @@ void DeleteSmtpOutMsg(void *v)
        FreeURL(&Msg->Relay);
        FreeStrBuf(&Msg->msgtext);
        FreeAsyncIOContents(&Msg->IO);
-///    memset (Msg, 0, sizeof(SmtpOutMsg)); /* just to be shure... */
+       memset (Msg, 0, sizeof(SmtpOutMsg)); /* just to be shure... */
        free(Msg);
 }
 
@@ -117,10 +117,16 @@ eNextState SMTP_C_DispatchReadDone(AsyncIO *IO);
 eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO);
 eNextState SMTP_C_DNSFail(AsyncIO *IO);
 eNextState SMTP_C_Terminate(AsyncIO *IO);
+eNextState SMTP_C_TerminateDB(AsyncIO *IO);
 eReadState SMTP_C_ReadServerStatus(AsyncIO *IO);
 
 eNextState mx_connect_ip(AsyncIO *IO);
 eNextState get_one_mx_host_ip(AsyncIO *IO);
+eNextState FinalizeMessageSendDB(AsyncIO *IO);
+eNextState FinalizeMessageSend_DB1(AsyncIO *IO);
+eNextState FinalizeMessageSend_DB2(AsyncIO *IO);
+eNextState FinalizeMessageSend_DB3(AsyncIO *IO);
+eNextState FinalizeMessageSend_DB4(AsyncIO *IO);
 
 /******************************************************************************
  * So, we're finished with sending (regardless of success or failure)         *
@@ -128,21 +134,33 @@ eNextState get_one_mx_host_ip(AsyncIO *IO);
  * we need to free the memory and send bounce messages (on terminal failure)  *
  * else we just free our SMTP-Message struct.                                 *
  ******************************************************************************/
-void FinalizeMessageSend(SmtpOutMsg *Msg)
+inline void FinalizeMessageSend_1(AsyncIO *IO)
 {
-       int IDestructQueItem;
-       int nRemain;
-       StrBuf *MsgData;
-       AsyncIO *IO = &Msg->IO;
+       SmtpOutMsg *Msg = IO->Data;
+       Msg->IDestructQueItem = DecreaseQReference(Msg->MyQItem);
 
-       IDestructQueItem = DecreaseQReference(Msg->MyQItem);
+       Msg->nRemain = CountActiveQueueEntries(Msg->MyQItem);
 
-       nRemain = CountActiveQueueEntries(Msg->MyQItem);
+       if (Msg->MyQEntry->Active && 
+           CheckQEntryIsBounce(Msg->MyQEntry))
+       {
+               /* are we casue for a bounce mail? */
+               Msg->MyQItem->SendBounceMail |= (1<<Msg->MyQEntry->Status);
+       }
 
-       if ((nRemain > 0) || IDestructQueItem)
-               MsgData = SerializeQueueItem(Msg->MyQItem);
+       if ((Msg->nRemain > 0) || Msg->IDestructQueItem)
+               Msg->QMsgData = SerializeQueueItem(Msg->MyQItem);
        else
-               MsgData = NULL;
+               Msg->QMsgData = NULL;
+}
+eNextState FinalizeMessageSend(SmtpOutMsg *Msg)
+{
+       return QueueDBOperation(&Msg->IO, FinalizeMessageSend_DB1);
+}
+
+inline void FinalizeMessageSend_DB_1(AsyncIO *IO)
+{
+       SmtpOutMsg *Msg = IO->Data;
 
        /*
         * Uncompleted delivery instructions remain, so delete the old
@@ -150,11 +168,35 @@ void FinalizeMessageSend(SmtpOutMsg *Msg)
         */
        EVS_syslog(LOG_DEBUG, "SMTPQD: %ld", Msg->MyQItem->QueMsgID);
        CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
+}
+eNextState FinalizeMessageSend_DB1(AsyncIO *IO)
+{
+       FinalizeMessageSend_1(IO);
+       FinalizeMessageSend_DB_1(IO);
+       return NextDBOperation(IO, FinalizeMessageSend_DB2);
+}
+
+
+inline void FinalizeMessageSend_DB_2(AsyncIO *IO)
+{
+       SmtpOutMsg *Msg = IO->Data;
 
-       if (IDestructQueItem)
+       if (Msg->IDestructQueItem)
                smtpq_do_bounce(Msg->MyQItem, Msg->msgtext);
+}
+eNextState FinalizeMessageSend_DB2(AsyncIO *IO)
+{
+       FinalizeMessageSend_DB_2(IO);
+
+       return NextDBOperation(IO, FinalizeMessageSend_DB3);
+}
 
-       if (nRemain > 0)
+
+inline void FinalizeMessageSend_DB_3(AsyncIO *IO)
+{
+       SmtpOutMsg *Msg = IO->Data;
+
+       if (Msg->nRemain > 0)
        {
                struct CtdlMessage *msg;
                msg = malloc(sizeof(struct CtdlMessage));
@@ -162,7 +204,7 @@ void FinalizeMessageSend(SmtpOutMsg *Msg)
                msg->cm_magic = CTDLMESSAGE_MAGIC;
                msg->cm_anon_type = MES_NORMAL;
                msg->cm_format_type = FMT_RFC822;
-               msg->cm_fields['M'] = SmashStrBuf(&MsgData);
+               msg->cm_fields['M'] = SmashStrBuf(&Msg->QMsgData);
                msg->cm_fields['U'] = strdup("QMSG");
                Msg->MyQItem->QueMsgID =
                        CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
@@ -174,12 +216,40 @@ void FinalizeMessageSend(SmtpOutMsg *Msg)
                                   &Msg->MyQItem->MessageID,
                                   1,
                                   "");
-               FreeStrBuf(&MsgData);
+               FreeStrBuf(&Msg->QMsgData);
        }
+       DecreaseShutdownDeliveries(Msg->MyQItem);
+}
+eNextState FinalizeMessageSend_DB3(AsyncIO *IO)
+{
+       SmtpOutMsg *Msg = IO->Data;
+       FinalizeMessageSend_DB_3(IO);
+       if (!Msg->IDestructQueItem)
+               return eAbort;
+       return NextDBOperation(IO, FinalizeMessageSend_DB4);
+}
+
+eNextState FinalizeMessageSend_DB4(AsyncIO *IO)
+{
+       int n;
+       SmtpOutMsg *Msg = IO->Data;
+
+       n = GetShutdownDeliveries(Msg->MyQItem);
+       if (n > 0) 
+               return NextDBOperation(IO, FinalizeMessageSend_DB4);
+       else
+               return eAbort;
+}
+
+eNextState FinalizeMessageSend_DB(AsyncIO *IO)
+{
+       SmtpOutMsg *Msg = IO->Data;
+
        RemoveContext(Msg->IO.CitContext);
-       if (IDestructQueItem)
+       if (Msg->IDestructQueItem)
                RemoveQItem(Msg->MyQItem);
        DeleteSmtpOutMsg(Msg);
+       return eAbort;
 }
 
 eNextState FailOneAttempt(AsyncIO *IO)
@@ -495,6 +565,7 @@ SmtpOutMsg *new_smtp_outmsg(OneQueItem *MyQItem,
                     SMTP_C_DispatchWriteDone,
                     SMTP_C_DispatchReadDone,
                     SMTP_C_Terminate,
+                    SMTP_C_TerminateDB,
                     SMTP_C_ConnFail,
                     SMTP_C_Timeout,
                     SMTP_C_Shutdown);
@@ -555,7 +626,11 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
                        StrBufPlain(Msg->MyQEntry->StatusMessage,
                                    HKEY("Invalid Recipient!"));
                }
-               FinalizeMessageSend(Msg);
+               FinalizeMessageSend_1(&Msg->IO);
+               FinalizeMessageSend_DB_1(&Msg->IO);
+               FinalizeMessageSend_DB_2(&Msg->IO);
+               FinalizeMessageSend_DB_3(&Msg->IO);
+               FinalizeMessageSend_DB(&Msg->IO);
        }
 }
 
@@ -644,8 +719,12 @@ eNextState SMTP_C_Terminate(AsyncIO *IO)
        SmtpOutMsg *Msg = IO->Data;
 
        EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
-       FinalizeMessageSend(Msg);
-       return eAbort;
+       return FinalizeMessageSend(Msg);
+}
+eNextState SMTP_C_TerminateDB(AsyncIO *IO)
+{
+       EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+       return FinalizeMessageSend_DB(IO);
 }
 eNextState SMTP_C_Timeout(AsyncIO *IO)
 {
@@ -683,8 +762,7 @@ eNextState SMTP_C_Shutdown(AsyncIO *IO)
        Msg->MyQEntry->Status = 3;
        StrBufPlain(Msg->MyQEntry->StatusMessage,
                    HKEY("server shutdown during message submit."));
-       FinalizeMessageSend(Msg);
-       return eAbort;
+       return FinalizeMessageSend(Msg);
 }