* 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);
+ }
+ if (IDestructQueItem)
+ RemoveQItem(Msg->MyQItem);
RemoveContext(Msg->IO.CitContext);
DeleteSmtpOutMsg(Msg);
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"); */
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;
{
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,
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;
}
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__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State]));
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;
#define SMTP_IS_STATE(WHICH_STATE) (ChrPtr(SendMsg->IO.IOBuf)[0] == WHICH_STATE)
-#define SMTP_DBG_SEND() EV_syslog(LOG_DEBUG, "SMTP client[%ld]: > %s\n", SendMsg->n, ChrPtr(SendMsg->IO.SendBuf.Buf))
-#define SMTP_DBG_READ() EV_syslog(LOG_DEBUG, "SMTP client[%ld]: < %s\n", SendMsg->n, ChrPtr(SendMsg->IO.IOBuf))
+#define SMTP_DBG_SEND() EVS_syslog(LOG_DEBUG, "SMTP: > %s\n", ChrPtr(SendMsg->IO.SendBuf.Buf))
+#define SMTP_DBG_READ() EVS_syslog(LOG_DEBUG, "SMTP: < %s\n", ChrPtr(SendMsg->IO.IOBuf))
/*****************************************************************************/
AsyncIO *IO = &SendMsg->IO;
SMTP_DBG_READ();
- EV_syslog(LOG_INFO, "SMTP client[%ld]: delivery to <%s> @ <%s> (%s) succeeded\n",
+ EVS_syslog(LOG_INFO, "SMTP client[%ld]: delivery to <%s> @ <%s> (%s) succeeded\n",
SendMsg->n, SendMsg->user, SendMsg->node, SendMsg->name);
return eTerminateConnection;
}
int lp, rp;
int i;
- EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
if ((SendMsg==NULL) ||
(SendMsg->MyQEntry == NULL) ||
SendMsg->node,
SendMsg->name);
- EV_syslog(LOG_DEBUG, "SMTP client[%ld]: Attempting delivery to <%s> @ <%s> (%s)\n",
+ EVS_syslog(LOG_DEBUG, "SMTP client[%ld]: Attempting delivery to <%s> @ <%s> (%s)\n",
SendMsg->n, SendMsg->user, SendMsg->node, SendMsg->name);
/* If no envelope_from is supplied, extract one from the message */
SendMsg->envelope_from = ChrPtr(SendMsg->MyQItem->EnvelopeFrom);