#include "smtpqueue.h"
#include "smtp_clienthandlers.h"
-int SMTPClientDebugEnabled = 0;
-const unsigned short DefaultMXPort = 25;
+ConstStr SMTPStates[] = {
+ {HKEY("looking up mx - record")},
+ {HKEY("evaluating what to do next")},
+ {HKEY("looking up a - record")},
+ {HKEY("looking up aaaa - record")},
+ {HKEY("connecting remote")},
+ {HKEY("smtp conversation ongoing")},
+ {HKEY("smtp sending maildata")},
+ {HKEY("smtp sending done")},
+ {HKEY("smtp successfully finished")},
+ {HKEY("failed one attempt")},
+ {HKEY("failed temporarily")},
+ {HKEY("failed permanently")}
+};
+
+void SetSMTPState(AsyncIO *IO, smtpstate State)
+{
+ CitContext* CCC = IO->CitContext;
+ if (CCC != NULL)
+ memcpy(CCC->cs_clientname, SMTPStates[State].Key, SMTPStates[State].len + 1);
+}
+
void DeleteSmtpOutMsg(void *v)
{
SmtpOutMsg *Msg = v;
- AsyncIO *IO = &Msg->IO;
- EVS_syslog(LOG_DEBUG, "%s Exit\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s Exit\n", __FUNCTION__);
/* these are kept in our own space and free'd below */
Msg->IO.ConnectMe = NULL;
Msg->HostLookup.DNSReplyFree(Msg->HostLookup.VParsedDNSReply);
FreeURL(&Msg->Relay);
FreeStrBuf(&Msg->msgtext);
+ FreeStrBuf(&Msg->MultiLineBuf);
FreeAsyncIOContents(&Msg->IO);
memset (Msg, 0, sizeof(SmtpOutMsg)); /* just to be shure... */
free(Msg);
{
const char *Status;
SmtpOutMsg *Msg = IO->Data;
-
- if (Msg->MyQEntry->Status == 2)
+ StrBuf *StatusMessage;
+
+ if (Msg->MyQEntry->AllStatusMessages != NULL)
+ StatusMessage = Msg->MyQEntry->AllStatusMessages;
+ else
+ StatusMessage = Msg->MyQEntry->StatusMessage;
+
+
+ if (Msg->MyQEntry->Status == 2) {
+ SetSMTPState(IO, eSTMPfinished);
Status = "Delivery successful.";
- else if (Msg->MyQEntry->Status == 5)
+ }
+ else if (Msg->MyQEntry->Status == 5) {
+ SetSMTPState(IO, eSMTPFailTotal);
Status = "Delivery failed permanently; giving up.";
- else
+ }
+ else {
+ SetSMTPState(IO, eSMTPFailTemporary);
Status = "Delivery failed temporarily; will retry later.";
+ }
- EVS_syslog(LOG_INFO,
+ syslog(LOG_INFO,
"%s Time[%fs] Recipient <%s> @ <%s> (%s) Status message: %s\n",
Status,
Msg->IO.Now - Msg->IO.StartIO,
Msg->user,
Msg->node,
Msg->name,
- ChrPtr(Msg->MyQEntry->StatusMessage));
+ ChrPtr(StatusMessage));
Msg->IDestructQueItem = DecreaseQReference(Msg->MyQItem);
- Msg->nRemain = CountActiveQueueEntries(Msg->MyQItem);
+ Msg->nRemain = CountActiveQueueEntries(Msg->MyQItem, 0);
if (Msg->MyQEntry->Active &&
+ !Msg->MyQEntry->StillActive &&
CheckQEntryIsBounce(Msg->MyQEntry))
{
/* are we casue for a bounce mail? */
* Uncompleted delivery instructions remain, so delete the old
* instructions and replace with the updated ones.
*/
- EVS_syslog(LOG_DEBUG, "%ld", Msg->MyQItem->QueMsgID);
+ syslog(LOG_DEBUG, "%ld", Msg->MyQItem->QueMsgID);
CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
Msg->MyQItem->QueMsgID = -1;
if (Msg->IDestructQueItem)
- smtpq_do_bounce(Msg->MyQItem, Msg->msgtext);
+ smtpq_do_bounce(Msg->MyQItem, Msg->msgtext, Msg->pCurrRelay);
if (Msg->nRemain > 0)
{
msg->cm_magic = CTDLMESSAGE_MAGIC;
msg->cm_anon_type = MES_NORMAL;
msg->cm_format_type = FMT_RFC822;
- msg->cm_fields['M'] = SmashStrBuf(&Msg->QMsgData);
- msg->cm_fields['U'] = strdup("QMSG");
+ CM_SetAsFieldSB(msg, eMesageText, &Msg->QMsgData);
+ CM_SetField(msg, eMsgSubject, HKEY("QMSG"));
Msg->MyQItem->QueMsgID =
CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
- EVS_syslog(LOG_DEBUG, "%ld", Msg->MyQItem->QueMsgID);
- CtdlFreeMessage(msg);
+ syslog(LOG_DEBUG, "%ld", Msg->MyQItem->QueMsgID);
+ CM_Free(msg);
}
else {
CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM,
eNextState FinalizeMessageSend(SmtpOutMsg *Msg)
{
/* hand over to DB Queue */
- return QueueDBOperation(&Msg->IO, FinalizeMessageSend_DB);
+ return EventQueueDBOperation(&Msg->IO, FinalizeMessageSend_DB, 0);
}
eNextState FailOneAttempt(AsyncIO *IO)
{
SmtpOutMsg *Msg = IO->Data;
+ SetSMTPState(IO, eSTMPfailOne);
if (Msg->MyQEntry->Status == 2)
return eAbort;
* - connection timeout
* - dns lookup failed
*/
- StopClientWatchers(IO);
+ StopClientWatchers(IO, 1);
+
+ Msg->MyQEntry->nAttempt ++;
+ if (Msg->MyQEntry->AllStatusMessages == NULL)
+ Msg->MyQEntry->AllStatusMessages = NewStrBuf();
+
+ StrBufAppendPrintf(Msg->MyQEntry->AllStatusMessages, "%ld) ", Msg->MyQEntry->nAttempt);
+ StrBufAppendBuf(Msg->MyQEntry->AllStatusMessages, Msg->MyQEntry->StatusMessage, 0);
+ StrBufAppendBufPlain(Msg->MyQEntry->AllStatusMessages, HKEY("; "), 0);
if (Msg->pCurrRelay != NULL)
Msg->pCurrRelay = Msg->pCurrRelay->Next;
+ if ((Msg->pCurrRelay != NULL) &&
+ !Msg->pCurrRelay->IsRelay &&
+ Msg->MyQItem->HaveRelay)
+ {
+ syslog(LOG_DEBUG, "%s Aborting; last relay failed.\n", __FUNCTION__);
+ return FinalizeMessageSend(Msg);
+ }
if (Msg->pCurrRelay == NULL) {
- EVS_syslog(LOG_DEBUG, "%s Aborting\n", __FUNCTION__);
- return eAbort;
+ syslog(LOG_DEBUG, "%s Aborting\n", __FUNCTION__);
+ return FinalizeMessageSend(Msg);
}
if (Msg->pCurrRelay->IsIP) {
- EVS_syslog(LOG_DEBUG, "%s connecting IP\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s connecting IP\n", __FUNCTION__);
return mx_connect_ip(IO);
}
else {
- EVS_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"%s resolving next MX Record\n",
__FUNCTION__);
return get_one_mx_host_ip(IO);
if (Msg->mx_host == NULL)
Msg->mx_host = "<no MX-Record>";
- EVS_syslog(LOG_INFO,
+ syslog(LOG_INFO,
"connecting to %s [%s]:%d ...\n",
Msg->mx_host,
buf,
eNextState mx_connect_ip(AsyncIO *IO)
{
SmtpOutMsg *Msg = IO->Data;
+ SetSMTPState(IO, eSTMPconnecting);
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s(%s)\n", __FUNCTION__, (Msg->IsRelay)? "Relay":"Remote");
IO->ConnectMe = Msg->pCurrRelay;
Msg->State = eConnectMX;
SmtpOutMsg *Msg = IO->Data;
struct hostent *hostent;
+ IO->ConnectMe = Msg->pCurrRelay;
+
QueryCbDone(IO);
- EVS_syslog(LOG_DEBUG, "%s Time[%fs]\n",
+ syslog(LOG_DEBUG, "%s Time[%fs]\n",
__FUNCTION__,
IO->Now - IO->DNS.Start);
Msg->pCurrRelay->Addr.sin6_family =
hostent->h_addrtype;
Msg->pCurrRelay->Addr.sin6_port =
- htons(DefaultMXPort);
+ htons(Msg->IO.ConnectMe->Port);
}
else {
struct sockaddr_in *addr;
sizeof(uint32_t));
addr->sin_family = hostent->h_addrtype;
- addr->sin_port = htons(DefaultMXPort);
+ addr->sin_port = htons(Msg->IO.ConnectMe->Port);
}
Msg->mx_host = Msg->pCurrRelay->Host;
if (Msg->HostLookup.VParsedDNSReply != NULL) {
return mx_connect_ip(IO);
}
else {
+ SetSMTPState(IO, eSTMPfailOne);
if (Msg->HostLookup.VParsedDNSReply != NULL) {
Msg->HostLookup.DNSReplyFree(Msg->HostLookup.VParsedDNSReply);
Msg->HostLookup.VParsedDNSReply = NULL;
* - the direct hostname if there was no mx record
* - one of the mx'es
*/
+ SetSMTPState(IO, (Msg->pCurrRelay->IPv6)?eSTMPalookup:eSTMPaaaalookup);
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
- EVS_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"looking up %s-Record %s : %d ...\n",
(Msg->pCurrRelay->IPv6)? "aaaa": "a",
Msg->pCurrRelay->Host,
QueryCbDone(IO);
- EVS_syslog(LOG_DEBUG, "%s Time[%fs]\n",
+ syslog(LOG_DEBUG, "%s Time[%fs]\n",
__FUNCTION__,
IO->Now - IO->DNS.Start);
{
SmtpOutMsg * Msg = IO->Data;
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ SetSMTPState(IO, eSTMPmxlookup);
+
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
/* start resolving MX records here. */
if (!QueueQuery(ns_t_mx,
Msg->node,
SmtpOutMsg * Msg;
Msg = (SmtpOutMsg *) malloc(sizeof(SmtpOutMsg));
+ if (Msg == NULL)
+ return NULL;
memset(Msg, 0, sizeof(SmtpOutMsg));
Msg->n = MsgCount;
{
SmtpOutMsg *Msg;
- SMTPC_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
Msg = new_smtp_outmsg(MyQItem, MyQEntry, MsgCount);
+ if (Msg == NULL) {
+ syslog(LOG_DEBUG, "%s Failed to alocate message context.\n", __FUNCTION__);
+ if (KeepMsgText)
+ FreeStrBuf (&MsgText);
+ return;
+ }
if (KeepMsgText) Msg->msgtext = MsgText;
else Msg->msgtext = NewStrBufDup(MsgText);
- if (smtp_resolve_recipients(Msg)) {
-
+ if (smtp_resolve_recipients(Msg) &&
+ (!MyQItem->HaveRelay ||
+ (MyQItem->URL != NULL)))
+ {
safestrncpy(
((CitContext *)Msg->IO.CitContext)->cs_host,
Msg->node,
sizeof(((CitContext *)
Msg->IO.CitContext)->cs_host));
- SMTPC_syslog(LOG_DEBUG, "Starting: [%ld] <%s> CC <%d> \n",
+ syslog(LOG_DEBUG, "Starting: [%ld] <%s> CC <%d> \n",
Msg->MyQItem->MessageID,
ChrPtr(Msg->MyQEntry->Recipient),
((CitContext*)Msg->IO.CitContext)->cs_pid);
- if (Msg->pCurrRelay == NULL)
+ if (Msg->pCurrRelay == NULL) {
+ SetSMTPState(&Msg->IO, eSTMPmxlookup);
QueueEventContext(&Msg->IO,
resolve_mx_records);
+ }
else { /* oh... via relay host */
+ Msg->IsRelay = 1;
if (Msg->pCurrRelay->IsIP) {
+ SetSMTPState(&Msg->IO, eSTMPconnecting);
QueueEventContext(&Msg->IO,
mx_connect_ip);
}
else {
+ SetSMTPState(&Msg->IO, eSTMPalookup);
/* uneducated admin has chosen to
add DNS to the equation... */
QueueEventContext(&Msg->IO,
}
}
else {
+ SetSMTPState(&Msg->IO, eSMTPFailTotal);
/* No recipients? well fail then. */
- if ((Msg==NULL) ||
- (Msg->MyQEntry == NULL)) {
+ if (Msg->MyQEntry != NULL) {
Msg->MyQEntry->Status = 5;
- StrBufPlain(Msg->MyQEntry->StatusMessage,
- HKEY("Invalid Recipient!"));
+ if (StrLength(Msg->MyQEntry->StatusMessage) == 0)
+ StrBufPlain(Msg->MyQEntry->StatusMessage,
+ HKEY("Invalid Recipient!"));
}
FinalizeMessageSend_DB(&Msg->IO);
- DeleteSmtpOutMsg(&Msg->IO);
+ DeleteSmtpOutMsg(Msg);
}
}
void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *Msg)
{
double Timeout = 0.0;
- AsyncIO *IO = &Msg->IO;
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
switch (NextTCPState) {
case eSendFile:
}
eNextState SMTP_C_DispatchReadDone(AsyncIO *IO)
{
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
SmtpOutMsg *Msg = IO->Data;
eNextState rc;
}
eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO)
{
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
SmtpOutMsg *Msg = IO->Data;
eNextState rc;
{
SmtpOutMsg *Msg = IO->Data;
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
return FinalizeMessageSend(Msg);
}
eNextState SMTP_C_TerminateDB(AsyncIO *IO)
{
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
return Terminate(IO);
}
eNextState SMTP_C_Timeout(AsyncIO *IO)
SmtpOutMsg *Msg = IO->Data;
Msg->MyQEntry->Status = 4;
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
- StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State]));
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ StrBufPrintf(IO->ErrMsg, "Timeout: %s while talking to %s",
+ ReadErrors[Msg->State].Key,
+ Msg->mx_host);
if (Msg->State > eRCPT)
return eAbort;
else
SmtpOutMsg *Msg = IO->Data;
Msg->MyQEntry->Status = 4;
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
- StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State]));
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ StrBufPrintf(IO->ErrMsg, "Connection failure: %s while talking to %s",
+ ReadErrors[Msg->State].Key,
+ Msg->mx_host);
+
return FailOneAttempt(IO);
}
eNextState SMTP_C_DNSFail(AsyncIO *IO)
{
SmtpOutMsg *Msg = IO->Data;
Msg->MyQEntry->Status = 4;
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
return FailOneAttempt(IO);
}
eNextState SMTP_C_Shutdown(AsyncIO *IO)
{
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
SmtpOutMsg *Msg = IO->Data;
+ switch (IO->NextState) {
+ case eSendDNSQuery:
+ case eReadDNSReply:
+
+ /* todo: abort c-ares */
+ case eConnect:
+ case eSendReply:
+ case eSendMore:
+ case eSendFile:
+ case eReadMessage:
+ case eReadMore:
+ case eReadPayload:
+ case eReadFile:
+ StopClientWatchers(IO, 1);
+ break;
+ case eDBQuery:
+
+ break;
+ case eTerminateConnection:
+ case eAbort:
+ break;
+ }
Msg->MyQEntry->Status = 3;
StrBufPlain(Msg->MyQEntry->StatusMessage,
HKEY("server shutdown during message submit."));
if (StrLength(IO->IOBuf) < 4)
continue;
if (ChrPtr(IO->IOBuf)[3] == '-')
+ {
+ SmtpOutMsg *Msg;
+ Msg = (SmtpOutMsg *)IO->Data;
+ if (Msg->MultiLineBuf == NULL)
+ Msg->MultiLineBuf = NewStrBuf ();
+ else
+ StrBufAppendBufPlain(Msg->MultiLineBuf, HKEY("\n"), 0);
+ StrBufAppendBuf(Msg->MultiLineBuf, IO->IOBuf, 0);
Finished = eBufferNotEmpty;
+ }
else
return Finished;
break;
return Finished;
}
-void LogDebugEnableSMTPClient(const int n)
-{
- SMTPClientDebugEnabled = n;
-}
-
CTDL_MODULE_INIT(smtp_eventclient)
{
- if (!threading)
- CtdlRegisterDebugFlagHook(HKEY("smtpeventclient"), LogDebugEnableSMTPClient, &SMTPClientDebugEnabled);
+ if (!threading) {
+ // nothing here
+ }
return "smtpeventclient";
}