SMTPQ: don't multiplay the value for displaying it.

[citadel.git] / webcit / smtpqueue.c

diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index f5e3908258f24087fb78449781dd944ac443c87f..b03c4e0dcdce4d18dfd2efe15f4aaf3e62a7378d 100644 (file)
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -310,6 +310,16 @@ typedef struct queueitem {
 
 typedef void (*QItemHandler)(OneQueItem *Item, StrBuf *Line, const char **Pos);
 
+typedef struct __QItemHandlerStruct {
+       QItemHandler H;
+} QItemHandlerStruct;
+
+void RegisterQItemHandler(const char *Key, long Len, QItemHandler H)
+{
+       QItemHandlerStruct *HS = (QItemHandlerStruct*)malloc(sizeof(QItemHandlerStruct));
+       HS->H = H;
+       Put(QItemHandlers, Key, Len, HS, NULL);
+}
 
 void FreeMailQEntry(void *qv)
 {
@@ -358,9 +368,9 @@ OneQueItem *DeserializeQueueItem(StrBuf *RawQItem, long QueMsgID)
                StrBufExtract_NextToken(Token, Line, &pItemPart, '|');
                if (GetHash(QItemHandlers, SKEY(Token), &vHandler))
                {
-                       QItemHandler H;
-                       H = (QItemHandler) vHandler;
-                       H(Item, Line, &pItemPart);
+                       QItemHandlerStruct *HS;
+                       HS = (QItemHandlerStruct*) vHandler;
+                       HS->H(Item, Line, &pItemPart);
                }
        }
        FreeStrBuf(&Line);
@@ -514,9 +524,7 @@ void QItem_Handle_Recipient(OneQueItem *Item, StrBuf *Line, const char **Pos)
 
 void QItem_Handle_retry(OneQueItem *Item, StrBuf *Line, const char **Pos)
 {
-       Item->Retry =
-               StrBufExtractNext_int(Line, Pos, '|');
-       Item->Retry *= 2;
+       Item->Retry = StrBufExtractNext_int(Line, Pos, '|');
 }
 
 
@@ -642,14 +650,14 @@ InitModule_SMTP_QUEUE
 (void)
 {
 
-       Put(QItemHandlers, HKEY("msgid"), QItem_Handle_MsgID, reference_free_handler);
-       Put(QItemHandlers, HKEY("envelope_from"), QItem_Handle_EnvelopeFrom, reference_free_handler);
-       Put(QItemHandlers, HKEY("retry"), QItem_Handle_retry, reference_free_handler);
-       Put(QItemHandlers, HKEY("attempted"), QItem_Handle_Attempted, reference_free_handler);
-       Put(QItemHandlers, HKEY("remote"), QItem_Handle_Recipient, reference_free_handler);
-       Put(QItemHandlers, HKEY("bounceto"), QItem_Handle_BounceTo, reference_free_handler);
-       Put(QItemHandlers, HKEY("source_room"), QItem_Handle_SenderRoom, reference_free_handler);
-       Put(QItemHandlers, HKEY("submitted"), QItem_Handle_Submitted, reference_free_handler);
+       RegisterQItemHandler(HKEY("msgid"),             QItem_Handle_MsgID);
+       RegisterQItemHandler(HKEY("envelope_from"),     QItem_Handle_EnvelopeFrom);
+       RegisterQItemHandler(HKEY("retry"),             QItem_Handle_retry);
+       RegisterQItemHandler(HKEY("attempted"),         QItem_Handle_Attempted);
+       RegisterQItemHandler(HKEY("remote"),            QItem_Handle_Recipient);
+       RegisterQItemHandler(HKEY("bounceto"),          QItem_Handle_BounceTo);
+       RegisterQItemHandler(HKEY("source_room"),       QItem_Handle_SenderRoom);
+       RegisterQItemHandler(HKEY("submitted"),         QItem_Handle_Submitted);
 
        WebcitAddUrlHandler(HKEY("display_smtpqueue"), "", 0, display_smtpqueue, 0);
        WebcitAddUrlHandler(HKEY("display_smtpqueue_inner_div"), "", 0, display_smtpqueue_inner_div, 0);