#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);
}
******************************************************************************/
void FinalizeMessageSend(SmtpOutMsg *Msg)
{
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
if (DecreaseQReference(Msg->MyQItem))
{
RemoveQItem(Msg->MyQItem);
}
+
+ RemoveContext(Msg->IO.CitContext);
DeleteSmtpOutMsg(Msg);
}
* possible ways here:
* - connection timeout
* -
- */
- SendMsg->pCurrRelay = SendMsg->pCurrRelay->Next;
+ */
+ StopClientWatchers(IO);
+
+ if (SendMsg->pCurrRelay != NULL)
+ SendMsg->pCurrRelay = SendMsg->pCurrRelay->Next;
if (SendMsg->pCurrRelay == NULL)
return eAbort;
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.ConnectMe->Port);
+ 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,
SendMsg->mx_host,
buf,
SendMsg->IO.ConnectMe->Port);
+ SendMsg->IO.NextState = eConnect;
}
/*****************************************************************************
{
SmtpOutMsg *SendMsg = IO->Data;
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ 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"); */
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__);
+ syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
- CtdlLogPrintf(CTDL_DEBUG,
- "SMTP client[%ld]: looking up %s : %d ...\n",
- SendMsg->n,
- SendMsg->pCurrRelay->Host,
- SendMsg->pCurrRelay->Port);
+ 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__);
+ 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;
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ 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.RecvBuf.Buf = NewStrBufPlain(NULL, 1024);
SendMsg->IO.IOBuf = NewStrBuf();
- SendMsg->IO.sock = (-1);
SendMsg->IO.NextState = eReadMessage;
return SendMsg;
{
SmtpOutMsg *SendMsg;
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
SendMsg = new_smtp_outmsg(MyQItem, MyQEntry, MsgCount);
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;
+
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;
+
+ syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+
switch (NextTCPState) {
case eSendReply:
case eSendMore:
Timeout += StrLength(pMsg->msgtext) / 1024;
}
break;
+ case eSendDNSQuery:
+ case eReadDNSReply:
+ case eDBQuery:
+ case eReadMore:
+ case eReadPayload:
+ case eConnect:
case eTerminateConnection:
case eAbort:
return;
}
eNextState SMTP_C_DispatchReadDone(AsyncIO *IO)
{
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
SmtpOutMsg *pMsg = IO->Data;
eNextState rc;
}
eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO)
{
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
SmtpOutMsg *pMsg = IO->Data;
eNextState rc;
{
SmtpOutMsg *pMsg = IO->Data;
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
FinalizeMessageSend(pMsg);
return eAbort;
}
{
SmtpOutMsg *pMsg = IO->Data;
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ 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__);
+ syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State]));
return FailOneAttempt(IO);
}
eNextState SMTP_C_Shutdown(AsyncIO *IO)
{
- CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ 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";