projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
properly iterate over the linked list.
[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 498d94c882c9774f66a457814017794d28a9f178..f6a4116492b4fb662543e3e8a3921be585f78fad 100644 (file)
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -16,7 +16,7 @@
  * RFC 2821 - Simple Mail Transfer Protocol
  * RFC 2822 - Internet Message Format
  * RFC 2920 - SMTP Service Extension for Command Pipelining
- *  
+ *
  * The VRFY and EXPN commands have been removed from this implementation
  * because nobody uses these commands anymore, except for spammers.
  *
@@ -125,41 +125,54 @@ eNextState get_one_mx_host_ip(AsyncIO *IO);
  ******************************************************************************/
 void FinalizeMessageSend(SmtpOutMsg *Msg)
 {
-       syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
-       
-       if (DecreaseQReference(Msg->MyQItem)) 
-       {
-               int nRemain;
-               StrBuf *MsgData;
+       int IDestructQueItem;
+       int nRemain;
+       StrBuf *MsgData;
+       AsyncIO *IO = &Msg->IO;
+       EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+
+       IDestructQueItem = DecreaseQReference(Msg->MyQItem);
 
-               nRemain = CountActiveQueueEntries(Msg->MyQItem);
+       nRemain = CountActiveQueueEntries(Msg->MyQItem);
 
+       if ((nRemain > 0) || IDestructQueItem)
                MsgData = SerializeQueueItem(Msg->MyQItem);
-               /*
-                * Uncompleted delivery instructions remain, so delete the old
-                * instructions and replace with the updated ones.
-                */
-               CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
-               smtpq_do_bounce(Msg->MyQItem,
-                               Msg->msgtext); 
-               if (nRemain > 0) {
-                       struct CtdlMessage *msg;
-                       msg = malloc(sizeof(struct CtdlMessage));
-                       memset(msg, 0, sizeof(struct CtdlMessage));
-                       msg->cm_magic = CTDLMESSAGE_MAGIC;
-                       msg->cm_anon_type = MES_NORMAL;
-                       msg->cm_format_type = FMT_RFC822;
-                       msg->cm_fields['M'] = SmashStrBuf(&MsgData);
-                       CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
-                       CtdlFreeMessage(msg);
-               }
-               else {
-                       CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->MessageID, 1, "");
-                       FreeStrBuf(&MsgData);
-               }
+       else
+               MsgData = NULL;
 
-               RemoveQItem(Msg->MyQItem);
+       /*
+        * Uncompleted delivery instructions remain, so delete the old
+        * instructions and replace with the updated ones.
+        */
+       EVS_syslog(LOG_DEBUG, "SMTPQD: %ld", Msg->MyQItem->QueMsgID);
+       CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
+
+       if (IDestructQueItem)
+               smtpq_do_bounce(Msg->MyQItem,Msg->msgtext);
+
+       if (nRemain > 0)
+       {
+               struct CtdlMessage *msg;
+               msg = malloc(sizeof(struct CtdlMessage));
+               memset(msg, 0, sizeof(struct CtdlMessage));
+               msg->cm_magic = CTDLMESSAGE_MAGIC;
+               msg->cm_anon_type = MES_NORMAL;
+               msg->cm_format_type = FMT_RFC822;
+               msg->cm_fields['M'] = SmashStrBuf(&MsgData);
+               Msg->MyQItem->QueMsgID =
+                       CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
+               EVS_syslog(LOG_DEBUG, "SMTPQ: %ld", Msg->MyQItem->QueMsgID);
+               CtdlFreeMessage(msg);
+       }
+       else {
+               CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM,
+                                  &Msg->MyQItem->MessageID,
+                                  1,
+                                  "");
+               FreeStrBuf(&MsgData);
        }
+       if (IDestructQueItem)
+               RemoveQItem(Msg->MyQItem);
 
        RemoveContext(Msg->IO.CitContext);
        DeleteSmtpOutMsg(Msg);
@@ -168,6 +181,10 @@ void FinalizeMessageSend(SmtpOutMsg *Msg)
 eNextState FailOneAttempt(AsyncIO *IO)
 {
        SmtpOutMsg *SendMsg = IO->Data;
+
+       if (SendMsg->MyQEntry->Status == 2)
+               return eAbort;
+
        /* 
         * possible ways here: 
         * - connection timeout 
@@ -213,12 +230,12 @@ void SetConnectStatus(AsyncIO *IO)
        if (SendMsg->mx_host == NULL)
                SendMsg->mx_host = "<no MX-Record>";
 
-       syslog(LOG_DEBUG,
-              "SMTP client[%ld]: connecting to %s [%s]:%d ...\n", 
-              SendMsg->n, 
-              SendMsg->mx_host, 
-              buf,
-              SendMsg->IO.ConnectMe->Port);
+       EVS_syslog(LOG_DEBUG,
+                 "SMTP client[%ld]: connecting to %s [%s]:%d ...\n", 
+                 SendMsg->n, 
+                 SendMsg->mx_host, 
+                 buf,
+                 SendMsg->IO.ConnectMe->Port);
 
        SendMsg->MyQEntry->Status = 5; 
        StrBufPrintf(SendMsg->MyQEntry->StatusMessage, 
@@ -236,7 +253,7 @@ eNextState mx_connect_ip(AsyncIO *IO)
 {
        SmtpOutMsg *SendMsg = IO->Data;
 
-       syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+       EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
        
        IO->ConnectMe = SendMsg->pCurrRelay;
        /*  Bypass the ns lookup result like this: IO->Addr.sin_addr.s_addr = inet_addr("127.0.0.1"); */
@@ -299,14 +316,14 @@ eNextState get_one_mx_host_ip(AsyncIO *IO)
 
        InitC_ares_dns(IO);
 
-       syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+       EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
 
-       syslog(LOG_DEBUG, 
-              "SMTP client[%ld]: looking up %s-Record %s : %d ...\n", 
-              SendMsg->n, 
-              (SendMsg->pCurrRelay->IPv6)? "aaaa": "a",
-              SendMsg->pCurrRelay->Host, 
-              SendMsg->pCurrRelay->Port);
+       EVS_syslog(LOG_DEBUG, 
+                 "SMTP client[%ld]: looking up %s-Record %s : %d ...\n", 
+                 SendMsg->n, 
+                 (SendMsg->pCurrRelay->IPv6)? "aaaa": "a",
+                 SendMsg->pCurrRelay->Host, 
+                 SendMsg->pCurrRelay->Port);
 
        if (!QueueQuery((SendMsg->pCurrRelay->IPv6)? ns_t_aaaa : ns_t_a, 
                        SendMsg->pCurrRelay->Host, 
@@ -335,7 +352,7 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO)
 
        QueryCbDone(IO);
 
-       syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+       EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
        pp = &SendMsg->Relay;
        while ((pp != NULL) && (*pp != NULL) && ((*pp)->Next != NULL))
                pp = &(*pp)->Next;
@@ -379,7 +396,7 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO)
                        p->Host = SendMsg->node;
                                
                        *pp = p;
-                       pp = &p;
+                       pp = &p->Next;
                }
                SendMsg->CXFlags   = SendMsg->CXFlags & F_DIRECT;
        }
@@ -392,7 +409,7 @@ eNextState resolve_mx_records(AsyncIO *IO)
 {
        SmtpOutMsg * SendMsg = IO->Data;
 
-       syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+       EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
        /* start resolving MX records here. */
        if (!QueueQuery(ns_t_mx, 
                        SendMsg->node, 
@@ -469,6 +486,9 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
                SubC->session_specific_data = (char*) SendMsg;
                SendMsg->IO.CitContext = SubC;
 
+               syslog(LOG_DEBUG, "SMTP Starting: [%ld] <%s> \n",
+                      SendMsg->MyQItem->MessageID, 
+                      ChrPtr(SendMsg->MyQEntry->Recipient));
                if (SendMsg->pCurrRelay == NULL)
                        QueueEventContext(&SendMsg->IO,
                                          resolve_mx_records);
@@ -507,8 +527,9 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
 void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg)
 {
        double Timeout = 0.0;
+       AsyncIO *IO = &pMsg->IO;
 
-       syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+       EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
 
        switch (NextTCPState) {
        case eSendFile:
@@ -545,18 +566,21 @@ void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg)
 }
 eNextState SMTP_C_DispatchReadDone(AsyncIO *IO)
 {
-       syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+       EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
        SmtpOutMsg *pMsg = IO->Data;
        eNextState rc;
 
        rc = ReadHandlers[pMsg->State](pMsg);
-       pMsg->State++;
-       SMTPSetTimeout(rc, pMsg);
+       if (rc != eAbort)
+       {
+               pMsg->State++;
+               SMTPSetTimeout(rc, pMsg);
+       }
        return rc;
 }
 eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO)
 {
-       syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+       EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
        SmtpOutMsg *pMsg = IO->Data;
        eNextState rc;
 
@@ -573,7 +597,7 @@ eNextState SMTP_C_Terminate(AsyncIO *IO)
 {
        SmtpOutMsg *pMsg = IO->Data;
 
-       syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+       EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
        FinalizeMessageSend(pMsg);
        return eAbort;
 }
@@ -581,7 +605,7 @@ eNextState SMTP_C_Timeout(AsyncIO *IO)
 {
        SmtpOutMsg *pMsg = IO->Data;
 
-       syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+       EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
        StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State]));
        return FailOneAttempt(IO);
 }
@@ -589,7 +613,7 @@ eNextState SMTP_C_ConnFail(AsyncIO *IO)
 {
        SmtpOutMsg *pMsg = IO->Data;
 
-       syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+       EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
        StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State]));
        return FailOneAttempt(IO);
 }
@@ -597,13 +621,13 @@ eNextState SMTP_C_DNSFail(AsyncIO *IO)
 {
        SmtpOutMsg *pMsg = IO->Data;
 
-       syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+       EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
        StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State]));
        return FailOneAttempt(IO);
 }
 eNextState SMTP_C_Shutdown(AsyncIO *IO)
 {
-       syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+       EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
        SmtpOutMsg *pMsg = IO->Data;
 
        pMsg->MyQEntry->Status = 3;
Citadel server, clients, utilities