* RFC 2821 - Simple Mail Transfer Protocol
* RFC 2822 - Internet Message Format
* RFC 2920 - SMTP Service Extension for Command Pipelining
- *
+ *
* The VRFY and EXPN commands have been removed from this implementation
* because nobody uses these commands anymore, except for spammers.
*
******************************************************************************/
void FinalizeMessageSend(SmtpOutMsg *Msg)
{
+ int IDestructQueItem;
+ int nRemain;
+ StrBuf *MsgData;
AsyncIO *IO = &Msg->IO;
- EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
-
- if (DecreaseQReference(Msg->MyQItem))
- {
- int nRemain;
- StrBuf *MsgData;
- nRemain = CountActiveQueueEntries(Msg->MyQItem);
+ IDestructQueItem = DecreaseQReference(Msg->MyQItem);
+ nRemain = CountActiveQueueEntries(Msg->MyQItem);
+
+ if ((nRemain > 0) || IDestructQueItem)
MsgData = SerializeQueueItem(Msg->MyQItem);
- /*
- * Uncompleted delivery instructions remain, so delete the old
- * instructions and replace with the updated ones.
- */
- CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
- smtpq_do_bounce(Msg->MyQItem,
- Msg->msgtext);
- if (nRemain > 0) {
- struct CtdlMessage *msg;
- msg = malloc(sizeof(struct CtdlMessage));
- memset(msg, 0, sizeof(struct CtdlMessage));
- msg->cm_magic = CTDLMESSAGE_MAGIC;
- msg->cm_anon_type = MES_NORMAL;
- msg->cm_format_type = FMT_RFC822;
- msg->cm_fields['M'] = SmashStrBuf(&MsgData);
- CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
- CtdlFreeMessage(msg);
- }
- else {
- CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->MessageID, 1, "");
- FreeStrBuf(&MsgData);
- }
+ else
+ MsgData = NULL;
- RemoveQItem(Msg->MyQItem);
- }
+ /*
+ * Uncompleted delivery instructions remain, so delete the old
+ * instructions and replace with the updated ones.
+ */
+ EVS_syslog(LOG_DEBUG, "SMTPQD: %ld", Msg->MyQItem->QueMsgID);
+ CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
+
+ if (IDestructQueItem)
+ smtpq_do_bounce(Msg->MyQItem,Msg->msgtext);
+ if (nRemain > 0)
+ {
+ struct CtdlMessage *msg;
+ msg = malloc(sizeof(struct CtdlMessage));
+ memset(msg, 0, sizeof(struct CtdlMessage));
+ msg->cm_magic = CTDLMESSAGE_MAGIC;
+ msg->cm_anon_type = MES_NORMAL;
+ msg->cm_format_type = FMT_RFC822;
+ msg->cm_fields['M'] = SmashStrBuf(&MsgData);
+ Msg->MyQItem->QueMsgID =
+ CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
+ EVS_syslog(LOG_DEBUG, "SMTPQ: %ld", Msg->MyQItem->QueMsgID);
+ CtdlFreeMessage(msg);
+ }
+ else {
+ CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM,
+ &Msg->MyQItem->MessageID,
+ 1,
+ "");
+ FreeStrBuf(&MsgData);
+ }
RemoveContext(Msg->IO.CitContext);
+ if (IDestructQueItem)
+ RemoveQItem(Msg->MyQItem);
DeleteSmtpOutMsg(Msg);
}
/*
* possible ways here:
* - connection timeout
- * -
+ * - dns lookup failed
*/
StopClientWatchers(IO);
if (SendMsg->pCurrRelay != NULL)
SendMsg->pCurrRelay = SendMsg->pCurrRelay->Next;
- if (SendMsg->pCurrRelay == NULL)
+ if (SendMsg->pCurrRelay == NULL) {
+ EVS_syslog(LOG_DEBUG, "SMTP: %s Aborting\n", __FUNCTION__);
return eAbort;
- if (SendMsg->pCurrRelay->IsIP)
+ }
+ if (SendMsg->pCurrRelay->IsIP) {
+ EVS_syslog(LOG_DEBUG, "SMTP: %s connecting IP\n", __FUNCTION__);
return mx_connect_ip(IO);
- else
+ }
+ else {
+ EVS_syslog(LOG_DEBUG, "SMTP: %s resolving next MX Record\n", __FUNCTION__);
return get_one_mx_host_ip(IO);
+ }
}
if (SendMsg->mx_host == NULL)
SendMsg->mx_host = "<no MX-Record>";
- EV_syslog(LOG_DEBUG,
+ EVS_syslog(LOG_DEBUG,
"SMTP client[%ld]: connecting to %s [%s]:%d ...\n",
SendMsg->n,
SendMsg->mx_host,
{
SmtpOutMsg *SendMsg = IO->Data;
- EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
IO->ConnectMe = SendMsg->pCurrRelay;
/* Bypass the ns lookup result like this: IO->Addr.sin_addr.s_addr = inet_addr("127.0.0.1"); */
SetConnectStatus(IO);
- return InitEventIO(IO, SendMsg,
- SMTP_C_ConnTimeout,
- SMTP_C_ReadTimeouts[0],
- 1);
+ return EvConnectSock(IO, SendMsg,
+ SMTP_C_ConnTimeout,
+ SMTP_C_ReadTimeouts[0],
+ 1);
}
eNextState get_one_mx_host_ip_done(AsyncIO *IO)
InitC_ares_dns(IO);
- EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
- EV_syslog(LOG_DEBUG,
+ EVS_syslog(LOG_DEBUG,
"SMTP client[%ld]: looking up %s-Record %s : %d ...\n",
SendMsg->n,
(SendMsg->pCurrRelay->IPv6)? "aaaa": "a",
QueryCbDone(IO);
- EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
pp = &SendMsg->Relay;
while ((pp != NULL) && (*pp != NULL) && ((*pp)->Next != NULL))
pp = &(*pp)->Next;
- if ((IO->DNSQuery->DNSStatus == ARES_SUCCESS) &&
- (IO->DNSQuery->VParsedDNSReply != NULL))
+ if ((IO->DNS.Query->DNSStatus == ARES_SUCCESS) &&
+ (IO->DNS.Query->VParsedDNSReply != NULL))
{ /* ok, we found mx records. */
SendMsg->IO.ErrMsg = SendMsg->MyQEntry->StatusMessage;
SendMsg->CurrMX = SendMsg->AllMX
- = IO->DNSQuery->VParsedDNSReply;
+ = IO->DNS.Query->VParsedDNSReply;
while (SendMsg->CurrMX) {
int i;
for (i = 0; i < 2; i++) {
p->Host = SendMsg->node;
*pp = p;
- pp = &p;
+ pp = &p->Next;
}
SendMsg->CXFlags = SendMsg->CXFlags & F_DIRECT;
}
{
SmtpOutMsg * SendMsg = IO->Data;
- EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
/* start resolving MX records here. */
if (!QueueQuery(ns_t_mx,
SendMsg->node,
SendMsg->IO.Terminate = SMTP_C_Terminate;
SendMsg->IO.LineReader = SMTP_C_ReadServerStatus;
SendMsg->IO.ConnFail = SMTP_C_ConnFail;
- SendMsg->IO.DNSFail = SMTP_C_DNSFail;
+ SendMsg->IO.DNS.Fail = SMTP_C_DNSFail;
SendMsg->IO.Timeout = SMTP_C_Timeout;
SendMsg->IO.ShutdownAbort = SMTP_C_Shutdown;
SendMsg->IO.IOBuf = NewStrBuf();
SendMsg->IO.NextState = eReadMessage;
-
+
return SendMsg;
}
int KeepMsgText, /* KeepMsgText allows us to use MsgText as ours. */
int MsgCount)
{
+ AsyncIO *IO;
SmtpOutMsg *SendMsg;
syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
SendMsg = new_smtp_outmsg(MyQItem, MyQEntry, MsgCount);
+ IO = &SendMsg->IO;
if (KeepMsgText) SendMsg->msgtext = MsgText;
else SendMsg->msgtext = NewStrBufDup(MsgText);
SubC = CloneContext (CC);
SubC->session_specific_data = (char*) SendMsg;
SendMsg->IO.CitContext = SubC;
-
+
+ safestrncpy(SubC->cs_host, SendMsg->node, sizeof(SubC->cs_host));
+ syslog(LOG_DEBUG, "SMTP Starting: [%ld] <%s> CC <%d> \n",
+ SendMsg->MyQItem->MessageID,
+ ChrPtr(SendMsg->MyQEntry->Recipient),
+ ((CitContext*)SendMsg->IO.CitContext)->cs_pid);
if (SendMsg->pCurrRelay == NULL)
QueueEventContext(&SendMsg->IO,
resolve_mx_records);
double Timeout = 0.0;
AsyncIO *IO = &pMsg->IO;
- EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
switch (NextTCPState) {
case eSendFile:
}
eNextState SMTP_C_DispatchReadDone(AsyncIO *IO)
{
- EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
SmtpOutMsg *pMsg = IO->Data;
eNextState rc;
rc = ReadHandlers[pMsg->State](pMsg);
- pMsg->State++;
- SMTPSetTimeout(rc, pMsg);
+ if (rc != eAbort)
+ {
+ pMsg->State++;
+ SMTPSetTimeout(rc, pMsg);
+ }
return rc;
}
eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO)
{
- EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
SmtpOutMsg *pMsg = IO->Data;
eNextState rc;
{
SmtpOutMsg *pMsg = IO->Data;
- EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
FinalizeMessageSend(pMsg);
return eAbort;
}
{
SmtpOutMsg *pMsg = IO->Data;
- EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State]));
return FailOneAttempt(IO);
}
{
SmtpOutMsg *pMsg = IO->Data;
- syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State]));
return FailOneAttempt(IO);
}
{
SmtpOutMsg *pMsg = IO->Data;
- EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
- StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State]));
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
return FailOneAttempt(IO);
}
eNextState SMTP_C_Shutdown(AsyncIO *IO)
{
- EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
SmtpOutMsg *pMsg = IO->Data;
pMsg->MyQEntry->Status = 3;
projects / citadel.git / blobdiff