* 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.
*
#include "smtpqueue.h"
#include "smtp_clienthandlers.h"
-#ifdef EXPERIMENTAL_SMTP_EVENT_CLIENT
const unsigned short DefaultMXPort = 25;
void DeleteSmtpOutMsg(void *v)
{
ares_free_data(Msg->AllMX);
if (Msg->HostLookup.VParsedDNSReply != NULL)
Msg->HostLookup.DNSReplyFree(Msg->HostLookup.VParsedDNSReply);
+ FreeURL(&Msg->Relay);
FreeStrBuf(&Msg->msgtext);
FreeAsyncIOContents(&Msg->IO);
+ memset (Msg, 0, sizeof(SmtpOutMsg)); /* just to be shure... */
free(Msg);
}
eNextState SMTP_C_ConnFail(AsyncIO *IO);
eNextState SMTP_C_DispatchReadDone(AsyncIO *IO);
eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO);
+eNextState SMTP_C_DNSFail(AsyncIO *IO);
eNextState SMTP_C_Terminate(AsyncIO *IO);
eReadState SMTP_C_ReadServerStatus(AsyncIO *IO);
******************************************************************************/
void FinalizeMessageSend(SmtpOutMsg *Msg)
{
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
-
- if (DecreaseQReference(Msg->MyQItem))
- {
- int nRemain;
- StrBuf *MsgData;
+ int IDestructQueItem;
+ int nRemain;
+ StrBuf *MsgData;
+ AsyncIO *IO = &Msg->IO;
- 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);
}
eNextState FailOneAttempt(AsyncIO *IO)
{
SmtpOutMsg *SendMsg = IO->Data;
+
+ if (SendMsg->MyQEntry->Status == 2)
+ return eAbort;
+
/*
* possible ways here:
* - connection timeout
- * -
- */
- SendMsg->pCurrRelay = SendMsg->pCurrRelay->Next;
+ * - 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);
+ }
}
buf[0] = '\0';
- if (IO->IP6) {
- src = &IO->Addr->sin6_addr;
+ if (IO->ConnectMe->IPv6) {
+ src = &IO->ConnectMe->Addr.sin6_addr;
}
else {
- struct sockaddr_in *addr = (struct sockaddr_in *)IO->Addr;
+ struct sockaddr_in *addr = (struct sockaddr_in *)&IO->ConnectMe->Addr;
src = &addr->sin_addr.s_addr;
}
- inet_ntop((IO->IP6)?AF_INET6:AF_INET,
+ inet_ntop((IO->ConnectMe->IPv6)?AF_INET6:AF_INET,
src,
buf,
sizeof(buf));
if (SendMsg->mx_host == NULL)
- SendMsg->mx_host = "<no name>";
+ SendMsg->mx_host = "<no MX-Record>";
- CtdlLogPrintf(CTDL_DEBUG,
- "SMTP client[%ld]: connecting to %s [%s]:%d ...\n",
- SendMsg->n,
- SendMsg->mx_host,
- buf,
- SendMsg->IO.dport);
+ EVS_syslog(LOG_DEBUG,
+ "SMTP client[%ld]: connecting to %s [%s]:%d ...\n",
+ SendMsg->n,
+ SendMsg->mx_host,
+ buf,
+ SendMsg->IO.ConnectMe->Port);
SendMsg->MyQEntry->Status = 5;
StrBufPrintf(SendMsg->MyQEntry->StatusMessage,
"Timeout while connecting %s [%s]:%d ",
SendMsg->mx_host,
buf,
- SendMsg->IO.dport);
+ SendMsg->IO.ConnectMe->Port);
+ SendMsg->IO.NextState = eConnect;
}
/*****************************************************************************
{
SmtpOutMsg *SendMsg = IO->Data;
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
-
- IO->IP6 = SendMsg->pCurrRelay->af == AF_INET6;
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
- if (SendMsg->pCurrRelay->Port != 0)
- IO->dport = SendMsg->pCurrRelay->Port;
- IO->Addr = &SendMsg->pCurrRelay->Addr;
+ 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)
if ((SendMsg->HostLookup.DNSStatus == ARES_SUCCESS) &&
(hostent != NULL) ) {
memset(&SendMsg->pCurrRelay->Addr, 0, sizeof(struct in6_addr));
- if (IO->IP6) {
+ if (SendMsg->pCurrRelay->IPv6) {
memcpy(&SendMsg->pCurrRelay->Addr.sin6_addr.s6_addr,
&hostent->h_addr_list[0],
sizeof(struct in6_addr));
SendMsg->pCurrRelay->Addr.sin6_family = hostent->h_addrtype;
- SendMsg->pCurrRelay->Addr.sin6_port = htons(IO->dport);
+ SendMsg->pCurrRelay->Addr.sin6_port = htons(DefaultMXPort);
}
else {
struct sockaddr_in *addr = (struct sockaddr_in*) &SendMsg->pCurrRelay->Addr;
sizeof(uint32_t));
addr->sin_family = hostent->h_addrtype;
- addr->sin_port = htons(IO->dport);
+ addr->sin_port = htons(DefaultMXPort);
}
+ SendMsg->mx_host = SendMsg->pCurrRelay->Host;
return mx_connect_ip(IO);
}
else // TODO: here we need to find out whether there are more mx'es, backup relay, and so on
InitC_ares_dns(IO);
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
- CtdlLogPrintf(CTDL_DEBUG,
- "SMTP client[%ld]: looking up %s : %d ...\n",
- SendMsg->n,
- SendMsg->pCurrRelay->Host,
- SendMsg->IO.dport);
+ EVS_syslog(LOG_DEBUG,
+ "SMTP client[%ld]: looking up %s-Record %s : %d ...\n",
+ SendMsg->n,
+ (SendMsg->pCurrRelay->IPv6)? "aaaa": "a",
+ SendMsg->pCurrRelay->Host,
+ SendMsg->pCurrRelay->Port);
if (!QueueQuery((SendMsg->pCurrRelay->IPv6)? ns_t_aaaa : ns_t_a,
SendMsg->pCurrRelay->Host,
SendMsg->MyQEntry->Status = 5;
StrBufPrintf(SendMsg->MyQEntry->StatusMessage,
"No MX hosts found for <%s>", SendMsg->node);
+ SendMsg->IO.NextState = eTerminateConnection;
return IO->NextState;
}
+ IO->NextState = eReadDNSReply;
return IO->NextState;
}
QueryCbDone(IO);
- CtdlLogPrintf(CTDL_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 = (ParsedURL*) malloc(sizeof(ParsedURL));
memset(p, 0, sizeof(ParsedURL));
p->IsIP = 0;
- p->Port = 25; //// TODO define.
+ p->Port = DefaultMXPort;
p->IPv6 = i == 1;
p->Host = SendMsg->CurrMX->host;
p = (ParsedURL*) malloc(sizeof(ParsedURL));
memset(p, 0, sizeof(ParsedURL));
p->IsIP = 0;
- p->Port = 25; //// TODO define.
+ p->Port = DefaultMXPort;
p->IPv6 = i == 1;
p->Host = SendMsg->node;
*pp = p;
- pp = &p;
+ pp = &p->Next;
}
SendMsg->CXFlags = SendMsg->CXFlags & F_DIRECT;
}
{
SmtpOutMsg * SendMsg = IO->Data;
- CtdlLogPrintf(CTDL_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,
"No MX hosts found for <%s>", SendMsg->node);
return IO->NextState;
}
- return eAbort;
+ SendMsg->IO.NextState = eReadDNSReply;
+ return IO->NextState;
}
SendMsg->IO.Terminate = SMTP_C_Terminate;
SendMsg->IO.LineReader = SMTP_C_ReadServerStatus;
SendMsg->IO.ConnFail = SMTP_C_ConnFail;
+ SendMsg->IO.DNS.Fail = SMTP_C_DNSFail;
SendMsg->IO.Timeout = SMTP_C_Timeout;
SendMsg->IO.ShutdownAbort = SMTP_C_Shutdown;
SendMsg->IO.RecvBuf.Buf = NewStrBufPlain(NULL, 1024);
SendMsg->IO.IOBuf = NewStrBuf();
- SendMsg->IO.sock = (-1);
SendMsg->IO.NextState = eReadMessage;
- SendMsg->IO.dport = DefaultMXPort;
return SendMsg;
}
int KeepMsgText, /* KeepMsgText allows us to use MsgText as ours. */
int MsgCount)
{
+ AsyncIO *IO;
SmtpOutMsg *SendMsg;
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ 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);
if (smtp_resolve_recipients(SendMsg)) {
+ CitContext *SubC;
+ 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);
void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg)
{
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
- double Timeout;
+ double Timeout = 0.0;
+ AsyncIO *IO = &pMsg->IO;
+
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+
switch (NextTCPState) {
+ case eSendFile:
case eSendReply:
case eSendMore:
Timeout = SMTP_C_SendTimeouts[pMsg->State];
Timeout += StrLength(pMsg->msgtext) / 1024;
}
break;
+ case eSendDNSQuery:
+ case eReadDNSReply:
+ case eDBQuery:
+ case eReadFile:
+ case eReadMore:
+ case eReadPayload:
+ case eConnect:
case eTerminateConnection:
case eAbort:
return;
}
eNextState SMTP_C_DispatchReadDone(AsyncIO *IO)
{
- CtdlLogPrintf(CTDL_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)
{
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
SmtpOutMsg *pMsg = IO->Data;
eNextState rc;
{
SmtpOutMsg *pMsg = IO->Data;
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
FinalizeMessageSend(pMsg);
return eAbort;
}
{
SmtpOutMsg *pMsg = IO->Data;
- CtdlLogPrintf(CTDL_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;
- CtdlLogPrintf(CTDL_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_DNSFail(AsyncIO *IO)
+{
+ SmtpOutMsg *pMsg = IO->Data;
+
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ return FailOneAttempt(IO);
+}
eNextState SMTP_C_Shutdown(AsyncIO *IO)
{
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
SmtpOutMsg *pMsg = IO->Data;
pMsg->MyQEntry->Status = 3;
return Finished;
}
-#endif
CTDL_MODULE_INIT(smtp_eventclient)
{
return "smtpeventclient";
projects / citadel.git / blobdiff