X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=c744bb6e4cb81fd3bf2d99a60834d6c21c04f435;hb=9e07e8e851dcb5758feacb349cbb94b15799d632;hp=919f97f60769ba5306afdff3c5b437dcf0731c03;hpb=c12b418a64b44be9d08cae0e5dd25c988a522b90;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index 919f97f60..c744bb6e4 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -16,25 +16,25 @@
  * RFC 2821 - Simple Mail Transfer Protocol
  * RFC 2822 - Internet Message Format
  * RFC 2920 - SMTP Service Extension for Command Pipelining
- *  
+ *
  * The VRFY and EXPN commands have been removed from this implementation
  * because nobody uses these commands anymore, except for spammers.
  *
- * Copyright (c) 1998-2009 by the citadel.org team
+ * Copyright (c) 1998-2012 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ *  This program is open source software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ *  
+ *  
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  
+ *  
+ *  
  */
 
 #include "sysdep.h"
@@ -88,829 +88,667 @@
 #include "smtp_util.h"
 #include "event_client.h"
 #include "smtpqueue.h"
-
-#ifdef EXPERIMENTAL_SMTP_EVENT_CLIENT
-/*****************************************************************************/
-/*               SMTP CLIENT (OUTBOUND PROCESSING) STUFF                     */
-/*****************************************************************************/
-
-typedef enum _eSMTP_C_States {
-	eConnect, 
-	eEHLO,
-	eHELO,
-	eSMTPAuth,
-	eFROM,
-	eRCPT,
-	eDATA,
-	eDATABody,
-	eDATATerminateBody,
-	eQUIT,
-	eMaxSMTPC
-} eSMTP_C_States;
-
-const double SMTP_C_ConnTimeout = 60.; /* wail 1 minute for connections... */
-const double SMTP_C_ReadTimeouts[eMaxSMTPC] = {
-	300., /* Greeting... */
-	30., /* EHLO */
-	30., /* HELO */
-	30., /* Auth */
-	30., /* From */
-	90., /* RCPT */
-	30., /* DATA */
-	90., /* DATABody */
-	90., /* end of body... */
-	30.  /* QUIT */
-};
-const double SMTP_C_SendTimeouts[eMaxSMTPC] = {
-	90., /* Greeting... */
-	30., /* EHLO */
-	30., /* HELO */
-	30., /* Auth */
-	30., /* From */
-	30., /* RCPT */
-	30., /* DATA */
-	90., /* DATABody */
-	900., /* end of body... */
-	30.  /* QUIT */
+#include "smtp_clienthandlers.h"
+
+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")}
 };
 
-static const ConstStr ReadErrors[eMaxSMTPC] = {
-	{HKEY("Connection broken during SMTP conversation")},
-	{HKEY("Connection broken during SMTP EHLO")},
-	{HKEY("Connection broken during SMTP HELO")},
-	{HKEY("Connection broken during SMTP AUTH")},
-	{HKEY("Connection broken during SMTP MAIL FROM")},
-	{HKEY("Connection broken during SMTP RCPT")},
-	{HKEY("Connection broken during SMTP DATA")},
-	{HKEY("Connection broken during SMTP message transmit")},
-	{HKEY("")}/* quit reply, don't care. */
-};
-
-
-typedef struct _stmp_out_msg {
-	MailQEntry *MyQEntry;
-	OneQueItem *MyQItem;
-	long n;
-	AsyncIO IO;
-
-	eSMTP_C_States State;
-
-	struct ares_mx_reply *AllMX;
-	struct ares_mx_reply *CurrMX;
-	const char *mx_port;
-	const char *mx_host;
-
-	struct hostent *OneMX;
-
-	ParsedURL *Relay;
-	ParsedURL *pCurrRelay;
-	StrBuf *msgtext;
-	char *envelope_from;
-	char user[1024];
-	char node[1024];
-	char name[1024];
-	char mailfrom[1024];
-} SmtpOutMsg;
+void SetSMTPState(AsyncIO *IO, smtpstate State)
+{
+	CitContext* CCC = IO->CitContext;
+	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, "%s Exit\n", __FUNCTION__);
+
+	/* these are kept in our own space and free'd below */
+	Msg->IO.ConnectMe = NULL;
 
 	ares_free_data(Msg->AllMX);
-	
+	if (Msg->HostLookup.VParsedDNSReply != NULL)
+		Msg->HostLookup.DNSReplyFree(Msg->HostLookup.VParsedDNSReply);
+	FreeURL(&Msg->Relay);
 	FreeStrBuf(&Msg->msgtext);
 	FreeAsyncIOContents(&Msg->IO);
+	memset (Msg, 0, sizeof(SmtpOutMsg)); /* just to be shure... */
 	free(Msg);
 }
 
+eNextState SMTP_C_Shutdown(AsyncIO *IO);
 eNextState SMTP_C_Timeout(AsyncIO *IO);
 eNextState SMTP_C_ConnFail(AsyncIO *IO);
 eNextState SMTP_C_DispatchReadDone(AsyncIO *IO);
 eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO);
+eNextState SMTP_C_DNSFail(AsyncIO *IO);
 eNextState SMTP_C_Terminate(AsyncIO *IO);
+eNextState SMTP_C_TerminateDB(AsyncIO *IO);
 eReadState SMTP_C_ReadServerStatus(AsyncIO *IO);
 
-typedef eNextState (*SMTPReadHandler)(SmtpOutMsg *Msg);
-typedef eNextState (*SMTPSendHandler)(SmtpOutMsg *Msg);
-
-
-#define SMTP_ERROR(WHICH_ERR, ERRSTR) do {\
-		SendMsg->MyQEntry->Status = WHICH_ERR; \
-		StrBufAppendBufPlain(SendMsg->MyQEntry->StatusMessage, HKEY(ERRSTR), 0); \
-		return eAbort; } \
-	while (0)
-
-#define SMTP_VERROR(WHICH_ERR) do {\
-		SendMsg->MyQEntry->Status = WHICH_ERR; \
-		StrBufPlain(SendMsg->MyQEntry->StatusMessage, \
-			    ChrPtr(SendMsg->IO.IOBuf) + 4, \
-			    StrLength(SendMsg->IO.IOBuf) - 4); \
-		return eAbort; } \
-	while (0)
-
-#define SMTP_IS_STATE(WHICH_STATE) (ChrPtr(SendMsg->IO.IOBuf)[0] == WHICH_STATE)
-
-#define SMTP_DBG_SEND() CtdlLogPrintf(CTDL_DEBUG, "SMTP client[%ld]: > %s\n", SendMsg->n, ChrPtr(SendMsg->IO.IOBuf))
-#define SMTP_DBG_READ() CtdlLogPrintf(CTDL_DEBUG, "SMTP client[%ld]: < %s\n", SendMsg->n, ChrPtr(SendMsg->IO.IOBuf))
-
+eNextState mx_connect_ip(AsyncIO *IO);
+eNextState get_one_mx_host_ip(AsyncIO *IO);
 
-void FinalizeMessageSend(SmtpOutMsg *Msg)
+/******************************************************************************
+ * So, we're finished with sending (regardless of success or failure)         *
+ * This Message might be referenced by several Queue-Items, if we're the last,*
+ * we need to free the memory and send bounce messages (on terminal failure)  *
+ * else we just free our SMTP-Message struct.                                 *
+ ******************************************************************************/
+eNextState FinalizeMessageSend_DB(AsyncIO *IO)
 {
-	CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	const char *Status;
+	SmtpOutMsg *Msg = IO->Data;
 	
-	if (DecreaseQReference(Msg->MyQItem)) 
-	{
-		int nRemain;
-		StrBuf *MsgData;
-
-		nRemain = CountActiveQueueEntries(Msg->MyQItem);
-
-		MsgData = SerializeQueueItem(Msg->MyQItem);
-		/*
-		 * Uncompleted delivery instructions remain, so delete the old
-		 * instructions and replace with the updated ones.
-		 */
-		CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
-		smtpq_do_bounce(Msg->MyQItem,
-			       Msg->msgtext); 
-		if (nRemain > 0) {
-			struct CtdlMessage *msg;
-			msg = malloc(sizeof(struct CtdlMessage));
-			memset(msg, 0, sizeof(struct CtdlMessage));
-			msg->cm_magic = CTDLMESSAGE_MAGIC;
-			msg->cm_anon_type = MES_NORMAL;
-			msg->cm_format_type = FMT_RFC822;
-			msg->cm_fields['M'] = SmashStrBuf(&MsgData);
-			CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
-			CtdlFreeMessage(msg);
-		}
-		else {
-			CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->MessageID, 1, "");
-			FreeStrBuf(&MsgData);
-		}
-
-		RemoveQItem(Msg->MyQItem);
+	if (Msg->MyQEntry->Status == 2) {
+		SetSMTPState(IO, eSTMPfinished);
+		Status = "Delivery successful.";
 	}
-	DeleteSmtpOutMsg(Msg);
-}
-
-
-
-eNextState mx_connect_relay_ip(AsyncIO *IO)
-{
-	
-	SmtpOutMsg *SendMsg = IO->Data;
-
-	CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
-
-	IO->IP6 = SendMsg->pCurrRelay->af == AF_INET6;
-	
-	if (SendMsg->pCurrRelay->Port != 0)
-		IO->dport = SendMsg->pCurrRelay->Port;
-
-	memset(&IO->Addr, 0, sizeof(struct in6_addr));
-	if (IO->IP6) {
-		memcpy(&IO->Addr.sin6_addr.s6_addr, 
-		       &SendMsg->pCurrRelay->Addr,
-		       sizeof(struct in6_addr));
-		
-		IO->Addr.sin6_family = AF_INET6;
-		IO->Addr.sin6_port = htons(IO->dport);
+	else if (Msg->MyQEntry->Status == 5) {
+		SetSMTPState(IO, eSMTPFailTotal);
+		Status = "Delivery failed permanently; giving up.";
 	}
 	else {
-		struct sockaddr_in *addr = (struct sockaddr_in*) &IO->Addr;
-		/* Bypass the ns lookup result like this: IO->Addr.sin_addr.s_addr = inet_addr("127.0.0.1"); */
-		memcpy(&addr->sin_addr, 
-		       &SendMsg->pCurrRelay->Addr,
-		       sizeof(struct in_addr));
-		
-		addr->sin_family = AF_INET;
-		addr->sin_port = htons(IO->dport);
+		SetSMTPState(IO, eSMTPFailTemporary);
+		Status = "Delivery failed temporarily; will retry later.";
 	}
+			
+	EVS_syslog(LOG_INFO,
+		   "%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));
 
 
+	Msg->IDestructQueItem = DecreaseQReference(Msg->MyQItem);
 
-/*
-
-	SendMsg->pCurrRelay->
-	if ((SendMsg->pCurrRelay != NULL) && (SendMsg->pCurrRelay->IsIP)) {
-		connect = 1;
+	Msg->nRemain = CountActiveQueueEntries(Msg->MyQItem, 0);
 
+	if (Msg->MyQEntry->Active && 
+	    !Msg->MyQEntry->StillActive &&
+	    CheckQEntryIsBounce(Msg->MyQEntry))
+	{
+		/* are we casue for a bounce mail? */
+		Msg->MyQItem->SendBounceMail |= (1<<Msg->MyQEntry->Status);
 	}
-		unsigned long psaddr;
-
 
-		memcpy(&psaddr, hostent->h_addr_list[0], sizeof(psaddr));
-		psaddr = ntohl(psaddr); 
+	if ((Msg->nRemain > 0) || Msg->IDestructQueItem)
+		Msg->QMsgData = SerializeQueueItem(Msg->MyQItem);
+	else
+		Msg->QMsgData = NULL;
 
-		CtdlLogPrintf(CTDL_DEBUG, 
-			      "SMTP client[%ld]: connecting to %s [%ld.%ld.%ld.%ld:%d] ...\n", 
-			      SendMsg->n, 
-			      SendMsg->mx_host, 
-			      (psaddr >> 24) & 0xFF,
-			      (psaddr >> 16) & 0xFF,
-			      (psaddr >>  8) & 0xFF,
-			      (psaddr >>  0) & 0xFF,
-			      SendMsg->IO.dport);
-
-		SendMsg->MyQEntry->Status = 5; 
-		StrBufPrintf(SendMsg->MyQEntry->StatusMessage, 
-			     "Timeout while connecting %s [%ld.%ld.%ld.%ld:%d] ", 
-			     SendMsg->mx_host,
-			     (psaddr >> 24) & 0xFF,
-			     (psaddr >> 16) & 0xFF,
-			     (psaddr >>  8) & 0xFF,
-			     (psaddr >>  0) & 0xFF,
-			     SendMsg->IO.dport);
+	/*
+	 * Uncompleted delivery instructions remain, so delete the old
+	 * instructions and replace with the updated ones.
+	 */
+	EVS_syslog(LOG_DEBUG, "%ld", Msg->MyQItem->QueMsgID);
+	CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
+	Msg->MyQItem->QueMsgID = -1;
 
+	if (Msg->IDestructQueItem)
+		smtpq_do_bounce(Msg->MyQItem, Msg->msgtext, Msg->pCurrRelay);
 
+	if (Msg->nRemain > 0)
+	{
+		struct CtdlMessage *msg;
+		msg = malloc(sizeof(struct CtdlMessage));
+		memset(msg, 0, sizeof(struct CtdlMessage));
+		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");
+		Msg->MyQItem->QueMsgID =
+			CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
+		EVS_syslog(LOG_DEBUG, "%ld", Msg->MyQItem->QueMsgID);
+		CtdlFreeMessage(msg);
 	}
-*/
-	/// TODO: else fail!
-	InitEventIO(IO, SendMsg, 
-		    SMTP_C_ConnTimeout, 
-		    SMTP_C_ReadTimeouts[0],
-			    1);
-}
-
-void get_one_mx_host_ip_done(void *Ctx, 
-			     int status,
-			     int timeouts,
-			     struct hostent *hostent)
-{
-	AsyncIO *IO = (AsyncIO *) Ctx;
-	SmtpOutMsg *SendMsg = IO->Data;
-
-	if ((status == ARES_SUCCESS) && (hostent != NULL) ) {
-		
-		IO->IP6 = hostent->h_addrtype == AF_INET6;
-		
-		memset(&IO->Addr, 0, sizeof(struct in6_addr));
-		if (IO->IP6) {
-			memcpy(&IO->Addr.sin6_addr.s6_addr, 
-			       IO->HEnt->h_addr_list[0],
-			       sizeof(struct in6_addr));
-			
-			IO->Addr.sin6_family = hostent->h_addrtype;
-			IO->Addr.sin6_port = htons(IO->dport);
-		}
-		else {
-			struct sockaddr_in *addr = (struct sockaddr_in*) &IO->Addr;
-			/* Bypass the ns lookup result like this: IO->Addr.sin_addr.s_addr = inet_addr("127.0.0.1"); */
-			memcpy(&addr->sin_addr, 
-			       IO->HEnt->h_addr_list[0],
-			       sizeof(struct in_addr));
-			
-			addr->sin_family = hostent->h_addrtype;
-			addr->sin_port = htons(IO->dport);
-			
-		}
-		SendMsg->IO.HEnt = hostent;
-		InitEventIO(IO, SendMsg, 
-			    SMTP_C_ConnTimeout, 
-			    SMTP_C_ReadTimeouts[0],
-			    1);
+	else {
+		CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM,
+				   &Msg->MyQItem->MessageID,
+				   1,
+				   "");
+		FreeStrBuf(&Msg->QMsgData);
 	}
-}
-
-const unsigned short DefaultMXPort = 25;
-eNextState get_one_mx_host_ip(AsyncIO *IO)
-{
-	SmtpOutMsg * SendMsg = IO->Data;
-
-	//char *endpart;
-	//char buf[SIZ];
-
-	CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
-	SendMsg->IO.dport = DefaultMXPort;
-
-	SendMsg->mx_host = SendMsg->CurrMX->host;
-	SendMsg->CurrMX = SendMsg->CurrMX->next;
 
-	CtdlLogPrintf(CTDL_DEBUG, 
-		      "SMTP client[%ld]: looking up %s : %d ...\n", 
-		      SendMsg->n, 
-		      SendMsg->mx_host, 
-		      SendMsg->IO.dport);
-
-	ares_gethostbyname(SendMsg->IO.DNSChannel,
-			   SendMsg->mx_host,   
-			   AF_INET6, /* it falls back to ipv4 in doubt... */
-			   get_one_mx_host_ip_done,
-			   &SendMsg->IO);
+	RemoveContext(Msg->IO.CitContext);
+	return eAbort;
 }
 
-
-eNextState smtp_resolve_mx_done(AsyncIO *IO)
+eNextState Terminate(AsyncIO *IO)
 {
-	SmtpOutMsg * SendMsg = IO->Data;
+	SmtpOutMsg *Msg = IO->Data;
 
-	CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
-
-	SendMsg->IO.SendBuf.Buf = NewStrBufPlain(NULL, 1024);
-	SendMsg->IO.RecvBuf.Buf = NewStrBufPlain(NULL, 1024);
-	SendMsg->IO.IOBuf = NewStrBuf();
-	SendMsg->IO.ErrMsg = SendMsg->MyQEntry->StatusMessage;
+	if (Msg->IDestructQueItem)
+		RemoveQItem(Msg->MyQItem);
 
-	SendMsg->CurrMX = SendMsg->AllMX = IO->VParsedDNSReply;
-	//// TODO: should we remove the current ares context???
-	get_one_mx_host_ip(IO);
-	return 0;
+	DeleteSmtpOutMsg(Msg);
+	return eAbort;
 }
-
-
-eNextState resolve_mx_records(AsyncIO *IO)
+eNextState FinalizeMessageSend(SmtpOutMsg *Msg)
 {
-	SmtpOutMsg * SendMsg = IO->Data;
-
-	CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
-
-	if (!QueueQuery(ns_t_mx, 
-			SendMsg->node, 
-			&SendMsg->IO, 
-			smtp_resolve_mx_done))
-	{
-		SendMsg->MyQEntry->Status = 5;
-		StrBufPrintf(SendMsg->MyQEntry->StatusMessage, 
-			     "No MX hosts found for <%s>", SendMsg->node);
-		return 0; ///////TODO: abort!
-	}
-	return 0;
+	/* hand over to DB Queue */
+	return QueueDBOperation(&Msg->IO, FinalizeMessageSend_DB);
 }
 
-
-int smtp_resolve_recipients(SmtpOutMsg *SendMsg)
+eNextState FailOneAttempt(AsyncIO *IO)
 {
-	const char *ptr;
-	char buf[1024];
-	int scan_done;
-	int lp, rp;
-	int i;
-
-	CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
-
-	if ((SendMsg==NULL) || 
-	    (SendMsg->MyQEntry == NULL) || 
-	    (StrLength(SendMsg->MyQEntry->Recipient) == 0)) {
-		return 0;
-	}
+	SmtpOutMsg *Msg = IO->Data;
 
-	/* Parse out the host portion of the recipient address */
-	process_rfc822_addr(ChrPtr(SendMsg->MyQEntry->Recipient), 
-			    SendMsg->user, 
-			    SendMsg->node, 
-			    SendMsg->name);
-
-	CtdlLogPrintf(CTDL_DEBUG, "SMTP client[%ld]: Attempting delivery to <%s> @ <%s> (%s)\n",
-		      SendMsg->n, SendMsg->user, SendMsg->node, SendMsg->name);
-	/* If no envelope_from is supplied, extract one from the message */
-	if ( (SendMsg->envelope_from == NULL) || 
-	     (IsEmptyStr(SendMsg->envelope_from)) ) {
-		SendMsg->mailfrom[0] = '\0';
-		scan_done = 0;
-		ptr = ChrPtr(SendMsg->msgtext);
-		do {
-			if (ptr = cmemreadline(ptr, buf, sizeof buf), *ptr == 0) {
-				scan_done = 1;
-			}
-			if (!strncasecmp(buf, "From:", 5)) {
-				safestrncpy(SendMsg->mailfrom, &buf[5], sizeof SendMsg->mailfrom);
-				striplt(SendMsg->mailfrom);
-				for (i=0; SendMsg->mailfrom[i]; ++i) {
-					if (!isprint(SendMsg->mailfrom[i])) {
-						strcpy(&SendMsg->mailfrom[i], &SendMsg->mailfrom[i+1]);
-						i=0;
-					}
-				}
-	
-				/* Strip out parenthesized names */
-				lp = (-1);
-				rp = (-1);
-				for (i=0; !IsEmptyStr(SendMsg->mailfrom + i); ++i) {
-					if (SendMsg->mailfrom[i] == '(') lp = i;
-					if (SendMsg->mailfrom[i] == ')') rp = i;
-				}
-				if ((lp>0)&&(rp>lp)) {
-					strcpy(&SendMsg->mailfrom[lp-1], &SendMsg->mailfrom[rp+1]);
-				}
-	
-				/* Prefer brokketized names */
-				lp = (-1);
-				rp = (-1);
-				for (i=0; !IsEmptyStr(SendMsg->mailfrom + i); ++i) {
-					if (SendMsg->mailfrom[i] == '<') lp = i;
-					if (SendMsg->mailfrom[i] == '>') rp = i;
-				}
-				if ( (lp>=0) && (rp>lp) ) {
-					SendMsg->mailfrom[rp] = 0;
-					memmove(SendMsg->mailfrom, 
-						&SendMsg->mailfrom[lp + 1], 
-						rp - lp);
-				}
-	
-				scan_done = 1;
-			}
-		} while (scan_done == 0);
-		if (IsEmptyStr(SendMsg->mailfrom)) strcpy(SendMsg->mailfrom, "someone@somewhere.org");
-		stripallbut(SendMsg->mailfrom, '<', '>');
-		SendMsg->envelope_from = SendMsg->mailfrom;
-	}
+	SetSMTPState(IO, eSTMPfailOne);
+	if (Msg->MyQEntry->Status == 2)
+		return eAbort;
 
-	return 1;
-}
+	/*
+	 * possible ways here:
+	 * - connection timeout
+	 * - dns lookup failed
+	 */
+	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);
 
-void smtp_try(OneQueItem *MyQItem, 
-	      MailQEntry *MyQEntry, 
-	      StrBuf *MsgText, 
-	      int KeepMsgText,  /* KeepMsgText allows us to use MsgText as ours. */
-	      int MsgCount)
-{
-	SmtpOutMsg * SendMsg;
-
-	CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
-
-	SendMsg = (SmtpOutMsg *) malloc(sizeof(SmtpOutMsg));
-	memset(SendMsg, 0, sizeof(SmtpOutMsg));
-	SendMsg->IO.sock    = (-1);
-	SendMsg->n          = MsgCount++;
-	SendMsg->MyQEntry   = MyQEntry;
-	SendMsg->MyQItem    = MyQItem;
-	SendMsg->pCurrRelay = MyQItem->URL;
-
-	SendMsg->IO.Data        = SendMsg;
-	SendMsg->IO.SendDone    = SMTP_C_DispatchWriteDone;
-	SendMsg->IO.ReadDone    = SMTP_C_DispatchReadDone;
-	SendMsg->IO.Terminate   = SMTP_C_Terminate;
-	SendMsg->IO.LineReader  = SMTP_C_ReadServerStatus;
-	SendMsg->IO.ConnFail    = SMTP_C_ConnFail;
-	SendMsg->IO.Timeout     = SMTP_C_Timeout;
-
-	if (KeepMsgText) {
-		SendMsg->msgtext    = MsgText;
-	}
-	else {
-		SendMsg->msgtext = NewStrBufDup(MsgText);
+	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 (smtp_resolve_recipients(SendMsg)) {
-		if (SendMsg->pCurrRelay == NULL)
-			QueueEventContext(&SendMsg->IO,
-					  resolve_mx_records);
-		else {
-			if (SendMsg->pCurrRelay->IsIP) {
-				QueueEventContext(&SendMsg->IO,
-						  mx_connect_relay_ip);
-			}
-			else {
-				QueueEventContext(&SendMsg->IO,
-						  get_one_mx_host_ip);
-			}
-		}
+	if (Msg->pCurrRelay == NULL) {
+		EVS_syslog(LOG_DEBUG, "%s Aborting\n", __FUNCTION__);
+		return eAbort;
+	}
+	if (Msg->pCurrRelay->IsIP) {
+		EVS_syslog(LOG_DEBUG, "%s connecting IP\n", __FUNCTION__);
+		return mx_connect_ip(IO);
 	}
 	else {
-		if ((SendMsg==NULL) || 
-		    (SendMsg->MyQEntry == NULL)) {
-			SendMsg->MyQEntry->Status = 5;
-			StrBufPlain(SendMsg->MyQEntry->StatusMessage, 
-				    HKEY("Invalid Recipient!"));
-		}
-		FinalizeMessageSend(SendMsg);
+		EVS_syslog(LOG_DEBUG,
+			   "%s resolving next MX Record\n",
+			   __FUNCTION__);
+		return get_one_mx_host_ip(IO);
 	}
 }
 
 
+void SetConnectStatus(AsyncIO *IO)
+{
+	SmtpOutMsg *Msg = IO->Data;
+	char buf[256];
+	void *src;
 
+	buf[0] = '\0';
 
+	if (IO->ConnectMe->IPv6) {
+		src = &IO->ConnectMe->Addr.sin6_addr;
+	}
+	else {
+		struct sockaddr_in *addr;
 
-/*****************************************************************************/
-/*                     SMTP CLIENT STATE CALLBACKS                           */
-/*****************************************************************************/
-eNextState SMTPC_read_greeting(SmtpOutMsg *SendMsg)
-{
-	/* Process the SMTP greeting from the server */
-	SMTP_DBG_READ();
-
-	if (!SMTP_IS_STATE('2')) {
-		if (SMTP_IS_STATE('4')) 
-			SMTP_VERROR(4);
-		else 
-			SMTP_VERROR(5);
+		addr = (struct sockaddr_in *)&IO->ConnectMe->Addr;
+		src = &addr->sin_addr.s_addr;
 	}
-	return eSendReply;
-}
 
-eNextState SMTPC_send_EHLO(SmtpOutMsg *SendMsg)
-{
-	/* At this point we know we are talking to a real SMTP server */
+	inet_ntop((IO->ConnectMe->IPv6)?AF_INET6:AF_INET,
+		  src,
+		  buf,
+		  sizeof(buf));
 
-	/* Do a EHLO command.  If it fails, try the HELO command. */
-	StrBufPrintf(SendMsg->IO.SendBuf.Buf,
-		     "EHLO %s\r\n", config.c_fqdn);
+	if (Msg->mx_host == NULL)
+		Msg->mx_host = "<no MX-Record>";
 
-	SMTP_DBG_SEND();
-	return eReadMessage;
+	EVS_syslog(LOG_INFO,
+		  "connecting to %s [%s]:%d ...\n",
+		  Msg->mx_host,
+		  buf,
+		  Msg->IO.ConnectMe->Port);
+
+	Msg->MyQEntry->Status = 4;
+	StrBufPrintf(Msg->MyQEntry->StatusMessage,
+		     "Timeout while connecting %s [%s]:%d ",
+		     Msg->mx_host,
+		     buf,
+		     Msg->IO.ConnectMe->Port);
+	Msg->IO.NextState = eConnect;
 }
 
-eNextState SMTPC_read_EHLO_reply(SmtpOutMsg *SendMsg)
+/*****************************************************************************
+ * So we connect our Relay IP here.                                          *
+ *****************************************************************************/
+eNextState mx_connect_ip(AsyncIO *IO)
 {
-	SMTP_DBG_READ();
+	SmtpOutMsg *Msg = IO->Data;
+	SetSMTPState(IO, eSTMPconnecting);
 
-	if (SMTP_IS_STATE('2')) {
-		SendMsg->State ++;
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
 
-		if (SendMsg->pCurrRelay->User == NULL)
-			SendMsg->State ++; /* Skip auth... */
-	}
-	/* else we fall back to 'helo' */
-	return eSendReply;
-}
+	IO->ConnectMe = Msg->pCurrRelay;
+	Msg->State = eConnectMX;
 
-eNextState STMPC_send_HELO(SmtpOutMsg *SendMsg)
-{
-	StrBufPrintf(SendMsg->IO.SendBuf.Buf,
-		     "HELO %s\r\n", config.c_fqdn);
+	SetConnectStatus(IO);
 
-	SMTP_DBG_SEND();
-	return eReadMessage;
+	return EvConnectSock(IO,
+			     SMTP_C_ConnTimeout,
+			     SMTP_C_ReadTimeouts[0],
+			     1);
 }
 
-eNextState SMTPC_read_HELO_reply(SmtpOutMsg *SendMsg)
+eNextState get_one_mx_host_ip_done(AsyncIO *IO)
 {
-	SMTP_DBG_READ();
+	SmtpOutMsg *Msg = IO->Data;
+	struct hostent *hostent;
 
-	if (!SMTP_IS_STATE('2')) {
-		if (SMTP_IS_STATE('4'))
-			SMTP_VERROR(4);
-		else 
-			SMTP_VERROR(5);
-	}
-	if (SendMsg->pCurrRelay->User == NULL)
-		SendMsg->State ++; /* Skip auth... */
-	return eSendReply;
-}
+	IO->ConnectMe = Msg->pCurrRelay;
 
-eNextState SMTPC_send_auth(SmtpOutMsg *SendMsg)
-{
-	char buf[SIZ];
-	char encoded[1024];
-
-	/* Do an AUTH command if necessary */
-	sprintf(buf, "%s%c%s%c%s", 
-		SendMsg->pCurrRelay->User, '\0', 
-		SendMsg->pCurrRelay->User, '\0', 
-		SendMsg->pCurrRelay->Pass);
-	CtdlEncodeBase64(encoded, buf, 
-			 strlen(SendMsg->pCurrRelay->User) * 2 +
-			 strlen(SendMsg->pCurrRelay->Pass) + 2, 0);
-	StrBufPrintf(SendMsg->IO.SendBuf.Buf,
-		     "AUTH PLAIN %s\r\n", encoded);
-
-	SMTP_DBG_SEND();
-	return eReadMessage;
-}
+	QueryCbDone(IO);
+	EVS_syslog(LOG_DEBUG, "%s Time[%fs]\n",
+		   __FUNCTION__,
+		   IO->Now - IO->DNS.Start);
 
-eNextState SMTPC_read_auth_reply(SmtpOutMsg *SendMsg)
-{
-	/* Do an AUTH command if necessary */
-	
-	SMTP_DBG_READ();
-	
-	if (!SMTP_IS_STATE('2')) {
-		if (SMTP_IS_STATE('4'))
-			SMTP_VERROR(4);
-		else 
-			SMTP_VERROR(5);
-	}
-	return eSendReply;
-}
+	hostent = Msg->HostLookup.VParsedDNSReply;
+	if ((Msg->HostLookup.DNSStatus == ARES_SUCCESS) &&
+	    (hostent != NULL) ) {
+		memset(&Msg->pCurrRelay->Addr, 0, sizeof(struct in6_addr));
+		if (Msg->pCurrRelay->IPv6) {
+			memcpy(&Msg->pCurrRelay->Addr.sin6_addr.s6_addr,
+			       &hostent->h_addr_list[0],
+			       sizeof(struct in6_addr));
 
-eNextState SMTPC_send_FROM(SmtpOutMsg *SendMsg)
-{
-	/* previous command succeeded, now try the MAIL FROM: command */
-	StrBufPrintf(SendMsg->IO.SendBuf.Buf,
-		     "MAIL FROM:<%s>\r\n", 
-		     SendMsg->envelope_from);
+			Msg->pCurrRelay->Addr.sin6_family =
+				hostent->h_addrtype;
+			Msg->pCurrRelay->Addr.sin6_port =
+				htons(Msg->IO.ConnectMe->Port);
+		}
+		else {
+			struct sockaddr_in *addr;
+			/*
+			 * Bypass the ns lookup result like this:
+			 * IO->Addr.sin_addr.s_addr = inet_addr("127.0.0.1");
+			 * addr->sin_addr.s_addr =
+			 *   htonl((uint32_t)&hostent->h_addr_list[0]);
+			 */
 
-	SMTP_DBG_SEND();
-	return eReadMessage;
-}
+			addr = (struct sockaddr_in*) &Msg->pCurrRelay->Addr;
 
-eNextState SMTPC_read_FROM_reply(SmtpOutMsg *SendMsg)
-{
-	SMTP_DBG_READ();
+			memcpy(&addr->sin_addr.s_addr,
+			       hostent->h_addr_list[0],
+			       sizeof(uint32_t));
 
-	if (!SMTP_IS_STATE('2')) {
-		if (SMTP_IS_STATE('4'))
-			SMTP_VERROR(4);
-		else 
-			SMTP_VERROR(5);
+			addr->sin_family = hostent->h_addrtype;
+			addr->sin_port   = htons(Msg->IO.ConnectMe->Port);
+		}
+		Msg->mx_host = Msg->pCurrRelay->Host;
+		if (Msg->HostLookup.VParsedDNSReply != NULL) {
+			Msg->HostLookup.DNSReplyFree(Msg->HostLookup.VParsedDNSReply);
+			Msg->HostLookup.VParsedDNSReply = NULL;
+		}
+		return mx_connect_ip(IO);
+	}
+	else {
+		SetSMTPState(IO, eSTMPfailOne);
+		if (Msg->HostLookup.VParsedDNSReply != NULL) {
+			Msg->HostLookup.DNSReplyFree(Msg->HostLookup.VParsedDNSReply);
+			Msg->HostLookup.VParsedDNSReply = NULL;
+		}
+		return FailOneAttempt(IO);
 	}
-	return eSendReply;
-}
-
-
-eNextState SMTPC_send_RCPT(SmtpOutMsg *SendMsg)
-{
-	/* MAIL succeeded, now try the RCPT To: command */
-	StrBufPrintf(SendMsg->IO.SendBuf.Buf,
-		     "RCPT TO:<%s@%s>\r\n", 
-		     SendMsg->user, 
-		     SendMsg->node);
-
-	SMTP_DBG_SEND();
-	return eReadMessage;
 }
 
-eNextState SMTPC_read_RCPT_reply(SmtpOutMsg *SendMsg)
+eNextState get_one_mx_host_ip(AsyncIO *IO)
 {
-	SMTP_DBG_READ();
-
-	if (!SMTP_IS_STATE('2')) {
-		if (SMTP_IS_STATE('4')) 
-			SMTP_VERROR(4);
-		else 
-			SMTP_VERROR(5);
+	SmtpOutMsg * Msg = IO->Data;
+	/*
+	 * here we start with the lookup of one host. it might be...
+	 * - the relay host *sigh*
+	 * - 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, "%s\n", __FUNCTION__);
+
+	EVS_syslog(LOG_DEBUG,
+		  "looking up %s-Record %s : %d ...\n",
+		  (Msg->pCurrRelay->IPv6)? "aaaa": "a",
+		  Msg->pCurrRelay->Host,
+		  Msg->pCurrRelay->Port);
+
+	if (!QueueQuery((Msg->pCurrRelay->IPv6)? ns_t_aaaa : ns_t_a,
+			Msg->pCurrRelay->Host,
+			&Msg->IO,
+			&Msg->HostLookup,
+			get_one_mx_host_ip_done))
+	{
+		Msg->MyQEntry->Status = 5;
+		StrBufPrintf(Msg->MyQEntry->StatusMessage,
+			     "No MX hosts found for <%s>", Msg->node);
+		Msg->IO.NextState = eTerminateConnection;
+		return IO->NextState;
+	}
+	IO->NextState = eReadDNSReply;
+	return IO->NextState;
+}
+
+
+/*****************************************************************************
+ * here we try to find out about the MX records for our recipients.          *
+ *****************************************************************************/
+eNextState smtp_resolve_mx_record_done(AsyncIO *IO)
+{
+	SmtpOutMsg * Msg = IO->Data;
+	ParsedURL **pp;
+
+	QueryCbDone(IO);
+
+	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))
+		pp = &(*pp)->Next;
+
+	if ((IO->DNS.Query->DNSStatus == ARES_SUCCESS) &&
+	    (IO->DNS.Query->VParsedDNSReply != NULL))
+	{ /* ok, we found mx records. */
+
+		Msg->CurrMX
+			= Msg->AllMX
+			= IO->DNS.Query->VParsedDNSReply;
+		while (Msg->CurrMX) {
+			int i;
+			for (i = 0; i < 2; i++) {
+				ParsedURL *p;
+
+				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;
+				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_HAVE_MX;
+	}
+	else { /* else fall back to the plain hostname */
+		int i;
+		for (i = 0; i < 2; i++) {
+			ParsedURL *p;
+
+			p = (ParsedURL*) malloc(sizeof(ParsedURL));
+			memset(p, 0, sizeof(ParsedURL));
+			p->IsIP = 0;
+			p->Port = DefaultMXPort;
+			p->IPv6 = i == 1;
+			p->Host = Msg->node;
+
+			*pp = p;
+			pp = &p->Next;
+		}
+		Msg->CXFlags   = Msg->CXFlags & F_DIRECT;
 	}
-	return eSendReply;
+	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);
 }
 
-eNextState SMTPC_send_DATAcmd(SmtpOutMsg *SendMsg)
+eNextState resolve_mx_records(AsyncIO *IO)
 {
-	/* RCPT succeeded, now try the DATA command */
-	StrBufPlain(SendMsg->IO.SendBuf.Buf,
-		    HKEY("DATA\r\n"));
+	SmtpOutMsg * Msg = IO->Data;
 
-	SMTP_DBG_SEND();
-	return eReadMessage;
-}
-
-eNextState SMTPC_read_DATAcmd_reply(SmtpOutMsg *SendMsg)
-{
-	SMTP_DBG_READ();
+	SetSMTPState(IO, eSTMPmxlookup);
 
-	if (!SMTP_IS_STATE('3')) {
-		if (SMTP_IS_STATE('4')) 
-			SMTP_VERROR(3);
-		else 
-			SMTP_VERROR(5);
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+	/* start resolving MX records here. */
+	if (!QueueQuery(ns_t_mx,
+			Msg->node,
+			&Msg->IO,
+			&Msg->MxLookup,
+			smtp_resolve_mx_record_done))
+	{
+		Msg->MyQEntry->Status = 5;
+		StrBufPrintf(Msg->MyQEntry->StatusMessage,
+			     "No MX hosts found for <%s>", Msg->node);
+		return IO->NextState;
 	}
-	return eSendReply;
+	Msg->IO.NextState = eReadDNSReply;
+	return IO->NextState;
 }
 
-eNextState SMTPC_send_data_body(SmtpOutMsg *SendMsg)
-{
-	StrBuf *Buf;
-	/* If we reach this point, the server is expecting data.*/
 
-	Buf = SendMsg->IO.SendBuf.Buf;
-	SendMsg->IO.SendBuf.Buf = SendMsg->msgtext;
-	SendMsg->msgtext = Buf;
-	SendMsg->State ++;
 
-	return eSendMore;
-}
+/******************************************************************************
+ *  so, we're going to start a SMTP delivery.  lets get it on.                *
+ ******************************************************************************/
 
-eNextState SMTPC_send_terminate_data_body(SmtpOutMsg *SendMsg)
+SmtpOutMsg *new_smtp_outmsg(OneQueItem *MyQItem,
+			    MailQEntry *MyQEntry,
+			    int MsgCount)
 {
-	StrBuf *Buf;
+	SmtpOutMsg * Msg;
+
+	Msg = (SmtpOutMsg *) malloc(sizeof(SmtpOutMsg));
+	if (Msg == NULL)
+		return NULL;
+	memset(Msg, 0, sizeof(SmtpOutMsg));
 
-	Buf = SendMsg->IO.SendBuf.Buf;
-	SendMsg->IO.SendBuf.Buf = SendMsg->msgtext;
-	SendMsg->msgtext = Buf;
+	Msg->n                = MsgCount;
+	Msg->MyQEntry         = MyQEntry;
+	Msg->MyQItem          = MyQItem;
+	Msg->pCurrRelay       = MyQItem->URL;
 
-	StrBufPlain(SendMsg->IO.SendBuf.Buf,
-		    HKEY(".\r\n"));
+	InitIOStruct(&Msg->IO,
+		     Msg,
+		     eReadMessage,
+		     SMTP_C_ReadServerStatus,
+		     SMTP_C_DNSFail,
+		     SMTP_C_DispatchWriteDone,
+		     SMTP_C_DispatchReadDone,
+		     SMTP_C_Terminate,
+		     SMTP_C_TerminateDB,
+		     SMTP_C_ConnFail,
+		     SMTP_C_Timeout,
+		     SMTP_C_Shutdown);
 
-	return eReadMessage;
+	Msg->IO.ErrMsg = Msg->MyQEntry->StatusMessage;
 
+	return Msg;
 }
 
-eNextState SMTPC_read_data_body_reply(SmtpOutMsg *SendMsg)
+void smtp_try_one_queue_entry(OneQueItem *MyQItem,
+			      MailQEntry *MyQEntry,
+			      StrBuf *MsgText,
+			/*KeepMsgText allows us to use MsgText as ours.*/
+			      int KeepMsgText,
+			      int MsgCount)
 {
-	SMTP_DBG_READ();
+	SmtpOutMsg *Msg;
 
-	if (!SMTP_IS_STATE('2')) {
-		if (SMTP_IS_STATE('4'))
-			SMTP_VERROR(4);
-		else 
-			SMTP_VERROR(5);
-	}
-
-	/* We did it! */
-	StrBufPlain(SendMsg->MyQEntry->StatusMessage, 
-		    &ChrPtr(SendMsg->IO.RecvBuf.Buf)[4],
-		    StrLength(SendMsg->IO.RecvBuf.Buf) - 4);
-	SendMsg->MyQEntry->Status = 2;
-	return eSendReply;
-}
+	SMTPC_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
 
-eNextState SMTPC_send_QUIT(SmtpOutMsg *SendMsg)
-{
-	StrBufPlain(SendMsg->IO.SendBuf.Buf,
-		    HKEY("QUIT\r\n"));
+	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);
 
-	SMTP_DBG_SEND();
-	return eReadMessage;
+	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));
+
+		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 */
+			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,
+						  get_one_mx_host_ip);
+			}
+		}
+	}
+	else {
+		SetSMTPState(&Msg->IO, eSMTPFailTotal);
+		/* No recipients? well fail then. */
+		if (Msg->MyQEntry != NULL) {
+			Msg->MyQEntry->Status = 5;
+			if (StrLength(Msg->MyQEntry->StatusMessage) == 0)
+				StrBufPlain(Msg->MyQEntry->StatusMessage,
+					    HKEY("Invalid Recipient!"));
+		}
+		FinalizeMessageSend_DB(&Msg->IO);
+		DeleteSmtpOutMsg(Msg);
+	}
 }
 
-eNextState SMTPC_read_QUIT_reply(SmtpOutMsg *SendMsg)
-{
-	SMTP_DBG_READ();
 
-	CtdlLogPrintf(CTDL_INFO, "SMTP client[%ld]: delivery to <%s> @ <%s> (%s) succeeded\n",
-		      SendMsg->n, SendMsg->user, SendMsg->node, SendMsg->name);
-	return eTerminateConnection;
-}
 
-eNextState SMTPC_read_dummy(SmtpOutMsg *SendMsg)
-{
-	return eSendReply;
-}
 
-eNextState SMTPC_send_dummy(SmtpOutMsg *SendMsg)
-{
-	return eReadMessage;
-}
 
 
 /*****************************************************************************/
 /*                     SMTP CLIENT DISPATCHER                                */
 /*****************************************************************************/
-SMTPReadHandler ReadHandlers[eMaxSMTPC] = {
-	SMTPC_read_greeting,
-	SMTPC_read_EHLO_reply,
-	SMTPC_read_HELO_reply,
-	SMTPC_read_auth_reply,
-	SMTPC_read_FROM_reply,
-	SMTPC_read_RCPT_reply,
-	SMTPC_read_DATAcmd_reply,
-	SMTPC_read_dummy,
-	SMTPC_read_data_body_reply,
-	SMTPC_read_QUIT_reply
-};
-SMTPSendHandler SendHandlers[eMaxSMTPC] = {
-	SMTPC_send_dummy, /* we don't send a greeting, the server does... */
-	SMTPC_send_EHLO,
-	STMPC_send_HELO,
-	SMTPC_send_auth,
-	SMTPC_send_FROM,
-	SMTPC_send_RCPT,
-	SMTPC_send_DATAcmd,
-	SMTPC_send_data_body,
-	SMTPC_send_terminate_data_body,
-	SMTPC_send_QUIT
-};
 
-void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg)
+void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *Msg)
 {
-	CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
-	double Timeout;
+	double Timeout = 0.0;
+	AsyncIO *IO = &Msg->IO;
+
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+
 	switch (NextTCPState) {
+	case eSendFile:
 	case eSendReply:
 	case eSendMore:
-		Timeout = SMTP_C_SendTimeouts[pMsg->State];
-		if (pMsg->State == eDATABody) {
-			/* if we're sending a huge message, we need more time. */
-			Timeout += StrLength(pMsg->msgtext) / 1024;
+		Timeout = SMTP_C_SendTimeouts[Msg->State];
+		if (Msg->State == eDATABody) {
+			/* if we're sending a huge message,
+			 * we need more time.
+			 */
+			Timeout += StrLength(Msg->msgtext) / 512;
 		}
 		break;
 	case eReadMessage:
-		Timeout = SMTP_C_ReadTimeouts[pMsg->State];
-		if (pMsg->State == eDATATerminateBody) {
-			/* 
-			 * some mailservers take a nap before accepting the message
-			 * content inspection and such.
+		Timeout = SMTP_C_ReadTimeouts[Msg->State];
+		if (Msg->State == eDATATerminateBody) {
+			/*
+			 * some mailservers take a nap before accepting
+			 * the message content inspection and such.
 			 */
-			Timeout += StrLength(pMsg->msgtext) / 1024;
+			Timeout += StrLength(Msg->msgtext) / 512;
 		}
 		break;
+	case eSendDNSQuery:
+	case eReadDNSReply:
+	case eDBQuery:
+	case eReadFile:
+	case eReadMore:
+	case eReadPayload:
+	case eConnect:
 	case eTerminateConnection:
 	case eAbort:
 		return;
 	}
-	SetNextTimeout(&pMsg->IO, Timeout);
+	SetNextTimeout(&Msg->IO, Timeout);
 }
 eNextState SMTP_C_DispatchReadDone(AsyncIO *IO)
 {
-	CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
-	SmtpOutMsg *pMsg = IO->Data;
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+	SmtpOutMsg *Msg = IO->Data;
 	eNextState rc;
 
-	rc = ReadHandlers[pMsg->State](pMsg);
-	pMsg->State++;
-	SMTPSetTimeout(rc, pMsg);
+	rc = ReadHandlers[Msg->State](Msg);
+	if (rc != eAbort)
+	{
+		Msg->State++;
+		SMTPSetTimeout(rc, Msg);
+	}
 	return rc;
 }
 eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO)
 {
-	CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
-	SmtpOutMsg *pMsg = IO->Data;
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+	SmtpOutMsg *Msg = IO->Data;
 	eNextState rc;
 
-	rc = SendHandlers[pMsg->State](pMsg);
-	SMTPSetTimeout(rc, pMsg);
+	rc = SendHandlers[Msg->State](Msg);
+	SMTPSetTimeout(rc, Msg);
 	return rc;
 }
 
@@ -920,40 +758,91 @@ eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO)
 /*****************************************************************************/
 eNextState SMTP_C_Terminate(AsyncIO *IO)
 {
-	CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
-	SmtpOutMsg *pMsg = IO->Data;
-	FinalizeMessageSend(pMsg);
-	return 0;
+	SmtpOutMsg *Msg = IO->Data;
+
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+	return FinalizeMessageSend(Msg);
+}
+eNextState SMTP_C_TerminateDB(AsyncIO *IO)
+{
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+	return Terminate(IO);
 }
 eNextState SMTP_C_Timeout(AsyncIO *IO)
 {
-	CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
-	SmtpOutMsg *pMsg = IO->Data;
-	StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State]));
-	FinalizeMessageSend(pMsg);
-	return 0;
+	SmtpOutMsg *Msg = IO->Data;
+
+	Msg->MyQEntry->Status = 4;
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+	StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State]));
+	if (Msg->State > eRCPT)
+		return eAbort;
+	else
+		return FailOneAttempt(IO);
 }
 eNextState SMTP_C_ConnFail(AsyncIO *IO)
 {
-	CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
-	SmtpOutMsg *pMsg = IO->Data;
-	FinalizeMessageSend(pMsg);
-	return 0;
+	SmtpOutMsg *Msg = IO->Data;
+
+	Msg->MyQEntry->Status = 4;
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+	StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State]));
+	return FailOneAttempt(IO);
+}
+eNextState SMTP_C_DNSFail(AsyncIO *IO)
+{
+	SmtpOutMsg *Msg = IO->Data;
+	Msg->MyQEntry->Status = 4;
+	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+	return FailOneAttempt(IO);
+}
+eNextState SMTP_C_Shutdown(AsyncIO *IO)
+{
+	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."));
+	return FinalizeMessageSend(Msg);
 }
 
 
 /**
- * @brief lineread Handler; understands when to read more SMTP lines, and when this is a one-lined reply.
+ * @brief lineread Handler;
+ * understands when to read more SMTP lines, and when this is a one-lined reply.
  */
 eReadState SMTP_C_ReadServerStatus(AsyncIO *IO)
 {
-	eReadState Finished = eBufferNotEmpty; 
+	eReadState Finished = eBufferNotEmpty;
 
 	while (Finished == eBufferNotEmpty) {
 		Finished = StrBufChunkSipLine(IO->IOBuf, &IO->RecvBuf);
-		
+
 		switch (Finished) {
-		case eMustReadMore: /// read new from socket... 
+		case eMustReadMore: /// read new from socket...
 			return Finished;
 			break;
 		case eBufferNotEmpty: /* shouldn't happen... */
@@ -962,19 +851,25 @@ eReadState SMTP_C_ReadServerStatus(AsyncIO *IO)
 				continue;
 			if (ChrPtr(IO->IOBuf)[3] == '-')
 				Finished = eBufferNotEmpty;
-			else 
+			else
 				return Finished;
 			break;
 		case eReadFail: /// WHUT?
-			///todo: shut down! 
+			///todo: shut down!
 			break;
 		}
 	}
 	return Finished;
 }
 
-#endif
+void LogDebugEnableSMTPClient(const int n)
+{
+	SMTPClientDebugEnabled = n;
+}
+
 CTDL_MODULE_INIT(smtp_eventclient)
 {
+	if (!threading)
+		CtdlRegisterDebugFlagHook(HKEY("smtpeventclient"), LogDebugEnableSMTPClient, &SMTPClientDebugEnabled);
 	return "smtpeventclient";
 }