int nRemain;
StrBuf *MsgData;
AsyncIO *IO = &Msg->IO;
- EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
IDestructQueItem = DecreaseQReference(Msg->MyQItem);
"");
FreeStrBuf(&MsgData);
}
+ RemoveContext(Msg->IO.CitContext);
if (IDestructQueItem)
RemoveQItem(Msg->MyQItem);
-
- RemoveContext(Msg->IO.CitContext);
DeleteSmtpOutMsg(Msg);
}
p->Host = SendMsg->node;
*pp = p;
- pp = &p;
+ pp = &p->Next;
}
SendMsg->CXFlags = SendMsg->CXFlags & F_DIRECT;
}
SendMsg->IO.IOBuf = NewStrBuf();
SendMsg->IO.NextState = eReadMessage;
-
+
return SendMsg;
}
int KeepMsgText, /* KeepMsgText allows us to use MsgText as ours. */
int MsgCount)
{
+ AsyncIO *IO;
SmtpOutMsg *SendMsg;
syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
SendMsg = new_smtp_outmsg(MyQItem, MyQEntry, MsgCount);
+ IO = &SendMsg->IO;
if (KeepMsgText) SendMsg->msgtext = MsgText;
else SendMsg->msgtext = NewStrBufDup(MsgText);
SubC = CloneContext (CC);
SubC->session_specific_data = (char*) SendMsg;
SendMsg->IO.CitContext = SubC;
-
- syslog(LOG_DEBUG, "SMTP Starting: [%ld] <%s> \n",
+
+ safestrncpy(SubC->cs_host, SendMsg->node, sizeof(SubC->cs_host));
+ syslog(LOG_DEBUG, "SMTP Starting: [%ld] <%s> CC <%d> \n",
SendMsg->MyQItem->MessageID,
- ChrPtr(SendMsg->MyQEntry->Recipient));
+ ChrPtr(SendMsg->MyQEntry->Recipient),
+ ((CitContext*)SendMsg->IO.CitContext)->cs_pid);
if (SendMsg->pCurrRelay == NULL)
QueueEventContext(&SendMsg->IO,
resolve_mx_records);