SMTP-Client: output our current state on the useragent; since we're internal only.

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

diff --git a/citadel/modules/smtp/smtpqueue.h b/citadel/modules/smtp/smtpqueue.h
index 1b834f9b122a896842501aa78300870b90d7dd16..b2778b99517d17d91b7b7f01af39a07c4b18958a 100644 (file)
--- a/citadel/modules/smtp/smtpqueue.h
+++ b/citadel/modules/smtp/smtpqueue.h
@@ -22,6 +22,7 @@
 /*****************************************************************************/
 
 #define MaxAttempts 15
+extern const unsigned short DefaultMXPort;
 
 typedef struct _mailq_entry {
        StrBuf *Recipient;
@@ -39,9 +40,11 @@ typedef struct _mailq_entry {
 
        int n;
        int Active;
+       int StillActive;
 }MailQEntry;
 
 typedef struct queueitem {
+       long SendBounceMail;
        long MessageID;
        long QueMsgID;
        long Submitted;
@@ -55,17 +58,27 @@ typedef struct queueitem {
        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);