Revert "SMTP-Client: move the client-shutdown procedure into the DB-Thread; we musn...

[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 e5c1cee00931f84c887addfcbdb51002b8eab444..90a36b23539f6582b823bd1ec4ce023b834b9562 100644 (file)
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -117,15 +117,10 @@ 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);
 
 /******************************************************************************
  * So, we're finished with sending (regardless of success or failure)         *
@@ -133,12 +128,16 @@ eNextState FinalizeMessageSend_DB3(AsyncIO *IO);
  * we need to free the memory and send bounce messages (on terminal failure)  *
  * else we just free our SMTP-Message struct.                                 *
  ******************************************************************************/
-inline void FinalizeMessageSend_1(AsyncIO *IO)
+void FinalizeMessageSend(SmtpOutMsg *Msg)
 {
-       SmtpOutMsg *Msg = IO->Data;
-       Msg->IDestructQueItem = DecreaseQReference(Msg->MyQItem);
+       int IDestructQueItem;
+       int nRemain;
+       StrBuf *MsgData;
+       AsyncIO *IO = &Msg->IO;
+
+       IDestructQueItem = DecreaseQReference(Msg->MyQItem);
 
-       Msg->nRemain = CountActiveQueueEntries(Msg->MyQItem);
+       nRemain = CountActiveQueueEntries(Msg->MyQItem);
 
        if (Msg->MyQEntry->Active && 
            CheckQEntryIsBounce(Msg->MyQEntry))
@@ -147,19 +146,10 @@ inline void FinalizeMessageSend_1(AsyncIO *IO)
                Msg->MyQItem->SendBounceMail |= (1<<Msg->MyQEntry->Status);
        }
 
-       if ((Msg->nRemain > 0) || Msg->IDestructQueItem)
-               Msg->QMsgData = SerializeQueueItem(Msg->MyQItem);
+       if ((nRemain > 0) || IDestructQueItem)
+               MsgData = SerializeQueueItem(Msg->MyQItem);
        else
-               Msg->QMsgData = NULL;
-}
-eNextState FinalizeMessageSend(SmtpOutMsg *Msg)
-{
-       return QueueDBOperation(&Msg->IO, FinalizeMessageSend_DB1);
-}
-
-inline void FinalizeMessageSend_DB_1(AsyncIO *IO)
-{
-       SmtpOutMsg *Msg = IO->Data;
+               MsgData = NULL;
 
        /*
         * Uncompleted delivery instructions remain, so delete the old
@@ -167,35 +157,11 @@ inline void FinalizeMessageSend_DB_1(AsyncIO *IO)
         */
        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 (Msg->IDestructQueItem)
+       if (IDestructQueItem)
                smtpq_do_bounce(Msg->MyQItem, Msg->msgtext);
-}
-eNextState FinalizeMessageSend_DB2(AsyncIO *IO)
-{
-       FinalizeMessageSend_DB_2(IO);
-
-       return NextDBOperation(IO, FinalizeMessageSend_DB3);
-}
-
-
-inline void FinalizeMessageSend_DB_3(AsyncIO *IO)
-{
-       SmtpOutMsg *Msg = IO->Data;
 
-       if (Msg->nRemain > 0)
+       if (nRemain > 0)
        {
                struct CtdlMessage *msg;
                msg = malloc(sizeof(struct CtdlMessage));
@@ -203,7 +169,7 @@ inline void FinalizeMessageSend_DB_3(AsyncIO *IO)
                msg->cm_magic = CTDLMESSAGE_MAGIC;
                msg->cm_anon_type = MES_NORMAL;
                msg->cm_format_type = FMT_RFC822;
-               msg->cm_fields['M'] = SmashStrBuf(&Msg->QMsgData);
+               msg->cm_fields['M'] = SmashStrBuf(&MsgData);
                msg->cm_fields['U'] = strdup("QMSG");
                Msg->MyQItem->QueMsgID =
                        CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
@@ -215,24 +181,12 @@ inline void FinalizeMessageSend_DB_3(AsyncIO *IO)
                                   &Msg->MyQItem->MessageID,
                                   1,
                                   "");
-               FreeStrBuf(&Msg->QMsgData);
+               FreeStrBuf(&MsgData);
        }
-}
-eNextState FinalizeMessageSend_DB3(AsyncIO *IO)
-{
-       FinalizeMessageSend_DB_3(IO);
-       return eAbort;
-}
-
-eNextState FinalizeMessageSend_DB(AsyncIO *IO)
-{
-       SmtpOutMsg *Msg = IO->Data;
-
        RemoveContext(Msg->IO.CitContext);
-       if (Msg->IDestructQueItem)
+       if (IDestructQueItem)
                RemoveQItem(Msg->MyQItem);
        DeleteSmtpOutMsg(Msg);
-       return eAbort;
 }
 
 eNextState FailOneAttempt(AsyncIO *IO)
@@ -548,7 +502,6 @@ 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);
@@ -609,11 +562,7 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
                        StrBufPlain(Msg->MyQEntry->StatusMessage,
                                    HKEY("Invalid Recipient!"));
                }
-               FinalizeMessageSend_1(&Msg->IO);
-               FinalizeMessageSend_DB_1(&Msg->IO);
-               FinalizeMessageSend_DB_2(&Msg->IO);
-               FinalizeMessageSend_DB_3(&Msg->IO);
-               FinalizeMessageSend_DB(&Msg->IO);
+               FinalizeMessageSend(Msg);
        }
 }
 
@@ -702,12 +651,8 @@ eNextState SMTP_C_Terminate(AsyncIO *IO)
        SmtpOutMsg *Msg = IO->Data;
 
        EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
-       return FinalizeMessageSend(Msg);
-}
-eNextState SMTP_C_TerminateDB(AsyncIO *IO)
-{
-       EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
-       return FinalizeMessageSend_DB(IO);
+       FinalizeMessageSend(Msg);
+       return eAbort;
 }
 eNextState SMTP_C_Timeout(AsyncIO *IO)
 {
@@ -745,7 +690,8 @@ eNextState SMTP_C_Shutdown(AsyncIO *IO)
        Msg->MyQEntry->Status = 3;
        StrBufPlain(Msg->MyQEntry->StatusMessage,
                    HKEY("server shutdown during message submit."));
-       return FinalizeMessageSend(Msg);
+       FinalizeMessageSend(Msg);
+       return eAbort;
 }