SMTP: fix aggregation of fail stati for aide / bounce message.

[citadel.git] / citadel / modules / smtp / smtpqueue.h

diff --git a/citadel/modules/smtp/smtpqueue.h b/citadel/modules/smtp/smtpqueue.h
index 12b2ad387f1591e32f56996ea0411c211107d2f6..2bd4c2700f4921fbf3a61cb46c89386aee073f1e 100644 (file)
--- a/citadel/modules/smtp/smtpqueue.h
+++ b/citadel/modules/smtp/smtpqueue.h
@@ -21,23 +21,18 @@
 /*               SMTP CLIENT (Queue Management) STUFF                        */
 /*****************************************************************************/
 
-
-
 #define MaxAttempts 15
-typedef struct _delivery_attempt {
-       time_t when;
-       time_t retry;
-}DeliveryAttempt;
+extern const unsigned short DefaultMXPort;
 
 typedef struct _mailq_entry {
-       DeliveryAttempt Attempts[MaxAttempts];
-       int nAttempts;
        StrBuf *Recipient;
        StrBuf *StatusMessage;
+       StrBuf *AllStatusMessages;
        int Status;
        /**<
         * 0 = No delivery has yet been attempted
         * 2 = Delivery was successful
+        * 3 = Transient error like connection problem. Try next remote if available.
         * 4 = A transient error was experienced ... try again later
         * 5 = Delivery to this address failed permanently.  The error message
         *     should be placed in the fourth field so that a bounce message may
@@ -46,9 +41,12 @@ typedef struct _mailq_entry {
 
        int n;
        int Active;
+       int StillActive;
+       int nAttempt;
 }MailQEntry;
 
 typedef struct queueitem {
+       long SendBounceMail;
        long MessageID;
        long QueMsgID;
        long Submitted;
@@ -58,18 +56,31 @@ typedef struct queueitem {
  * if null add a new one.
  */
        MailQEntry *Current;
-       DeliveryAttempt LastAttempt;
+       time_t ReattemptWhen;
+       time_t Retry;
+
        long ActiveDeliveries;
+       long NotYetShutdownDeliveries;
        StrBuf *EnvelopeFrom;
        StrBuf *BounceTo;
+       StrBuf *SenderRoom;
        ParsedURL *URL;
        ParsedURL *FallBackHost;
+       int HaveRelay;
 } OneQueItem;
 
 typedef void (*QItemHandler)(OneQueItem *Item, StrBuf *Line, const char **Pos);
 
+
+typedef struct __QItemHandlerStruct {
+       QItemHandler H;
+} QItemHandlerStruct;
 int     DecreaseQReference(OneQueItem *MyQItem);
+void DecreaseShutdownDeliveries(OneQueItem *MyQItem);
+int GetShutdownDeliveries(OneQueItem *MyQItem);
 void    RemoveQItem(OneQueItem *MyQItem);
-int     CountActiveQueueEntries(OneQueItem *MyQItem);
+int     CountActiveQueueEntries(OneQueItem *MyQItem, int before);
 StrBuf *SerializeQueueItem(OneQueItem *MyQItem);
-void    smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt);
+void    smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt, ParsedURL *Relay);
+
+int CheckQEntryIsBounce(MailQEntry *ThisItem);