X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsmtpqueue.c;h=350a201f03e3edf781159baf610e06c9972f93f4;hb=74210f758b7a01766b7a84bf02015469e98f2105;hp=f41e38fa88c32b0fa2fe9fffc78a1799474b7993;hpb=79d7fb817e842cf507c77a2252da56019a2b0a13;p=citadel.git
diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index f41e38fa8..350a201f0 100644
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -1,205 +1,452 @@
/*
- * $Id: $
+ * Display the outbound SMTP queue
*/
-/**
- * \defgroup SMTPqueue Display the outbound SMTP queue
- * \ingroup CitadelConfig
- */
-/*@{*/
+
#include "webcit.h"
+CtxType CTX_MAILQITEM = CTX_NONE;
+CtxType CTX_MAILQ_RCPT = CTX_NONE;
+HashList *QItemHandlers = NULL;
+
+
+
+typedef struct _mailq_entry {
+ StrBuf *Recipient;
+ StrBuf *StatusMessage;
+ 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
+ * be generated.
+ */
-/**
- * \brief display one message in the queue
+ int n;
+ int Active;
+}MailQEntry;
+
+typedef struct queueitem {
+ long MessageID;
+ long QueMsgID;
+ long Submitted;
+ int FailNow;
+ HashList *MailQEntries;
+/* copy of the currently parsed item in the MailQEntries list;
+ * if null add a new one.
*/
-void display_queue_msg(long msgnum)
-{
- char buf[1024];
- char keyword[32];
- int in_body = 0;
- int is_delivery_list = 0;
- time_t submitted = 0;
- time_t attempted = 0;
- time_t last_attempt = 0;
- int number_of_attempts = 0;
- char sender[256];
- char recipients[65536];
- char thisrecp[256];
- char thisdsn[256];
-
- strcpy(sender, "");
- strcpy(recipients, "");
-
- serv_printf("MSG2 %ld", msgnum);
- serv_getln(buf, sizeof buf);
- if (buf[0] != '1') return;
-
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-
- if (strlen(buf) > 0) {
- if (buf[strlen(buf)-1] == 13) {
- buf[strlen(buf)-1] = 0;
- }
- }
+ MailQEntry *Current;
+ time_t ReattemptWhen;
+ time_t Retry;
- if ( (strlen(buf) == 0) && (in_body == 0) ) {
- in_body = 1;
- }
+ long ActiveDeliveries;
+ StrBuf *EnvelopeFrom;
+ StrBuf *BounceTo;
+ StrBuf *SenderRoom;
+ ParsedURL *URL;
+ ParsedURL *FallBackHost;
+} OneQueItem;
- if ( (!in_body)
- && (!strncasecmp(buf, "Content-type: application/x-citadel-delivery-list", 49))
- ) {
- is_delivery_list = 1;
- }
- if ( (in_body) && (!is_delivery_list) ) {
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- /* Not a delivery list; flush and return quietly. */
- }
- return;
- }
-
- if ( (in_body) && (is_delivery_list) ) {
- extract_token(keyword, buf, 0, '|', sizeof keyword);
+typedef void (*QItemHandler)(OneQueItem *Item, StrBuf *Line, const char **Pos);
- if (!strcasecmp(keyword, "submitted")) {
- submitted = extract_long(buf, 1);
- }
+typedef struct __QItemHandlerStruct {
+ QItemHandler H;
+} QItemHandlerStruct;
- if (!strcasecmp(keyword, "attempted")) {
- attempted = extract_long(buf, 1);
- ++number_of_attempts;
- if (attempted > last_attempt) {
- last_attempt = attempted;
- }
- }
-
- if (!strcasecmp(keyword, "bounceto")) {
- extract_token(sender, buf, 1, '|', sizeof sender);
- }
+void RegisterQItemHandler(const char *Key, long Len, QItemHandler H)
+{
+ QItemHandlerStruct *HS = (QItemHandlerStruct*)malloc(sizeof(QItemHandlerStruct));
+ HS->H = H;
+ Put(QItemHandlers, Key, Len, HS, NULL);
+}
- if (!strcasecmp(keyword, "remote")) {
- extract_token(thisrecp, buf, 1, '|', sizeof thisrecp);
- extract_token(thisdsn, buf, 3, '|', sizeof thisdsn);
-
- if (strlen(recipients) + strlen(thisrecp) + strlen(thisdsn) + 100
- < sizeof recipients) {
- if (strlen(recipients) > 0) {
- strcat(recipients, "
");
- }
- stresc(&recipients[strlen(recipients)], thisrecp, 1, 1);
- strcat(recipients, "
");
- stresc(&recipients[strlen(recipients)], thisdsn, 1, 1);
- strcat(recipients, "");
- }
+void FreeMailQEntry(void *qv)
+{
+ MailQEntry *Q = qv;
+ FreeStrBuf(&Q->Recipient);
+ FreeStrBuf(&Q->StatusMessage);
+ free(Q);
+}
+void FreeQueItem(OneQueItem **Item)
+{
+ DeleteHash(&(*Item)->MailQEntries);
+ FreeStrBuf(&(*Item)->EnvelopeFrom);
+ FreeStrBuf(&(*Item)->BounceTo);
+ FreeStrBuf(&(*Item)->SenderRoom);
+ FreeURL(&(*Item)->URL);
+ free(*Item);
+ Item = NULL;
+}
+void HFreeQueItem(void *Item)
+{
+ FreeQueItem((OneQueItem**)&Item);
+}
- }
+OneQueItem *DeserializeQueueItem(StrBuf *RawQItem, long QueMsgID)
+{
+ OneQueItem *Item;
+ const char *pLine = NULL;
+ StrBuf *Line;
+ StrBuf *Token;
+
+ Item = (OneQueItem*)malloc(sizeof(OneQueItem));
+ memset(Item, 0, sizeof(OneQueItem));
+ Item->Retry = 0;
+ Item->MessageID = -1;
+ Item->QueMsgID = QueMsgID;
+
+ Token = NewStrBuf();
+ Line = NewStrBufPlain(NULL, 128);
+ while (pLine != StrBufNOTNULL) {
+ const char *pItemPart = NULL;
+ void *vHandler;
+
+ StrBufExtract_NextToken(Line, RawQItem, &pLine, '\n');
+ if (StrLength(Line) == 0) continue;
+ StrBufExtract_NextToken(Token, Line, &pItemPart, '|');
+ if (GetHash(QItemHandlers, SKEY(Token), &vHandler))
+ {
+ QItemHandlerStruct *HS;
+ HS = (QItemHandlerStruct*) vHandler;
+ HS->H(Item, Line, &pItemPart);
}
-
}
+ FreeStrBuf(&Line);
+ FreeStrBuf(&Token);
+/*
+ Put(ActiveQItems,
+ LKEY(Item->MessageID),
+ Item,
+ HFreeQueItem);
+*/
+
+ return Item;
+}
+
+void tmplput_MailQID(StrBuf *Target, WCTemplputParams *TP)
+{
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
+ StrBufAppendPrintf(Target, "%ld", Item->QueMsgID);;
+}
+void tmplput_MailQPayloadID(StrBuf *Target, WCTemplputParams *TP)
+{
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
+ StrBufAppendPrintf(Target, "%ld", Item->MessageID);
+}
+void tmplput_MailQBounceTo(StrBuf *Target, WCTemplputParams *TP)
+{
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
+ StrBufAppendTemplate(Target, TP, Item->BounceTo, 0);
+}
+void tmplput_MailQAttempted(StrBuf *Target, WCTemplputParams *TP)
+{
+ char datebuf[64];
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
+ webcit_fmt_date(datebuf, 64, Item->ReattemptWhen, DATEFMT_BRIEF);
+ StrBufAppendBufPlain(Target, datebuf, -1, 0);
+}
+void tmplput_MailQSubmitted(StrBuf *Target, WCTemplputParams *TP)
+{
+ char datebuf[64];
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
+ webcit_fmt_date(datebuf, 64, Item->Submitted, DATEFMT_BRIEF);
+ StrBufAppendBufPlain(Target, datebuf, -1, 0);
+}
+void tmplput_MailQEnvelopeFrom(StrBuf *Target, WCTemplputParams *TP)
+{
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
+ StrBufAppendTemplate(Target, TP, Item->EnvelopeFrom, 0);
+}
+void tmplput_MailQSourceRoom(StrBuf *Target, WCTemplputParams *TP)
+{
+ OneQueItem *Item = (OneQueItem*) CTX(CTX_MAILQITEM);
+ StrBufAppendTemplate(Target, TP, Item->SenderRoom, 0);
+}
- wprintf("