#include "smtpqueue.h"
#include "event_client.h"
-HashList *QItemHandlers = NULL;
citthread_mutex_t ActiveQItemsLock;
-HashList *ActiveQItems = NULL;
+HashList *ActiveQItems = NULL;
+HashList *QItemHandlers = NULL;
-int MsgCount = 0;
-int run_queue_now = 0; /* Set to 1 to ignore SMTP send retry times */
+int MsgCount = 0;
+int run_queue_now = 0; /* Set to 1 to ignore SMTP send retry times */
-void smtp_try(OneQueItem *MyQItem,
- MailQEntry *MyQEntry,
- StrBuf *MsgText,
- int KeepMsgText, /* KeepMsgText allows us to use MsgText as ours. */
- int MsgCount);
+void smtp_try_one_queue_entry(OneQueItem *MyQItem,
+ MailQEntry *MyQEntry,
+ StrBuf *MsgText,
+ int KeepMsgText, /* KeepMsgText allows us to use MsgText as ours. */
+ int MsgCount,
+ ParsedURL *RelayUrls);
void smtp_evq_cleanup(void)
}
-
void FreeMailQEntry(void *qv)
{
MailQEntry *Q = qv;
DeleteHash(&(*Item)->MailQEntries);
FreeStrBuf(&(*Item)->EnvelopeFrom);
FreeStrBuf(&(*Item)->BounceTo);
+ FreeURL(&(*Item)->URL);
free(*Item);
Item = NULL;
}
citthread_mutex_lock(&ActiveQItemsLock);
if (GetHash(ActiveQItems,
- IKEY(Item->QueMsgID),
+ IKEY(QueMsgID),
&v))
{
/* WHOOPS. somebody else is already working on this. */
if ((StrLength(SendMsg) > 0) &&
ChrPtr(SendMsg)[StrLength(SendMsg) - 1] != '\n') {
CtdlLogPrintf(CTDL_WARNING,
- "SMTP client[%ld]: Possible problem: message did not "
+ "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] );
*/
void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt)
{
- StrBuf *boundary, *Msg = NULL;
- int num_bounces = 0;
- struct CtdlMessage *bmsg = NULL;
- int give_up = 0;
- struct recptypes *valid;
- int successful_bounce = 0;
static int seq = 0;
+
+ struct CtdlMessage *bmsg = NULL;
+ StrBuf *boundary;
+ StrBuf *Msg = NULL;
StrBuf *BounceMB;
- HashPos *It;
+ struct recptypes *valid;
+
+ HashPos *It;
void *vQE;
long len;
const char *Key;
+ int successful_bounce = 0;
+ int num_bounces = 0;
+ int give_up = 0;
+
CtdlLogPrintf(CTDL_DEBUG, "smtp_do_bounce() called\n");
-
- if ( (time(NULL) - MyQItem->Submitted) > SMTP_GIVE_UP ) {
+
+ if ( (ev_time() - MyQItem->Submitted) > SMTP_GIVE_UP ) {
give_up = 1;/// TODO: replace time by libevq timer get
}
CtdlLogPrintf(CTDL_DEBUG, "Done processing bounces\n");
}
+
+
+/*
+{
+
+ if (threadding)
+ n_smarthosts = get_hosts(char *mxbuf, char *rectype);
+}
+*/
/*
* smtp_do_procmsg()
*
void *vQE;
long len;
const char *Key;
-
+ int nRelays = 0;
+ ParsedURL *RelayUrls = NULL;
+ int HaveBuffers = 0;
+ StrBuf *Msg =NULL;
+
CtdlLogPrintf(CTDL_DEBUG, "SMTP Queue: smtp_do_procmsg(%ld)\n", msgnum);
///strcpy(envelope_from, "");
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))
+ CtdlLogPrintf(CTDL_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))
+ CtdlLogPrintf(CTDL_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))
{
if (MyQItem->ActiveDeliveries > 0)
{
int n = MsgCount++;
+ int m = MyQItem->ActiveDeliveries;
int i = 1;
- StrBuf *Msg = smtp_load_msg(MyQItem, n);
+ Msg = smtp_load_msg(MyQItem, n);
It = GetNewHashPos(MyQItem->MailQEntries, 0);
- while ((i <= MyQItem->ActiveDeliveries) &&
+ while ((i <= m) &&
(GetNextHashPos(MyQItem->MailQEntries, It, &len, &Key, &vQE)))
{
MailQEntry *ThisItem = vQE;
if (ThisItem->Active == 1) {
+ int KeepBuffers = (i == m);
if (i > 1) n = MsgCount++;
- CtdlLogPrintf(CTDL_DEBUG, "SMTP Queue: Trying <%s>\n", ChrPtr(ThisItem->Recipient));
- smtp_try(MyQItem, ThisItem, Msg, (i == MyQItem->ActiveDeliveries), n);
+ CtdlLogPrintf(CTDL_DEBUG,
+ "SMTP Queue: Trying <%s> %d / %d \n",
+ ChrPtr(ThisItem->Recipient),
+ i,
+ m);
+ smtp_try_one_queue_entry(MyQItem,
+ ThisItem,
+ Msg,
+ KeepBuffers,
+ n,
+ RelayUrls);
+ if (KeepBuffers) HaveBuffers = 1;
i++;
}
}
// TODO: bounce & delete?
}
+ if (!HaveBuffers) {
+ FreeStrBuf (&Msg);
+// TODO : free RelayUrls
+ }
}
CtdlThreadSleep(10);
- CtdlFillSystemContext(&smtp_queue_CC, "SMTP Send");
+ CtdlFillSystemContext(&smtp_queue_CC, "SMTP_Send");
citthread_setspecific(MyConKey, (void *)&smtp_queue_CC);
CtdlLogPrintf(CTDL_DEBUG, "smtp_queue_thread() initializing\n");
#ifdef EXPERIMENTAL_SMTP_EVENT_CLIENT
if (!threading)
{
- ActiveQItems = NewHash(1, Flathash);
+ ActiveQItems = NewHash(1, lFlathash);
citthread_mutex_init(&ActiveQItemsLock, NULL);
QItemHandlers = NewHash(0, NULL);
projects / citadel.git / blobdiff