#include "ctdl_module.h"
-///#include "smtp_util.h"
#include "smtpqueue.h"
#include "event_client.h"
MailQEntry *MyQEntry,
StrBuf *MsgText,
int KeepMsgText, /* KeepMsgText allows us to use MsgText as ours. */
- int MsgCount);
+ 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] );
*/
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
}
/* Deliver the bounce if there's anything worth mentioning */
CtdlLogPrintf(CTDL_DEBUG, "num_bounces = %d\n", num_bounces);
- if (num_bounces == 0)
+ if (num_bounces == 0) {
+ FreeStrBuf(&Msg);
return;
+ }
boundary = NewStrBufPlain(HKEY("=_Citadel_Multipart_"));
StrBufAppendPrintf(boundary, "%s_%04x%04x", config.c_fqdn, getpid(), ++seq);
bmsg->cm_format_type = FMT_RFC822;
bmsg->cm_fields['O'] = strdup(MAILROOM);
+ bmsg->cm_fields['A'] = strdup("Citadel");
bmsg->cm_fields['N'] = strdup(config.c_nodename);
bmsg->cm_fields['U'] = strdup("Delivery Status Notification (Failure)");
- bmsg->cm_fields['A'] = SmashStrBuf(&BounceMB);
+ bmsg->cm_fields['M'] = SmashStrBuf(&BounceMB);
/* First try the user who sent the message */
if (StrLength(MyQItem->BounceTo) == 0)
CtdlLogPrintf(CTDL_DEBUG, "Done processing bounces\n");
}
+
+
+int ParseURL(ParsedURL **Url, StrBuf *UrlStr, short DefaultPort)
+{
+ const char *pch, *pEndHost, *pPort, *pCredEnd, *pUserEnd;
+ ParsedURL *url = (ParsedURL *)malloc(sizeof(ParsedURL));
+ memset(url, 0, sizeof(ParsedURL));
+
+ url->af = AF_INET;
+ url->Port = DefaultPort;
+ /*
+ * http://username:passvoid@[ipv6]:port/url
+ */
+ url->URL = NewStrBufDup(UrlStr);
+ 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... */
+ url->Host = url->LocalPart + 3;
+ url->LocalPart = strchr(url->Host, '/');
+ }
+ }
+ if (url->LocalPart == NULL) {
+ url->LocalPart = pch + StrLength(url->URL);
+ }
+
+ pCredEnd = strchr(pch, '@');
+ if (pCredEnd >= url->LocalPart)
+ pCredEnd = NULL;
+ if (pCredEnd != NULL)
+ {
+ url->User = url->Host;
+ url->Host = pCredEnd + 1;
+ pUserEnd = strchr(url->User, ':');
+
+ if (pUserEnd > pCredEnd)
+ pUserEnd = pCredEnd;
+ else {
+ url->Pass = pUserEnd + 1;
+ }
+ StrBufPeek(url->URL, pUserEnd, 0, '\0');
+ StrBufPeek(url->URL, pCredEnd, 0, '\0');
+ }
+
+ pPort = NULL;
+ if (*url->Host == '[') {
+ url->Host ++;
+ pEndHost = strchr(url->Host, ']');
+ if (pEndHost == NULL) {
+ FreeStrBuf(&url->URL);
+ free(url);
+ return 0; /* invalid syntax, no ipv6 */
+ }
+ 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(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, url->Host, &url->Addr);
+ *Url = url;
+ return 1;
+}
+/*
+{
+
+ 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
+ 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(MyQItem, ThisItem, Msg, KeepBuffers, n, RelayUrls);
+ if (KeepBuffers) HaveBuffers = 1;
i++;
}
}
// TODO: bounce & delete?
}
+ if (!HaveBuffers) {
+ FreeStrBuf (&Msg);
+// TODO : free RelayUrls
+ }
}
projects / citadel.git / blobdiff