X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpqueue.c;h=fb74ed2ad76d7afc6b31bb0a5e1c133701c79857;hb=9e07e8e851dcb5758feacb349cbb94b15799d632;hp=c51b43c161d4d80d8f89c37f4267a8745d78326a;hpb=6f0ce13f19d957b112df8dc4cdc2fd86f1f92955;p=citadel.git diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c index c51b43c16..fb74ed2ad 100644 --- a/citadel/modules/smtp/serv_smtpqueue.c +++ b/citadel/modules/smtp/serv_smtpqueue.c @@ -86,6 +86,7 @@ #include "ctdl_module.h" #include "smtpqueue.h" +#include "smtp_clienthandlers.h" #include "event_client.h" @@ -93,6 +94,7 @@ struct CitContext smtp_queue_CC; pthread_mutex_t ActiveQItemsLock; HashList *ActiveQItems = NULL; HashList *QItemHandlers = NULL; +const unsigned short DefaultMXPort = 25; int max_sessions_for_outbound_smtp = 500; /* how many sessions might be active till we stop adding more smtp jobs */ int ndelay_count = 50; /* every n queued messages we will sleep... */ int delay_msec = 5000; /* this many seconds. */ @@ -141,6 +143,22 @@ int DecreaseQReference(OneQueItem *MyQItem) return IDestructQueItem; } +void DecreaseShutdownDeliveries(OneQueItem *MyQItem) +{ + pthread_mutex_lock(&ActiveQItemsLock); + MyQItem->NotYetShutdownDeliveries--; + pthread_mutex_unlock(&ActiveQItemsLock); +} + +int GetShutdownDeliveries(OneQueItem *MyQItem) +{ + int DestructNow; + + pthread_mutex_lock(&ActiveQItemsLock); + DestructNow = MyQItem->ActiveDeliveries == 0; + pthread_mutex_unlock(&ActiveQItemsLock); + return DestructNow; +} void RemoveQItem(OneQueItem *MyQItem) { long len; @@ -154,13 +172,13 @@ void RemoveQItem(OneQueItem *MyQItem) DeleteEntryFromHash(ActiveQItems, It); else { - syslog(LOG_WARNING, - "SMTP cleanup: unable to find QItem with ID[%ld]", - MyQItem->MessageID); + SMTPC_syslog(LOG_WARNING, + "unable to find QItem with ID[%ld]", + MyQItem->MessageID); while (GetNextHashPos(ActiveQItems, It, &len, &Key, &VData)) - syslog(LOG_WARNING, - "SMTP cleanup: have_: ID[%ld]", - ((OneQueItem *)VData)->MessageID); + SMTPC_syslog(LOG_WARNING, + "have_: ID[%ld]", + ((OneQueItem *)VData)->MessageID); } pthread_mutex_unlock(&ActiveQItemsLock); DeleteHashPos(&It); @@ -171,19 +189,19 @@ void FreeMailQEntry(void *qv) { MailQEntry *Q = qv; /* - syslog(LOG_DEBUG, "---------------%s--------------", __FUNCTION__); + SMTPC_syslog(LOG_DEBUG, "---------------%s--------------", __FUNCTION__); cit_backtrace(); */ FreeStrBuf(&Q->Recipient); FreeStrBuf(&Q->StatusMessage); - + FreeStrBuf(&Q->AllStatusMessages); memset(Q, 0, sizeof(MailQEntry)); free(Q); } void FreeQueItem(OneQueItem **Item) { /* - syslog(LOG_DEBUG, "---------------%s--------------", __FUNCTION__); + SMTPC_syslog(LOG_DEBUG, "---------------%s--------------", __FUNCTION__); cit_backtrace(); */ DeleteHash(&(*Item)->MailQEntries); @@ -228,7 +246,7 @@ int CheckQEntryIsBounce(MailQEntry *ThisItem) return 0; } -int CountActiveQueueEntries(OneQueItem *MyQItem) +int CountActiveQueueEntries(OneQueItem *MyQItem, int before) { HashPos *It; long len; @@ -240,15 +258,20 @@ int CountActiveQueueEntries(OneQueItem *MyQItem) It = GetNewHashPos(MyQItem->MailQEntries, 0); while (GetNextHashPos(MyQItem->MailQEntries, It, &len, &Key, &vQE)) { + int Active; MailQEntry *ThisItem = vQE; if (CheckQEntryActive(ThisItem)) { ActiveDeliveries++; - ThisItem->Active = 1; + Active = 1; } else - ThisItem->Active = 0; + Active = 0; + if (before) + ThisItem->Active = Active; + else + ThisItem->StillActive = Active; } DeleteHashPos(&It); return ActiveDeliveries; @@ -362,7 +385,10 @@ StrBuf *SerializeQueueItem(OneQueItem *MyQItem) StrBufAppendBufPlain(QMessage, HKEY("|"), 0); StrBufAppendPrintf(QMessage, "%d", ThisItem->Status); StrBufAppendBufPlain(QMessage, HKEY("|"), 0); - StrBufAppendBuf(QMessage, ThisItem->StatusMessage, 0); + if (ThisItem->AllStatusMessages != NULL) + StrBufAppendBuf(QMessage, ThisItem->AllStatusMessages, 0); + else + StrBufAppendBuf(QMessage, ThisItem->StatusMessage, 0); } DeleteHashPos(&It); StrBufAppendBufPlain(QMessage, HKEY("\n"), 0); @@ -380,7 +406,8 @@ void NewMailQEntry(OneQueItem *Item) if (Item->MailQEntries == NULL) Item->MailQEntries = NewHash(1, Flathash); - Item->Current->StatusMessage = NewStrBuf(); + /* alocate big buffer so we won't get problems reallocating later. */ + Item->Current->StatusMessage = NewStrBufPlain(NULL, SIZ); Item->Current->n = GetCount(Item->MailQEntries); Put(Item->MailQEntries, IKEY(Item->Current->n), @@ -454,7 +481,7 @@ void QItem_Handle_Attempted(OneQueItem *Item, StrBuf *Line, const char **Pos) /** * this one has to have the context for loading the message via the redirect buffer... */ -StrBuf *smtp_load_msg(OneQueItem *MyQItem, int n) +StrBuf *smtp_load_msg(OneQueItem *MyQItem, int n, char **Author, char **Address) { CitContext *CCC=CC; StrBuf *SendMsg; @@ -463,17 +490,19 @@ StrBuf *smtp_load_msg(OneQueItem *MyQItem, int n) CtdlOutputMsg(MyQItem->MessageID, MT_RFC822, HEADERS_ALL, 0, 1, NULL, - (ESC_DOT|SUPPRESS_ENV_TO) ); + (ESC_DOT|SUPPRESS_ENV_TO), + Author, + Address); SendMsg = CCC->redirect_buffer; CCC->redirect_buffer = NULL; if ((StrLength(SendMsg) > 0) && ChrPtr(SendMsg)[StrLength(SendMsg) - 1] != '\n') { - syslog(LOG_WARNING, - "SMTP client[%d]: Possible problem: message did not " - "correctly terminate. (expecting 0x10, got 0x%02x)\n", - MsgCount, //yes uncool, but best choice here... - ChrPtr(SendMsg)[StrLength(SendMsg) - 1] ); + SMTPC_syslog(LOG_WARNING, + "[%d] Possible problem: message did not " + "correctly terminate. (expecting 0x10, got 0x%02x)\n", + MsgCount, //yes uncool, but best choice here... + ChrPtr(SendMsg)[StrLength(SendMsg) - 1] ); StrBufAppendBufPlain(SendMsg, HKEY("\r\n"), 0); } return SendMsg; @@ -486,7 +515,7 @@ StrBuf *smtp_load_msg(OneQueItem *MyQItem, int n) * instructions for "5" codes (permanent fatal errors) and produce/deliver * a "bounce" message (delivery status notification). */ -void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt) +void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt, ParsedURL *Relay) { static int seq = 0; @@ -507,7 +536,7 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt) int num_bounces = 0; int give_up = 0; - syslog(LOG_DEBUG, "smtp_do_bounce() called\n"); + SMTPCM_syslog(LOG_DEBUG, "smtp_do_bounce() called\n"); if (MyQItem->SendBounceMail == 0) return; @@ -537,6 +566,7 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt) { ++num_bounces; + StrBufAppendBufPlain(Msg, HKEY(" "), 0); StrBufAppendBuf(Msg, ThisItem->Recipient, 0); StrBufAppendBufPlain(Msg, HKEY(": "), 0); StrBufAppendBuf(Msg, ThisItem->StatusMessage, 0); @@ -546,13 +576,29 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt) DeleteHashPos(&It); /* Deliver the bounce if there's anything worth mentioning */ - syslog(LOG_DEBUG, "num_bounces = %d\n", num_bounces); + SMTPC_syslog(LOG_DEBUG, "num_bounces = %d\n", num_bounces); if (num_bounces == 0) { FreeStrBuf(&Msg); return; } + if ((StrLength(MyQItem->SenderRoom) == 0) && MyQItem->HaveRelay) { + const char *RelayUrlStr = "[not found]"; + /* one message that relaying is broken is enough; no extra room error message. */ + StrBuf *RelayDetails = NewStrBuf(); + + if (Relay != NULL) + RelayUrlStr = ChrPtr(Relay->URL); + + StrBufPrintf(RelayDetails, + "Relaying via %s failed permanently. \n Reason:\n%s\n Revalidate your relay configuration.", + RelayUrlStr, + ChrPtr(Msg)); + CtdlAideMessage(ChrPtr(RelayDetails), "Relaying Failed"); + FreeStrBuf(&RelayDetails); + } + boundary = NewStrBufPlain(HKEY("=_Citadel_Multipart_")); StrBufAppendPrintf(boundary, "%s_%04x%04x", @@ -568,7 +614,7 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt) StrLength(OMsgTxt)); /* the original message */ if (BounceMB == NULL) { FreeStrBuf(&boundary); - syslog(LOG_ERR, "Failed to alloc() bounce message.\n"); + SMTPCM_syslog(LOG_ERR, "Failed to alloc() bounce message.\n"); return; } @@ -577,7 +623,7 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt) if (bmsg == NULL) { FreeStrBuf(&boundary); FreeStrBuf(&BounceMB); - syslog(LOG_ERR, "Failed to alloc() bounce message.\n"); + SMTPCM_syslog(LOG_ERR, "Failed to alloc() bounce message.\n"); return; } @@ -630,7 +676,7 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt) } /* Attach the original message */ - StrBufAppendBufPlain(BounceMB, HKEY("--"), 0); + StrBufAppendBufPlain(BounceMB, HKEY("\r\n--"), 0); StrBufAppendBuf(BounceMB, boundary, 0); StrBufAppendBufPlain(BounceMB, HKEY("\r\n"), 0); StrBufAppendBufPlain(BounceMB, @@ -658,11 +704,13 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt) bmsg->cm_fields['M'] = SmashStrBuf(&BounceMB); /* First try the user who sent the message */ - if (StrLength(MyQItem->BounceTo) == 0) - syslog(LOG_ERR, "No bounce address specified\n"); - else - syslog(LOG_DEBUG, "bounce to user? <%s>\n", + if (StrLength(MyQItem->BounceTo) == 0) { + SMTPCM_syslog(LOG_ERR, "No bounce address specified\n"); + } + else { + SMTPC_syslog(LOG_DEBUG, "bounce to user? <%s>\n", ChrPtr(MyQItem->BounceTo)); + } /* Can we deliver the bounce to the original sender? */ valid = validate_recipients(ChrPtr(MyQItem->BounceTo), NULL, 0); @@ -680,9 +728,84 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt) free_recipients(valid); FreeStrBuf(&boundary); CtdlFreeMessage(bmsg); - syslog(LOG_DEBUG, "Done processing bounces\n"); + SMTPCM_syslog(LOG_DEBUG, "Done processing bounces\n"); } +ParsedURL *LoadRelayUrls(OneQueItem *MyQItem, + char *Author, + char *Address) +{ + int nRelays = 0; + ParsedURL *RelayUrls = NULL; + char mxbuf[SIZ]; + ParsedURL **Url = &MyQItem->URL; + + nRelays = get_hosts(mxbuf, "fallbackhost"); + if (nRelays > 0) { + StrBuf *All; + StrBuf *One; + const char *Pos = NULL; + All = NewStrBufPlain(mxbuf, -1); + One = NewStrBufPlain(NULL, StrLength(All) + 1); + + while ((Pos != StrBufNOTNULL) && + ((Pos == NULL) || + !IsEmptyStr(Pos))) + { + StrBufExtract_NextToken(One, All, &Pos, '|'); + if (!ParseURL(Url, One, DefaultMXPort)) { + SMTPC_syslog(LOG_DEBUG, + "Failed to parse: %s\n", + ChrPtr(One)); + } + else { + (*Url)->IsRelay = 1; + MyQItem->HaveRelay = 1; + } + } + FreeStrBuf(&All); + FreeStrBuf(&One); + } + nRelays = get_hosts(mxbuf, "smarthost"); + if (nRelays > 0) { + char *User; + StrBuf *All; + StrBuf *One; + const char *Pos = NULL; + All = NewStrBufPlain(mxbuf, -1); + One = NewStrBufPlain(NULL, StrLength(All) + 1); + + while ((Pos != StrBufNOTNULL) && + ((Pos == NULL) || + !IsEmptyStr(Pos))) + { + StrBufExtract_NextToken(One, All, &Pos, '|'); + User = strchr(ChrPtr(One), ' '); + if (User != NULL) { + if (!strcmp(User + 1, Author) || + !strcmp(User + 1, Address)) + StrBufCutAt(One, 0, User); + else { + MyQItem->HaveRelay = 1; + continue; + } + } + if (!ParseURL(Url, One, DefaultMXPort)) { + SMTPC_syslog(LOG_DEBUG, + "Failed to parse: %s\n", + ChrPtr(One)); + } + else { + ///if (!Url->IsIP)) // todo dupe me fork ipv6 + (*Url)->IsRelay = 1; + MyQItem->HaveRelay = 1; + } + } + FreeStrBuf(&All); + FreeStrBuf(&One); + } + return RelayUrls; +} /* * smtp_do_procmsg() * @@ -692,6 +815,8 @@ void smtp_do_procmsg(long msgnum, void *userdata) { time_t now; int mynumsessions = num_sessions; struct CtdlMessage *msg = NULL; + char *Author = NULL; + char *Address = NULL; char *instr = NULL; StrBuf *PlainQItem; OneQueItem *MyQItem; @@ -700,24 +825,22 @@ void smtp_do_procmsg(long msgnum, void *userdata) { void *vQE; long len; const char *Key; - int nRelays = 0; - ParsedURL *RelayUrls = NULL; int HaveBuffers = 0; StrBuf *Msg =NULL; if (mynumsessions > max_sessions_for_outbound_smtp) { - syslog(LOG_DEBUG, - "SMTP Queue: skipping because of num jobs %d > %d max_sessions_for_outbound_smtp", - mynumsessions, - max_sessions_for_outbound_smtp); + SMTPC_syslog(LOG_DEBUG, + "skipping because of num jobs %d > %d max_sessions_for_outbound_smtp", + mynumsessions, + max_sessions_for_outbound_smtp); } - syslog(LOG_DEBUG, "SMTP Queue: smtp_do_procmsg(%ld)\n", msgnum); + SMTPC_syslog(LOG_DEBUG, "smtp_do_procmsg(%ld)\n", msgnum); ///strcpy(envelope_from, ""); msg = CtdlFetchMessage(msgnum, 1); if (msg == NULL) { - syslog(LOG_ERR, "SMTP Queue: tried %ld but no such message!\n", + SMTPC_syslog(LOG_ERR, "tried %ld but no such message!\n", msgnum); return; } @@ -738,9 +861,9 @@ void smtp_do_procmsg(long msgnum, void *userdata) { FreeStrBuf(&PlainQItem); if (MyQItem == NULL) { - syslog(LOG_ERR, - "SMTP Queue: Msg No %ld: already in progress!\n", - msgnum); + SMTPC_syslog(LOG_ERR, + "Msg No %ld: already in progress!\n", + msgnum); return; /* s.b. else is already processing... */ } @@ -752,7 +875,9 @@ void smtp_do_procmsg(long msgnum, void *userdata) { (now < MyQItem->ReattemptWhen) && (run_queue_now == 0)) { - syslog(LOG_DEBUG, "SMTP client: Retry time not yet reached. %ld seconds left.", MyQItem->ReattemptWhen - now); + SMTPC_syslog(LOG_DEBUG, + "Retry time not yet reached. %ld seconds left.", + MyQItem->ReattemptWhen - now); It = GetNewHashPos(MyQItem->MailQEntries, 0); pthread_mutex_lock(&ActiveQItemsLock); @@ -774,7 +899,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) { * Bail out if there's no actual message associated with this */ if (MyQItem->MessageID < 0L) { - syslog(LOG_ERR, "SMTP Queue: no 'msgid' directive found!\n"); + SMTPCM_syslog(LOG_ERR, "no 'msgid' directive found!\n"); It = GetNewHashPos(MyQItem->MailQEntries, 0); pthread_mutex_lock(&ActiveQItemsLock); { @@ -791,72 +916,19 @@ void smtp_do_procmsg(long msgnum, void *userdata) { return; } - { - char mxbuf[SIZ]; - ParsedURL **Url = &MyQItem->URL; - nRelays = get_hosts(mxbuf, "smarthost"); - if (nRelays > 0) { - StrBuf *All; - StrBuf *One; - const char *Pos = NULL; - All = NewStrBufPlain(mxbuf, -1); - One = NewStrBufPlain(NULL, StrLength(All) + 1); - - while ((Pos != StrBufNOTNULL) && - ((Pos == NULL) || - !IsEmptyStr(Pos))) - { - StrBufExtract_NextToken(One, All, &Pos, '|'); - if (!ParseURL(Url, One, 25)) - syslog(LOG_DEBUG, - "Failed to parse: %s\n", - ChrPtr(One)); - else { - ///if (!Url->IsIP)) // todo dupe me fork ipv6 - Url = &(*Url)->Next; - } - } - FreeStrBuf(&All); - FreeStrBuf(&One); - } - - Url = &MyQItem->FallBackHost; - nRelays = get_hosts(mxbuf, "fallbackhost"); - if (nRelays > 0) { - StrBuf *All; - StrBuf *One; - const char *Pos = NULL; - All = NewStrBufPlain(mxbuf, -1); - One = NewStrBufPlain(NULL, StrLength(All) + 1); - - while ((Pos != StrBufNOTNULL) && - ((Pos == NULL) || - !IsEmptyStr(Pos))) - { - StrBufExtract_NextToken(One, All, &Pos, '|'); - if (!ParseURL(Url, One, 25)) - syslog(LOG_DEBUG, - "Failed to parse: %s\n", - ChrPtr(One)); - else - Url = &(*Url)->Next; - } - FreeStrBuf(&All); - FreeStrBuf(&One); - } - } It = GetNewHashPos(MyQItem->MailQEntries, 0); while (GetNextHashPos(MyQItem->MailQEntries, It, &len, &Key, &vQE)) { MailQEntry *ThisItem = vQE; - syslog(LOG_DEBUG, "SMTP Queue: Task: <%s> %d\n", - ChrPtr(ThisItem->Recipient), - ThisItem->Active); + SMTPC_syslog(LOG_DEBUG, "SMTP Queue: Task: <%s> %d\n", + ChrPtr(ThisItem->Recipient), + ThisItem->Active); } DeleteHashPos(&It); - MyQItem->ActiveDeliveries = CountActiveQueueEntries(MyQItem); + MyQItem->NotYetShutdownDeliveries = + MyQItem->ActiveDeliveries = CountActiveQueueEntries(MyQItem, 1); /* failsafe against overload: * will we exceed the limit set? @@ -868,11 +940,11 @@ void smtp_do_procmsg(long msgnum, void *userdata) { (((MyQItem->ActiveDeliveries * 2) < max_sessions_for_outbound_smtp))) { /* abort delivery for another time. */ - syslog(LOG_DEBUG, - "SMTP Queue: skipping because of num jobs %d + %ld > %d max_sessions_for_outbound_smtp", - mynumsessions, - MyQItem->ActiveDeliveries, - max_sessions_for_outbound_smtp); + SMTPC_syslog(LOG_DEBUG, + "SMTP Queue: skipping because of num jobs %d + %ld > %d max_sessions_for_outbound_smtp", + mynumsessions, + MyQItem->ActiveDeliveries, + max_sessions_for_outbound_smtp); FreeQueItem(&MyQItem); @@ -882,12 +954,60 @@ void smtp_do_procmsg(long msgnum, void *userdata) { if (MyQItem->ActiveDeliveries > 0) { + ParsedURL *RelayUrls = NULL; int nActivated = 0; int n = MsgCount++; int m = MyQItem->ActiveDeliveries; int i = 1; - Msg = smtp_load_msg(MyQItem, n); + It = GetNewHashPos(MyQItem->MailQEntries, 0); + + Msg = smtp_load_msg(MyQItem, n, &Author, &Address); + RelayUrls = LoadRelayUrls(MyQItem, Author, Address); + if ((RelayUrls == NULL) && MyQItem->HaveRelay) { + + while ((i <= m) && + (GetNextHashPos(MyQItem->MailQEntries, + It, &len, &Key, &vQE))) + { + int KeepBuffers = (i == m); + MailQEntry *ThisItem = vQE; + StrBufPrintf(ThisItem->StatusMessage, + "No relay configured matching %s / %s", + (Author != NULL)? Author : "", + (Address != NULL)? Address : ""); + ThisItem->Status = 5; + + nActivated++; + + if (i > 1) n = MsgCount++; + syslog(LOG_INFO, + "SMTPC: giving up on <%ld> <%s> %d / %d \n", + MyQItem->MessageID, + ChrPtr(ThisItem->Recipient), + i, + m); + (*((int*) userdata)) ++; + smtp_try_one_queue_entry(MyQItem, + ThisItem, + Msg, + KeepBuffers, + n, + RelayUrls); + + if (KeepBuffers) HaveBuffers = 1; + + i++; + } + if (Author != NULL) free (Author); + if (Address != NULL) free (Address); + DeleteHashPos(&It); + + return; + } + if (Author != NULL) free (Author); + if (Address != NULL) free (Address); + while ((i <= m) && (GetNextHashPos(MyQItem->MailQEntries, It, &len, &Key, &vQE))) @@ -904,11 +1024,12 @@ void smtp_do_procmsg(long msgnum, void *userdata) { if (i > 1) n = MsgCount++; syslog(LOG_DEBUG, - "SMTPQ: Trying <%ld> <%s> %d / %d \n", + "SMTPC: Trying <%ld> <%s> %d / %d \n", MyQItem->MessageID, ChrPtr(ThisItem->Recipient), i, m); + (*((int*) userdata)) ++; smtp_try_one_queue_entry(MyQItem, ThisItem, Msg, @@ -940,19 +1061,18 @@ void smtp_do_procmsg(long msgnum, void *userdata) { const char* Key; void *VData; - syslog(LOG_WARNING, - "SMTP cleanup: unable to find " - "QItem with ID[%ld]", - MyQItem->MessageID); + SMTPC_syslog(LOG_WARNING, + "unable to find QItem with ID[%ld]", + MyQItem->MessageID); while (GetNextHashPos(ActiveQItems, It, &len, &Key, &VData)) { - syslog(LOG_WARNING, - "SMTP cleanup: have: ID[%ld]", - ((OneQueItem *)VData)->MessageID); + SMTPC_syslog(LOG_WARNING, + "have: ID[%ld]", + ((OneQueItem *)VData)->MessageID); } } @@ -978,18 +1098,14 @@ void smtp_do_procmsg(long msgnum, void *userdata) { * Run through the queue sending out messages. */ void smtp_do_queue(void) { - static int is_running = 0; int num_processed = 0; - - if (is_running) - return; /* Concurrency check - only one can run */ - is_running = 1; + int num_activated = 0; pthread_setspecific(MyConKey, (void *)&smtp_queue_CC); - syslog(LOG_INFO, "SMTP client: processing outbound queue"); + SMTPCM_syslog(LOG_INFO, "processing outbound queue"); if (CtdlGetRoom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) { - syslog(LOG_ERR, "Cannot find room <%s>", SMTP_SPOOLOUT_ROOM); + SMTPC_syslog(LOG_ERR, "Cannot find room <%s>", SMTP_SPOOLOUT_ROOM); } else { num_processed = CtdlForEachMessage(MSGS_ALL, @@ -998,14 +1114,12 @@ void smtp_do_queue(void) { SPOOLMIME, NULL, smtp_do_procmsg, - NULL); + &num_activated); } - syslog(LOG_INFO, - "SMTP client: queue run completed; %d messages processed", - num_processed); + SMTPC_syslog(LOG_INFO, + "queue run completed; %d messages processed %d activated", + num_processed, num_activated); - run_queue_now = 0; - is_running = 0; } @@ -1117,7 +1231,7 @@ CTDL_MODULE_INIT(smtp_queu) CtdlRegisterEVCleanupHook(smtp_evq_cleanup); CtdlRegisterProtoHook(cmd_smtp, "SMTP", "SMTP utility commands"); - CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER); + CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER, PRIO_SEND + 10); } /* return our Subversion id for the Log */