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;
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);
+ 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;
- 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);
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
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->IO.dport);
+ 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;
}
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;
"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;
- SendMsg->IO.dport = DefaultMXPort;
-
+
return SendMsg;
}
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)
{
+ 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;