X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=3be726e8503e40848a96e85f117947f75685232f;hb=158e8958500476d1115c7b70f6c81a87bb0ade47;hp=1698ab74773c1886d7152a3e6b088f1594b12abc;hpb=91d5dd26d1d156e2bea3193b283144ff2f854d00;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index 1698ab747..3be726e85 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -90,12 +90,34 @@
 #include "smtpqueue.h"
 #include "smtp_clienthandlers.h"
 
-const unsigned short DefaultMXPort = 25;
+ConstStr SMTPStates[] = {
+	{HKEY("looking up mx - record")},
+	{HKEY("evaluating what to do next")},
+	{HKEY("looking up a - record")},
+	{HKEY("looking up aaaa - record")},
+	{HKEY("connecting remote")},
+	{HKEY("smtp conversation ongoing")},
+	{HKEY("smtp sending maildata")},
+	{HKEY("smtp sending done")},
+	{HKEY("smtp successfully finished")},
+	{HKEY("failed one attempt")},
+	{HKEY("failed temporarily")},
+	{HKEY("failed permanently")}
+};
+
+void SetSMTPState(AsyncIO *IO, smtpstate State)
+{
+	CitContext* CCC = IO->CitContext;
+	if (CCC != NULL)
+		memcpy(CCC->cs_clientname, SMTPStates[State].Key, SMTPStates[State].len + 1);
+}
+
+int SMTPClientDebugEnabled = 0;
 void DeleteSmtpOutMsg(void *v)
 {
 	SmtpOutMsg *Msg = v;
 	AsyncIO *IO = &Msg->IO;
-	EV_syslog(LOG_DEBUG, "SMTP: %s Aborting\n", __FUNCTION__);
+	EV_syslog(LOG_DEBUG, "%s Exit\n", __FUNCTION__);
 
 	/* these are kept in our own space and free'd below */
 	Msg->IO.ConnectMe = NULL;
@@ -122,11 +144,6 @@ eReadState SMTP_C_ReadServerStatus(AsyncIO *IO);
 
 eNextState mx_connect_ip(AsyncIO *IO);
 eNextState get_one_mx_host_ip(AsyncIO *IO);
-eNextState FinalizeMessageSendDB(AsyncIO *IO);
-eNextState FinalizeMessageSend_DB1(AsyncIO *IO);
-eNextState FinalizeMessageSend_DB2(AsyncIO *IO);
-eNextState FinalizeMessageSend_DB3(AsyncIO *IO);
-eNextState FinalizeMessageSend_DB4(AsyncIO *IO);
 
 /******************************************************************************
  * So, we're finished with sending (regardless of success or failure)         *
@@ -134,32 +151,47 @@ eNextState FinalizeMessageSend_DB4(AsyncIO *IO);
  * we need to free the memory and send bounce messages (on terminal failure)  *
  * else we just free our SMTP-Message struct.                                 *
  ******************************************************************************/
-inline void FinalizeMessageSend_1(AsyncIO *IO)
+eNextState FinalizeMessageSend_DB(AsyncIO *IO)
 {
 	const char *Status;
 	SmtpOutMsg *Msg = IO->Data;
-	
-	if (Msg->MyQEntry->Status == 2) 
-		Status = "Delivery Successfull.";
-	else if (Msg->MyQEntry->Status == 5) 
-		Status = "Delivery failed permanently; giving up.";
+	StrBuf *StatusMessage;
+
+	if (Msg->MyQEntry->AllStatusMessages != NULL)
+		StatusMessage = Msg->MyQEntry->AllStatusMessages;
 	else
+		StatusMessage = Msg->MyQEntry->StatusMessage;
+
+
+	if (Msg->MyQEntry->Status == 2) {
+		SetSMTPState(IO, eSTMPfinished);
+		Status = "Delivery successful.";
+	}
+	else if (Msg->MyQEntry->Status == 5) {
+		SetSMTPState(IO, eSMTPFailTotal);
+		Status = "Delivery failed permanently; giving up.";
+	}
+	else {
+		SetSMTPState(IO, eSMTPFailTemporary);
 		Status = "Delivery failed temporarily; will retry later.";
+	}
 			
 	EVS_syslog(LOG_INFO,
-		   "SMTP: %s Recipient <%s> @ <%s> (%s) Statusmessage: %s\n",
+		   "%s Time[%fs] Recipient <%s> @ <%s> (%s) Status message: %s\n",
 		   Status,
+		   Msg->IO.Now - Msg->IO.StartIO,
 		   Msg->user,
 		   Msg->node,
 		   Msg->name,
-		   ChrPtr(Msg->MyQEntry->StatusMessage));
+		   ChrPtr(StatusMessage));
 
 
 	Msg->IDestructQueItem = DecreaseQReference(Msg->MyQItem);
 
-	Msg->nRemain = CountActiveQueueEntries(Msg->MyQItem);
+	Msg->nRemain = CountActiveQueueEntries(Msg->MyQItem, 0);
 
 	if (Msg->MyQEntry->Active && 
+	    !Msg->MyQEntry->StillActive &&
 	    CheckQEntryIsBounce(Msg->MyQEntry))
 	{
 		/* are we casue for a bounce mail? */
@@ -170,49 +202,17 @@ inline void FinalizeMessageSend_1(AsyncIO *IO)
 		Msg->QMsgData = SerializeQueueItem(Msg->MyQItem);
 	else
 		Msg->QMsgData = NULL;
-}
-eNextState FinalizeMessageSend(SmtpOutMsg *Msg)
-{
-	return QueueDBOperation(&Msg->IO, FinalizeMessageSend_DB1);
-}
-
-inline void FinalizeMessageSend_DB_1(AsyncIO *IO)
-{
-	SmtpOutMsg *Msg = IO->Data;
 
 	/*
 	 * Uncompleted delivery instructions remain, so delete the old
 	 * instructions and replace with the updated ones.
 	 */
-	EVS_syslog(LOG_DEBUG, "SMTPQD: %ld", Msg->MyQItem->QueMsgID);
+	EVS_syslog(LOG_DEBUG, "%ld", Msg->MyQItem->QueMsgID);
 	CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
-}
-eNextState FinalizeMessageSend_DB1(AsyncIO *IO)
-{
-	FinalizeMessageSend_1(IO);
-	FinalizeMessageSend_DB_1(IO);
-	return NextDBOperation(IO, FinalizeMessageSend_DB2);
-}
-
-
-inline void FinalizeMessageSend_DB_2(AsyncIO *IO)
-{
-	SmtpOutMsg *Msg = IO->Data;
+	Msg->MyQItem->QueMsgID = -1;
 
 	if (Msg->IDestructQueItem)
-		smtpq_do_bounce(Msg->MyQItem, Msg->msgtext);
-}
-eNextState FinalizeMessageSend_DB2(AsyncIO *IO)
-{
-	FinalizeMessageSend_DB_2(IO);
-
-	return NextDBOperation(IO, FinalizeMessageSend_DB3);
-}
-
-
-inline void FinalizeMessageSend_DB_3(AsyncIO *IO)
-{
-	SmtpOutMsg *Msg = IO->Data;
+		smtpq_do_bounce(Msg->MyQItem, Msg->msgtext, Msg->pCurrRelay);
 
 	if (Msg->nRemain > 0)
 	{
@@ -222,12 +222,12 @@ inline void FinalizeMessageSend_DB_3(AsyncIO *IO)
 		msg->cm_magic = CTDLMESSAGE_MAGIC;
 		msg->cm_anon_type = MES_NORMAL;
 		msg->cm_format_type = FMT_RFC822;
-		msg->cm_fields['M'] = SmashStrBuf(&Msg->QMsgData);
-		msg->cm_fields['U'] = strdup("QMSG");
+		CM_SetAsFieldSB(msg, eMesageText, &Msg->QMsgData);
+		CM_SetField(msg, eMsgSubject, HKEY("QMSG"));
 		Msg->MyQItem->QueMsgID =
 			CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
-		EVS_syslog(LOG_DEBUG, "SMTPQ: %ld", Msg->MyQItem->QueMsgID);
-		CtdlFreeMessage(msg);
+		EVS_syslog(LOG_DEBUG, "%ld", Msg->MyQItem->QueMsgID);
+		CM_Free(msg);
 	}
 	else {
 		CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM,
@@ -236,44 +236,32 @@ inline void FinalizeMessageSend_DB_3(AsyncIO *IO)
 				   "");
 		FreeStrBuf(&Msg->QMsgData);
 	}
-	DecreaseShutdownDeliveries(Msg->MyQItem);
-}
-eNextState FinalizeMessageSend_DB3(AsyncIO *IO)
-{
-	SmtpOutMsg *Msg = IO->Data;
-	FinalizeMessageSend_DB_3(IO);
-	if (!Msg->IDestructQueItem)
-		return eAbort;
-	return NextDBOperation(IO, FinalizeMessageSend_DB4);
-}
 
-eNextState FinalizeMessageSend_DB4(AsyncIO *IO)
-{
-	int Done;
-	SmtpOutMsg *Msg = IO->Data;
-
-	Done = GetShutdownDeliveries(Msg->MyQItem);
-	if (!Done) 
-		return NextDBOperation(IO, FinalizeMessageSend_DB4);
-	else
-		return eAbort;
+	RemoveContext(Msg->IO.CitContext);
+	return eAbort;
 }
 
-eNextState FinalizeMessageSend_DB(AsyncIO *IO)
+eNextState Terminate(AsyncIO *IO)
 {
 	SmtpOutMsg *Msg = IO->Data;
 
-	RemoveContext(Msg->IO.CitContext);
 	if (Msg->IDestructQueItem)
 		RemoveQItem(Msg->MyQItem);
+
 	DeleteSmtpOutMsg(Msg);
 	return eAbort;
 }
+eNextState FinalizeMessageSend(SmtpOutMsg *Msg)
+{
+	/* hand over to DB Queue */
+	return EventQueueDBOperation(&Msg->IO, FinalizeMessageSend_DB);
+}
 
 eNextState FailOneAttempt(AsyncIO *IO)
 {
 	SmtpOutMsg *Msg = IO->Data;
 
+	SetSMTPState(IO, eSTMPfailOne);
 	if (Msg->MyQEntry->Status == 2)
 		return eAbort;
 
@@ -282,22 +270,37 @@ eNextState FailOneAttempt(AsyncIO *IO)
 	 * - connection timeout
 	 * - dns lookup failed
 	 */
-	StopClientWatchers(IO);
+	StopClientWatchers(IO, 1);
+
+	Msg->MyQEntry->nAttempt ++;
+	if (Msg->MyQEntry->AllStatusMessages == NULL)
+		Msg->MyQEntry->AllStatusMessages = NewStrBuf();
+
+	StrBufAppendPrintf(Msg->MyQEntry->AllStatusMessages, "%ld) ", Msg->MyQEntry->nAttempt);
+	StrBufAppendBuf(Msg->MyQEntry->AllStatusMessages, Msg->MyQEntry->StatusMessage, 0);
+	StrBufAppendBufPlain(Msg->MyQEntry->AllStatusMessages, HKEY("; "), 0);
 
 	if (Msg->pCurrRelay != NULL)
 		Msg->pCurrRelay = Msg->pCurrRelay->Next;
+	if ((Msg->pCurrRelay != NULL) &&
+	    !Msg->pCurrRelay->IsRelay &&
+	    Msg->MyQItem->HaveRelay)
+	{
+		EVS_syslog(LOG_DEBUG, "%s Aborting; last relay failed.\n", __FUNCTION__);
+		return eAbort;
+	}
 
 	if (Msg->pCurrRelay == NULL) {
-		EVS_syslog(LOG_DEBUG, "SMTP: %s Aborting\n", __FUNCTION__);
+		EVS_syslog(LOG_DEBUG, "%s Aborting\n", __FUNCTION__);
 		return eAbort;
 	}
 	if (Msg->pCurrRelay->IsIP) {
-		EVS_syslog(LOG_DEBUG, "SMTP: %s connecting IP\n", __FUNCTION__);
+		EVS_syslog(LOG_DEBUG, "%s connecting IP\n", __FUNCTION__);
 		return mx_connect_ip(IO);
 	}
 	else {
 		EVS_syslog(LOG_DEBUG,
-			   "SMTP: %s resolving next MX Record\n",
+			   "%s resolving next MX Record\n",
 			   __FUNCTION__);
 		return get_one_mx_host_ip(IO);
 	}
@@ -330,14 +333,13 @@ void SetConnectStatus(AsyncIO *IO)
 	if (Msg->mx_host == NULL)
 		Msg->mx_host = "<no MX-Record>";
 
-	EVS_syslog(LOG_DEBUG,
-		  "SMTP client[%ld]: connecting to %s [%s]:%d ...\n",
-		  Msg->n,
+	EVS_syslog(LOG_INFO,
+		  "connecting to %s [%s]:%d ...\n",
 		  Msg->mx_host,
 		  buf,
 		  Msg->IO.ConnectMe->Port);
 
-	Msg->MyQEntry->Status = 5;
+	Msg->MyQEntry->Status = 4;
 	StrBufPrintf(Msg->MyQEntry->StatusMessage,
 		     "Timeout while connecting %s [%s]:%d ",
 		     Msg->mx_host,
@@ -352,8 +354,9 @@ void SetConnectStatus(AsyncIO *IO)
 eNextState mx_connect_ip(AsyncIO *IO)
 {
 	SmtpOutMsg *Msg = IO->Data;
+	SetSMTPState(IO, eSTMPconnecting);
 
-	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	EVS_syslog(LOG_DEBUG, "%s(%s)\n", __FUNCTION__, (Msg->IsRelay)? "Relay":"Remote");
 
 	IO->ConnectMe = Msg->pCurrRelay;
 	Msg->State = eConnectMX;
@@ -371,7 +374,12 @@ eNextState get_one_mx_host_ip_done(AsyncIO *IO)
 	SmtpOutMsg *Msg = IO->Data;
 	struct hostent *hostent;
 
+	IO->ConnectMe = Msg->pCurrRelay;
+
 	QueryCbDone(IO);
+	EVS_syslog(LOG_DEBUG, "%s Time[%fs]\n",
+		   __FUNCTION__,
+		   IO->Now - IO->DNS.Start);
 
 	hostent = Msg->HostLookup.VParsedDNSReply;
 	if ((Msg->HostLookup.DNSStatus == ARES_SUCCESS) &&
@@ -385,7 +393,7 @@ eNextState get_one_mx_host_ip_done(AsyncIO *IO)
 			Msg->pCurrRelay->Addr.sin6_family =
 				hostent->h_addrtype;
 			Msg->pCurrRelay->Addr.sin6_port =
-				htons(DefaultMXPort);
+				htons(Msg->IO.ConnectMe->Port);
 		}
 		else {
 			struct sockaddr_in *addr;
@@ -403,7 +411,7 @@ eNextState get_one_mx_host_ip_done(AsyncIO *IO)
 			       sizeof(uint32_t));
 
 			addr->sin_family = hostent->h_addrtype;
-			addr->sin_port   = htons(DefaultMXPort);
+			addr->sin_port   = htons(Msg->IO.ConnectMe->Port);
 		}
 		Msg->mx_host = Msg->pCurrRelay->Host;
 		if (Msg->HostLookup.VParsedDNSReply != NULL) {
@@ -413,6 +421,7 @@ eNextState get_one_mx_host_ip_done(AsyncIO *IO)
 		return mx_connect_ip(IO);
 	}
 	else {
+		SetSMTPState(IO, eSTMPfailOne);
 		if (Msg->HostLookup.VParsedDNSReply != NULL) {
 			Msg->HostLookup.DNSReplyFree(Msg->HostLookup.VParsedDNSReply);
 			Msg->HostLookup.VParsedDNSReply = NULL;
@@ -430,12 +439,12 @@ eNextState get_one_mx_host_ip(AsyncIO *IO)
 	 * - the direct hostname if there was no mx record
 	 * - one of the mx'es
 	 */
+	SetSMTPState(IO, (Msg->pCurrRelay->IPv6)?eSTMPalookup:eSTMPaaaalookup);
 
-	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
 
 	EVS_syslog(LOG_DEBUG,
-		  "SMTP client[%ld]: looking up %s-Record %s : %d ...\n",
-		  Msg->n,
+		  "looking up %s-Record %s : %d ...\n",
 		  (Msg->pCurrRelay->IPv6)? "aaaa": "a",
 		  Msg->pCurrRelay->Host,
 		  Msg->pCurrRelay->Port);
@@ -467,7 +476,9 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO)
 
 	QueryCbDone(IO);
 
-	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	EVS_syslog(LOG_DEBUG, "%s Time[%fs]\n",
+		   __FUNCTION__,
+		   IO->Now - IO->DNS.Start);
 
 	pp = &Msg->Relay;
 	while ((pp != NULL) && (*pp != NULL) && ((*pp)->Next != NULL))
@@ -545,7 +556,9 @@ eNextState resolve_mx_records(AsyncIO *IO)
 {
 	SmtpOutMsg * Msg = IO->Data;
 
-	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	SetSMTPState(IO, eSTMPmxlookup);
+
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
 	/* start resolving MX records here. */
 	if (!QueueQuery(ns_t_mx,
 			Msg->node,
@@ -575,6 +588,8 @@ SmtpOutMsg *new_smtp_outmsg(OneQueItem *MyQItem,
 	SmtpOutMsg * Msg;
 
 	Msg = (SmtpOutMsg *) malloc(sizeof(SmtpOutMsg));
+	if (Msg == NULL)
+		return NULL;
 	memset(Msg, 0, sizeof(SmtpOutMsg));
 
 	Msg->n                = MsgCount;
@@ -609,33 +624,46 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
 {
 	SmtpOutMsg *Msg;
 
-	syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	SMTPC_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
 
 	Msg = new_smtp_outmsg(MyQItem, MyQEntry, MsgCount);
+	if (Msg == NULL) {
+		SMTPC_syslog(LOG_DEBUG, "%s Failed to alocate message context.\n", __FUNCTION__);
+		if (KeepMsgText) 
+			FreeStrBuf (&MsgText);
+		return;
+	}
 	if (KeepMsgText) Msg->msgtext = MsgText;
 	else		 Msg->msgtext = NewStrBufDup(MsgText);
 
-	if (smtp_resolve_recipients(Msg)) {
-
+	if (smtp_resolve_recipients(Msg) &&
+	    (!MyQItem->HaveRelay ||
+	     (MyQItem->URL != NULL)))
+	{
 		safestrncpy(
 			((CitContext *)Msg->IO.CitContext)->cs_host,
 			Msg->node,
 			sizeof(((CitContext *)
 				Msg->IO.CitContext)->cs_host));
 
-		syslog(LOG_DEBUG, "SMTP Starting: [%ld] <%s> CC <%d> \n",
-		       Msg->MyQItem->MessageID,
-		       ChrPtr(Msg->MyQEntry->Recipient),
-		       ((CitContext*)Msg->IO.CitContext)->cs_pid);
-		if (Msg->pCurrRelay == NULL)
+		SMTPC_syslog(LOG_DEBUG, "Starting: [%ld] <%s> CC <%d> \n",
+			     Msg->MyQItem->MessageID,
+			     ChrPtr(Msg->MyQEntry->Recipient),
+			     ((CitContext*)Msg->IO.CitContext)->cs_pid);
+		if (Msg->pCurrRelay == NULL) {
+			SetSMTPState(&Msg->IO, eSTMPmxlookup);
 			QueueEventContext(&Msg->IO,
 					  resolve_mx_records);
+		}
 		else { /* oh... via relay host */
+			Msg->IsRelay = 1;
 			if (Msg->pCurrRelay->IsIP) {
+				SetSMTPState(&Msg->IO, eSTMPconnecting);
 				QueueEventContext(&Msg->IO,
 						  mx_connect_ip);
 			}
 			else {
+				SetSMTPState(&Msg->IO, eSTMPalookup);
 				/* uneducated admin has chosen to
 				   add DNS to the equation... */
 				QueueEventContext(&Msg->IO,
@@ -644,18 +672,16 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
 		}
 	}
 	else {
+		SetSMTPState(&Msg->IO, eSMTPFailTotal);
 		/* No recipients? well fail then. */
-		if ((Msg==NULL) ||
-		    (Msg->MyQEntry == NULL)) {
+		if (Msg->MyQEntry != NULL) {
 			Msg->MyQEntry->Status = 5;
-			StrBufPlain(Msg->MyQEntry->StatusMessage,
-				    HKEY("Invalid Recipient!"));
+			if (StrLength(Msg->MyQEntry->StatusMessage) == 0)
+				StrBufPlain(Msg->MyQEntry->StatusMessage,
+					    HKEY("Invalid Recipient!"));
 		}
-		FinalizeMessageSend_1(&Msg->IO);
-		FinalizeMessageSend_DB_1(&Msg->IO);
-		FinalizeMessageSend_DB_2(&Msg->IO);
-		FinalizeMessageSend_DB_3(&Msg->IO);
 		FinalizeMessageSend_DB(&Msg->IO);
+		DeleteSmtpOutMsg(Msg);
 	}
 }
 
@@ -673,7 +699,7 @@ void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *Msg)
 	double Timeout = 0.0;
 	AsyncIO *IO = &Msg->IO;
 
-	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
 
 	switch (NextTCPState) {
 	case eSendFile:
@@ -712,7 +738,7 @@ void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *Msg)
 }
 eNextState SMTP_C_DispatchReadDone(AsyncIO *IO)
 {
-	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
 	SmtpOutMsg *Msg = IO->Data;
 	eNextState rc;
 
@@ -726,7 +752,7 @@ eNextState SMTP_C_DispatchReadDone(AsyncIO *IO)
 }
 eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO)
 {
-	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
 	SmtpOutMsg *Msg = IO->Data;
 	eNextState rc;
 
@@ -743,21 +769,23 @@ eNextState SMTP_C_Terminate(AsyncIO *IO)
 {
 	SmtpOutMsg *Msg = IO->Data;
 
-	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
 	return FinalizeMessageSend(Msg);
 }
 eNextState SMTP_C_TerminateDB(AsyncIO *IO)
 {
-	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
-	return FinalizeMessageSend_DB(IO);
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+	return Terminate(IO);
 }
 eNextState SMTP_C_Timeout(AsyncIO *IO)
 {
 	SmtpOutMsg *Msg = IO->Data;
 
 	Msg->MyQEntry->Status = 4;
-	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
-	StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State]));
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+	StrBufPrintf(IO->ErrMsg, "Timeout: %s while talking to %s",
+		     ReadErrors[Msg->State].Key,
+		     Msg->mx_host);
 	if (Msg->State > eRCPT)
 		return eAbort;
 	else
@@ -768,22 +796,47 @@ eNextState SMTP_C_ConnFail(AsyncIO *IO)
 	SmtpOutMsg *Msg = IO->Data;
 
 	Msg->MyQEntry->Status = 4;
-	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
-	StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State]));
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+	StrBufPrintf(IO->ErrMsg, "Connection failure: %s while talking to %s",
+		     ReadErrors[Msg->State].Key,
+		     Msg->mx_host);
+
 	return FailOneAttempt(IO);
 }
 eNextState SMTP_C_DNSFail(AsyncIO *IO)
 {
 	SmtpOutMsg *Msg = IO->Data;
 	Msg->MyQEntry->Status = 4;
-	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
 	return FailOneAttempt(IO);
 }
 eNextState SMTP_C_Shutdown(AsyncIO *IO)
 {
-	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
 	SmtpOutMsg *Msg = IO->Data;
 
+	switch (IO->NextState) {
+	case eSendDNSQuery:
+	case eReadDNSReply:
+
+		/* todo: abort c-ares */
+	case eConnect:
+	case eSendReply:
+	case eSendMore:
+	case eSendFile:
+	case eReadMessage:
+	case eReadMore:
+	case eReadPayload:
+	case eReadFile:
+		StopClientWatchers(IO, 1);
+		break;
+	case eDBQuery:
+
+		break;
+	case eTerminateConnection:
+	case eAbort:
+		break;
+	}
 	Msg->MyQEntry->Status = 3;
 	StrBufPlain(Msg->MyQEntry->StatusMessage,
 		    HKEY("server shutdown during message submit."));
@@ -823,7 +876,14 @@ eReadState SMTP_C_ReadServerStatus(AsyncIO *IO)
 	return Finished;
 }
 
+void LogDebugEnableSMTPClient(const int n)
+{
+	SMTPClientDebugEnabled = n;
+}
+
 CTDL_MODULE_INIT(smtp_eventclient)
 {
+	if (!threading)
+		CtdlRegisterDebugFlagHook(HKEY("smtpeventclient"), LogDebugEnableSMTPClient, &SMTPClientDebugEnabled);
 	return "smtpeventclient";
 }