Msg->HostLookup.DNSReplyFree(Msg->HostLookup.VParsedDNSReply);
FreeStrBuf(&Msg->msgtext);
FreeAsyncIOContents(&Msg->IO);
+ memset (Msg, 0, sizeof(SmtpOutMsg)); /* just to be shure... */
free(Msg);
}
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->mx_host,
buf,
SendMsg->IO.ConnectMe->Port);
+ SendMsg->IO.NextState = eConnect;
}
/*****************************************************************************
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
CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
CtdlLogPrintf(CTDL_DEBUG,
- "SMTP client[%ld]: looking up %s : %d ...\n",
+ "SMTP client[%ld]: looking up %s-Record %s : %d ...\n",
SendMsg->n,
+ (SendMsg->pCurrRelay->IPv6)? "aaaa": "a",
SendMsg->pCurrRelay->Host,
SendMsg->pCurrRelay->Port);
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;
}
"No MX hosts found for <%s>", SendMsg->node);
return IO->NextState;
}
- return eAbort;
+ SendMsg->IO.NextState = eReadDNSReply;
+ return IO->NextState;
}
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,
void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg)
{
+ double Timeout = 0.0;
+
CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
- double Timeout;
+
switch (NextTCPState) {
case eSendReply:
case eSendMore:
Timeout += StrLength(pMsg->msgtext) / 1024;
}
break;
+ case eSendDNSQuery:
+ case eReadDNSReply:
+ case eConnect:
case eTerminateConnection:
case eAbort:
return;