FreeURL(&Msg->Relay);
FreeStrBuf(&Msg->msgtext);
FreeAsyncIOContents(&Msg->IO);
-/// memset (Msg, 0, sizeof(SmtpOutMsg)); /* just to be shure... */
+ memset (Msg, 0, sizeof(SmtpOutMsg)); /* just to be shure... */
free(Msg);
}
CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
if (IDestructQueItem)
- smtpq_do_bounce(Msg->MyQItem,Msg->msgtext);
+ smtpq_do_bounce(Msg->MyQItem, Msg->msgtext);
if (nRemain > 0)
{
msg->cm_anon_type = MES_NORMAL;
msg->cm_format_type = FMT_RFC822;
msg->cm_fields['M'] = SmashStrBuf(&MsgData);
+ msg->cm_fields['U'] = strdup("QMSG");
Msg->MyQItem->QueMsgID =
CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
EVS_syslog(LOG_DEBUG, "SMTPQ: %ld", Msg->MyQItem->QueMsgID);
QueryCbDone(IO);
EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+
pp = &Msg->Relay;
while ((pp != NULL) && (*pp != NULL) && ((*pp)->Next != NULL))
pp = &(*pp)->Next;
if ((IO->DNS.Query->DNSStatus == ARES_SUCCESS) &&
(IO->DNS.Query->VParsedDNSReply != NULL))
{ /* ok, we found mx records. */
- Msg->IO.ErrMsg = Msg->MyQEntry->StatusMessage;
Msg->CurrMX
= Msg->AllMX
p = (ParsedURL*) malloc(sizeof(ParsedURL));
memset(p, 0, sizeof(ParsedURL));
+ p->Priority = Msg->CurrMX->priority;
p->IsIP = 0;
p->Port = DefaultMXPort;
p->IPv6 = i == 1;
p->Host = Msg->CurrMX->host;
-
- *pp = p;
- pp = &p->Next;
+ if (*pp == NULL)
+ *pp = p;
+ else {
+ ParsedURL *ppp = *pp;
+
+ while ((ppp->Next != NULL) &&
+ (ppp->Next->Priority <= p->Priority))
+ ppp = ppp->Next;
+ if ((ppp == *pp) &&
+ (ppp->Priority > p->Priority)) {
+ p->Next = *pp;
+ *pp = p;
+ }
+ else {
+ p->Next = ppp->Next;
+ ppp->Next = p;
+ }
+ }
}
Msg->CurrMX = Msg->CurrMX->next;
}
}
Msg->CXFlags = Msg->CXFlags & F_DIRECT;
}
- *pp = Msg->MyQItem->FallBackHost;
+ if (Msg->MyQItem->FallBackHost != NULL)
+ {
+ Msg->MyQItem->FallBackHost->Next = *pp;
+ *pp = Msg->MyQItem->FallBackHost;
+ }
Msg->pCurrRelay = Msg->Relay;
return get_one_mx_host_ip(IO);
}
SMTP_C_Timeout,
SMTP_C_Shutdown);
+ Msg->IO.ErrMsg = Msg->MyQEntry->StatusMessage;
+
return Msg;
}
/* if we're sending a huge message,
* we need more time.
*/
- Timeout += StrLength(Msg->msgtext) / 1024;
+ Timeout += StrLength(Msg->msgtext) / 512;
}
break;
case eReadMessage:
* some mailservers take a nap before accepting
* the message content inspection and such.
*/
- Timeout += StrLength(Msg->msgtext) / 1024;
+ Timeout += StrLength(Msg->msgtext) / 512;
}
break;
case eSendDNSQuery:
Msg->MyQEntry->Status = 4;
EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State]));
- return FailOneAttempt(IO);
+ if (Msg->State > eRCPT)
+ return eAbort;
+ else
+ return FailOneAttempt(IO);
}
eNextState SMTP_C_ConnFail(AsyncIO *IO)
{