int nRemain;
StrBuf *MsgData;
AsyncIO *IO = &Msg->IO;
- EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
IDestructQueItem = DecreaseQReference(Msg->MyQItem);
p->Host = SendMsg->node;
*pp = p;
- pp = &p;
+ pp = &p->Next;
}
SendMsg->CXFlags = SendMsg->CXFlags & F_DIRECT;
}
SubC->session_specific_data = (char*) SendMsg;
SendMsg->IO.CitContext = SubC;
+ syslog(LOG_DEBUG, "SMTP Starting: [%ld] <%s> \n",
+ SendMsg->MyQItem->MessageID,
+ ChrPtr(SendMsg->MyQEntry->Recipient));
if (SendMsg->pCurrRelay == NULL)
QueueEventContext(&SendMsg->IO,
resolve_mx_records);
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)