X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=af5d12d9467328f4ac9f2bb51fb32b07efcbd2a0;hb=cf7cb2463d47a4a9ed36c8d1c13f188418389437;hp=9c51a1bc5bce10831681eaf86c6388609934b40a;hpb=9cb62d5470378a47be05d5d67d0b28de07386017;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index 9c51a1bc5..af5d12d94 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -129,7 +129,6 @@ void FinalizeMessageSend(SmtpOutMsg *Msg)
 	int nRemain;
 	StrBuf *MsgData;
 	AsyncIO *IO = &Msg->IO;
-	EV_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
 
 	IDestructQueItem = DecreaseQReference(Msg->MyQItem);
 
@@ -171,10 +170,9 @@ void FinalizeMessageSend(SmtpOutMsg *Msg)
 				   "");
 		FreeStrBuf(&MsgData);
 	}
+	RemoveContext(Msg->IO.CitContext);
 	if (IDestructQueItem)
 		RemoveQItem(Msg->MyQItem);
-
-	RemoveContext(Msg->IO.CitContext);
 	DeleteSmtpOutMsg(Msg);
 }
 
@@ -188,19 +186,25 @@ eNextState FailOneAttempt(AsyncIO *IO)
 	/* 
 	 * possible ways here: 
 	 * - connection timeout 
-	 * - 
+	 * - dns lookup failed
 	 */
 	StopClientWatchers(IO);
 
 	if (SendMsg->pCurrRelay != NULL)
 		SendMsg->pCurrRelay = SendMsg->pCurrRelay->Next;
 
-	if (SendMsg->pCurrRelay == NULL)
+	if (SendMsg->pCurrRelay == NULL) {
+		EVS_syslog(LOG_DEBUG, "SMTP: %s Aborting\n", __FUNCTION__);
 		return eAbort;
-	if (SendMsg->pCurrRelay->IsIP)
+	}
+	if (SendMsg->pCurrRelay->IsIP) {
+		EVS_syslog(LOG_DEBUG, "SMTP: %s connecting IP\n", __FUNCTION__);
 		return mx_connect_ip(IO);
-	else
+	}
+	else {
+		EVS_syslog(LOG_DEBUG, "SMTP: %s resolving next MX Record\n", __FUNCTION__);
 		return get_one_mx_host_ip(IO);
+	}
 }
 
 
@@ -260,10 +264,10 @@ eNextState mx_connect_ip(AsyncIO *IO)
 
 	SetConnectStatus(IO);
 
-	return InitEventIO(IO, SendMsg, 
-			   SMTP_C_ConnTimeout, 
-			   SMTP_C_ReadTimeouts[0],
-			   1);
+	return EvConnectSock(IO, SendMsg, 
+			     SMTP_C_ConnTimeout, 
+			     SMTP_C_ReadTimeouts[0],
+			     1);
 }
 
 eNextState get_one_mx_host_ip_done(AsyncIO *IO)
@@ -357,13 +361,13 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO)
 	while ((pp != NULL) && (*pp != NULL) && ((*pp)->Next != NULL))
 		pp = &(*pp)->Next;
 
-	if ((IO->DNSQuery->DNSStatus == ARES_SUCCESS) && 
-	    (IO->DNSQuery->VParsedDNSReply != NULL))
+	if ((IO->DNS.Query->DNSStatus == ARES_SUCCESS) && 
+	    (IO->DNS.Query->VParsedDNSReply != NULL))
 	{ /* ok, we found mx records. */
 		SendMsg->IO.ErrMsg = SendMsg->MyQEntry->StatusMessage;
 		
 		SendMsg->CurrMX    = SendMsg->AllMX 
-			           = IO->DNSQuery->VParsedDNSReply;
+			           = IO->DNS.Query->VParsedDNSReply;
 		while (SendMsg->CurrMX) {
 			int i;
 			for (i = 0; i < 2; i++) {
@@ -396,7 +400,7 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO)
 			p->Host = SendMsg->node;
 				
 			*pp = p;
-			pp = &p;
+			pp = &p->Next;
 		}
 		SendMsg->CXFlags   = SendMsg->CXFlags & F_DIRECT;
 	}
@@ -453,7 +457,7 @@ SmtpOutMsg *new_smtp_outmsg(OneQueItem *MyQItem,
 	SendMsg->IO.Terminate     = SMTP_C_Terminate;
 	SendMsg->IO.LineReader    = SMTP_C_ReadServerStatus;
 	SendMsg->IO.ConnFail      = SMTP_C_ConnFail;
-	SendMsg->IO.DNSFail       = SMTP_C_DNSFail;
+	SendMsg->IO.DNS.Fail      = SMTP_C_DNSFail;
 	SendMsg->IO.Timeout       = SMTP_C_Timeout;
 	SendMsg->IO.ShutdownAbort = SMTP_C_Shutdown;
 
@@ -462,7 +466,7 @@ SmtpOutMsg *new_smtp_outmsg(OneQueItem *MyQItem,
 	SendMsg->IO.IOBuf         = NewStrBuf();
 
 	SendMsg->IO.NextState     = eReadMessage;
-	
+
 	return SendMsg;
 }
 
@@ -472,11 +476,13 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
 			      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);
 	
@@ -485,7 +491,12 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
 		SubC = CloneContext (CC);
 		SubC->session_specific_data = (char*) SendMsg;
 		SendMsg->IO.CitContext = SubC;
-
+		
+		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),
+		       ((CitContext*)SendMsg->IO.CitContext)->cs_pid);
 		if (SendMsg->pCurrRelay == NULL)
 			QueueEventContext(&SendMsg->IO,
 					  resolve_mx_records);
@@ -568,8 +579,11 @@ eNextState SMTP_C_DispatchReadDone(AsyncIO *IO)
 	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)
@@ -616,7 +630,6 @@ eNextState SMTP_C_DNSFail(AsyncIO *IO)
 	SmtpOutMsg *pMsg = IO->Data;
 
 	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
-	StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State]));
 	return FailOneAttempt(IO);
 }
 eNextState SMTP_C_Shutdown(AsyncIO *IO)