#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,
- ParsedURL *RelayUrls);
+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)
{
int IDestructQueItem;
- citthread_mutex_lock(&ActiveQItemsLock);
MyQItem->ActiveDeliveries--;
IDestructQueItem = MyQItem->ActiveDeliveries == 0;
- citthread_mutex_unlock(&ActiveQItemsLock);
return IDestructQueItem;
}
DeleteHashPos(&It);
}
-
+void FreeURL(ParsedURL** Url)
+{
+ if (*Url != NULL) {
+ FreeStrBuf(&(*Url)->URL);
+ if ((*Url)->Next != NULL)
+ FreeURL(&(*Url)->Next);
+ free(*Url);
+ *Url = NULL;
+ }
+}
void FreeMailQEntry(void *qv)
{
DeleteHash(&(*Item)->MailQEntries);
FreeStrBuf(&(*Item)->EnvelopeFrom);
FreeStrBuf(&(*Item)->BounceTo);
+ FreeURL(&(*Item)->URL);
free(*Item);
Item = NULL;
}
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] );
int ParseURL(ParsedURL **Url, StrBuf *UrlStr, short DefaultPort)
{
- const char *pch, *pStartHost, *pEndHost, *pPort, *pCredEnd, *pUserEnd;
+ const char *pch, *pEndHost, *pPort, *pCredEnd, *pUserEnd;
ParsedURL *url = (ParsedURL *)malloc(sizeof(ParsedURL));
memset(url, 0, sizeof(ParsedURL));
* http://username:passvoid@[ipv6]:port/url
*/
url->URL = NewStrBufDup(UrlStr);
- pStartHost = pch = ChrPtr(url->URL);
+ url->Host = pch = ChrPtr(url->URL);
url->LocalPart = strchr(pch, '/');
if (url->LocalPart != NULL) {
if ((*(url->LocalPart + 1) == '/') &&
(*(url->LocalPart + 2) == ':')) { /* TODO: find default port for this protocol... */
- pStartHost = url->LocalPart + 3;
- url->LocalPart = strchr(pStartHost, '/');
+ url->Host = url->LocalPart + 3;
+ url->LocalPart = strchr(url->Host, '/');
}
}
if (url->LocalPart == NULL) {
- url->LocalPart = pch + StrLength(UrlStr);
+ url->LocalPart = pch + StrLength(url->URL);
}
pCredEnd = strchr(pch, '@');
pCredEnd = NULL;
if (pCredEnd != NULL)
{
- url->User = pStartHost;
- pStartHost = pCredEnd + 1;
+ url->User = url->Host;
+ url->Host = pCredEnd + 1;
pUserEnd = strchr(url->User, ':');
if (pUserEnd > pCredEnd)
else {
url->Pass = pUserEnd + 1;
}
- StrBufPeek(UrlStr, pUserEnd, 0, '\0');
- StrBufPeek(UrlStr, pCredEnd, 0, '\0');
+ StrBufPeek(url->URL, pUserEnd, 0, '\0');
+ StrBufPeek(url->URL, pCredEnd, 0, '\0');
}
pPort = NULL;
- if (*pStartHost == '[') {
- pStartHost ++;
- pEndHost = strchr(pStartHost, ']');
+ if (*url->Host == '[') {
+ url->Host ++;
+ pEndHost = strchr(url->Host, ']');
if (pEndHost == NULL) {
+ FreeStrBuf(&url->URL);
free(url);
return 0; /* invalid syntax, no ipv6 */
}
- if (*(pEndHost + 1) == ':')
+ StrBufPeek(url->URL, pEndHost, 0, '\0');
+ if (*(pEndHost + 1) == ':'){
+ StrBufPeek(url->URL, pEndHost + 1, 0, '\0');
pPort = pEndHost + 2;
+ }
url->af = AF_INET6;
}
else {
- pPort = strchr(pStartHost, ':');
- if (pPort != NULL)
+ pPort = strchr(url->Host, ':');
+ if (pPort != NULL) {
+ StrBufPeek(url->URL, pPort, 0, '\0');
pPort ++;
+ }
}
if (pPort != NULL)
url->Port = atol(pPort);
- url->IsIP = inet_pton(url->af, pStartHost, &url->Addr);
+ url->IsIP = inet_pton(url->af, url->Host, &url->Addr);
+ *Url = url;
return 1;
}
/*
{
char mxbuf[SIZ];
- ParsedURL **Url = &RelayUrls; ///&MyQItem->Relay;
+ ParsedURL **Url = &MyQItem->URL;
nRelays = get_hosts(mxbuf, "smarthost");
if (nRelays > 0) {
StrBuf *All;
All = NewStrBufPlain(mxbuf, -1);
One = NewStrBufPlain(NULL, StrLength(All) + 1);
- while (Pos != StrBufNOTNULL) {
+ 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);
+ }
+
+ 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);
}
}
if (MyQItem->ActiveDeliveries > 0)
{
int n = MsgCount++;
+ int m = MyQItem->ActiveDeliveries;
int i = 1;
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 == MyQItem->ActiveDeliveries);
+ 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, KeepBuffers, n, RelayUrls);
+ 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++;
}
projects / citadel.git / blobdiff