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

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index d13f5238e..af5d12d94 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -16,7 +16,7 @@
  * 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.
  *
@@ -88,718 +88,559 @@
 #include "smtp_util.h"
 #include "event_client.h"
 #include "smtpqueue.h"
+#include "smtp_clienthandlers.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 long SMTP_C_ConnTimeout = 60; /* wail 1 minute for connections... */
-const long SMTP_C_ReadTimeouts[eMaxSMTPC] = {
-	90, /* Greeting... */
-	30, /* EHLO */
-	30, /* HELO */
-	30, /* Auth */
-	30, /* From */
-	30, /* RCPT */
-	30, /* DATA */
-	90, /* DATABody */
-	900, /* end of body... */
-	30  /* QUIT */
-};
-/*
-const long SMTP_C_SendTimeouts[eMaxSMTPC] = {
-
-}; */
-const char *ReadErrors[eMaxSMTPC] = {
-	"Connection broken during SMTP conversation",
-	"Connection broken during SMTP EHLO",
-	"Connection broken during SMTP HELO",
-	"Connection broken during SMTP AUTH",
-	"Connection broken during SMTP MAIL FROM",
-	"Connection broken during SMTP RCPT",
-	"Connection broken during SMTP DATA",
-	"Connection broken during SMTP message transmit",
-	""/* 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;
-
-	char mx_user[1024];
-	char mx_pass[1024];
-	StrBuf *msgtext;
-	char *envelope_from;
-	char user[1024];
-	char node[1024];
-	char name[1024];
-	char mailfrom[1024];
-} SmtpOutMsg;
-
+const unsigned short DefaultMXPort = 25;
 void DeleteSmtpOutMsg(void *v)
 {
 	SmtpOutMsg *Msg = v;
 
 	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_Timeout(void *Data);
-eNextState SMTP_C_ConnFail(void *Data);
-eNextState SMTP_C_DispatchReadDone(void *Data);
-eNextState SMTP_C_DispatchWriteDone(void *Data);
-eNextState SMTP_C_Terminate(void *Data);
+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);
 eReadState SMTP_C_ReadServerStatus(AsyncIO *IO);
 
-typedef eNextState (*SMTPReadHandler)(SmtpOutMsg *Msg);
-typedef eNextState (*SMTPSendHandler)(SmtpOutMsg *Msg);
+eNextState mx_connect_ip(AsyncIO *IO);
+eNextState get_one_mx_host_ip(AsyncIO *IO);
 
+/******************************************************************************
+ * 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.                                 *
+ ******************************************************************************/
+void FinalizeMessageSend(SmtpOutMsg *Msg)
+{
+	int IDestructQueItem;
+	int nRemain;
+	StrBuf *MsgData;
+	AsyncIO *IO = &Msg->IO;
 
-#define SMTP_ERROR(WHICH_ERR, ERRSTR) do {\
-		SendMsg->MyQEntry->Status = WHICH_ERR; \
-		StrBufAppendBufPlain(SendMsg->MyQEntry->StatusMessage, HKEY(ERRSTR), 0); \
-		return eAbort; } \
-	while (0)
+	IDestructQueItem = DecreaseQReference(Msg->MyQItem);
 
-#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)
+	nRemain = CountActiveQueueEntries(Msg->MyQItem);
 
-#define SMTP_IS_STATE(WHICH_STATE) (ChrPtr(SendMsg->IO.IOBuf)[0] == WHICH_STATE)
+	if ((nRemain > 0) || IDestructQueItem)
+		MsgData = SerializeQueueItem(Msg->MyQItem);
+	else
+		MsgData = NULL;
 
-#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))
+	/*
+	 * Uncompleted delivery instructions remain, so delete the old
+	 * instructions and replace with the updated ones.
+	 */
+	EVS_syslog(LOG_DEBUG, "SMTPQD: %ld", Msg->MyQItem->QueMsgID);
+	CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
 
+	if (IDestructQueItem)
+		smtpq_do_bounce(Msg->MyQItem,Msg->msgtext);
 
-void FinalizeMessageSend(SmtpOutMsg *Msg)
-{
-	if (DecreaseQReference(Msg->MyQItem)) 
+	if (nRemain > 0)
 	{
-		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);
-			/* Generate 'bounce' messages */
-			smtp_do_bounce(msg->cm_fields['M'],
-				       Msg->msgtext); 
-
+		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);
+		Msg->MyQItem->QueMsgID =
 			CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
-			CtdlFreeMessage(msg);
-		}
-		else 
-			CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->MessageID, 1, "");
-
-		RemoveQItem(Msg->MyQItem);
+		EVS_syslog(LOG_DEBUG, "SMTPQ: %ld", Msg->MyQItem->QueMsgID);
+		CtdlFreeMessage(msg);
+	}
+	else {
+		CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM,
+				   &Msg->MyQItem->MessageID,
+				   1,
+				   "");
+		FreeStrBuf(&MsgData);
 	}
+	RemoveContext(Msg->IO.CitContext);
+	if (IDestructQueItem)
+		RemoveQItem(Msg->MyQItem);
 	DeleteSmtpOutMsg(Msg);
 }
 
-
-
-
-void get_one_mx_host_ip_done(void *Ctx, 
-			     int status,
-			     int timeouts,
-			     struct hostent *hostent)
+eNextState FailOneAttempt(AsyncIO *IO)
 {
-	AsyncIO *IO = Ctx;
 	SmtpOutMsg *SendMsg = IO->Data;
-	if ((status == ARES_SUCCESS) && (hostent != NULL) ) {
-		CtdlLogPrintf(CTDL_DEBUG, 
-			      "SMTP client[%ld]: connecting to %s [ip]: %d ...\n", 
-			      SendMsg->n, 
-			      SendMsg->mx_host, 
-			      SendMsg->IO.dport);
-
-		SendMsg->MyQEntry->Status = 5; 
-		StrBufPrintf(SendMsg->MyQEntry->StatusMessage, 
-			     "Timeout while connecting %s", 
-			     SendMsg->mx_host);
-
-		SendMsg->IO.HEnt = hostent;
-		InitEventIO(IO, SendMsg, 
-			    SMTP_C_DispatchReadDone, 
-			    SMTP_C_DispatchWriteDone, 
-			    SMTP_C_Terminate,
-			    SMTP_C_Timeout,
-			    SMTP_C_ConnFail,
-			    SMTP_C_ReadServerStatus,
-			    SMTP_C_ConnTimeout, 
-			    SMTP_C_ReadTimeouts[0],
-			    1);
 
-	}
-}
+	if (SendMsg->MyQEntry->Status == 2)
+		return eAbort;
 
-const unsigned short DefaultMXPort = 25;
-void get_one_mx_host_ip(SmtpOutMsg *SendMsg)
-{
-	//char *endpart;
-	//char buf[SIZ];
-
-	SendMsg->IO.dport = DefaultMXPort;
-
-
-/* TODO: Relay!
-	*SendMsg->mx_user =  '\0';
-	*SendMsg->mx_pass = '\0';
-	if (num_tokens(buf, '@') > 1) {
-		strcpy (SendMsg->mx_user, buf);
-		endpart = strrchr(SendMsg->mx_user, '@');
-		*endpart = '\0';
-		strcpy (SendMsg->mx_host, endpart + 1);
-		endpart = strrchr(SendMsg->mx_user, ':');
-		if (endpart != NULL) {
-			strcpy(SendMsg->mx_pass, endpart+1);
-			*endpart = '\0';
-		}
-
-	endpart = strrchr(SendMsg->mx_host, ':');
-	if (endpart != 0){
-		*endpart = '\0';
-		strcpy(SendMsg->mx_port, endpart + 1);
-	}		
-	}
-	else
-*/
-	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);
-
-	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);
-}
+	/* 
+	 * possible ways here: 
+	 * - connection timeout 
+	 * - dns lookup failed
+	 */
+	StopClientWatchers(IO);
 
+	if (SendMsg->pCurrRelay != NULL)
+		SendMsg->pCurrRelay = SendMsg->pCurrRelay->Next;
 
-eNextState smtp_resolve_mx_done(void *data)
-{
-	AsyncIO *IO = data;
-	SmtpOutMsg * SendMsg = IO->Data;
-
-	SendMsg->IO.SendBuf.Buf = NewStrBufPlain(NULL, 1024);
-	SendMsg->IO.RecvBuf.Buf = NewStrBufPlain(NULL, 1024);
-	SendMsg->IO.IOBuf = NewStrBuf();
-	SendMsg->IO.ErrMsg = SendMsg->MyQEntry->StatusMessage;
-
-	SendMsg->CurrMX = SendMsg->AllMX = IO->VParsedDNSReply;
-	//// TODO: should we remove the current ares context???
-	get_one_mx_host_ip(SendMsg);
-	return 0;
-}
-
-
-int resolve_mx_records(void *Ctx)
-{
-	SmtpOutMsg * SendMsg = Ctx;
-
-	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!
+	if (SendMsg->pCurrRelay == NULL) {
+		EVS_syslog(LOG_DEBUG, "SMTP: %s Aborting\n", __FUNCTION__);
+		return eAbort;
 	}
-	return 0;
-}
-
-
-int smtp_resolve_recipients(SmtpOutMsg *SendMsg)
-{
-	const char *ptr;
-	char buf[1024];
-	int scan_done;
-	int lp, rp;
-	int i;
-
-	if ((SendMsg==NULL) || 
-	    (SendMsg->MyQEntry == NULL) || 
-	    (StrLength(SendMsg->MyQEntry->Recipient) == 0)) {
-		return 0;
+	if (SendMsg->pCurrRelay->IsIP) {
+		EVS_syslog(LOG_DEBUG, "SMTP: %s connecting IP\n", __FUNCTION__);
+		return mx_connect_ip(IO);
 	}
-
-	/* 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;
+	else {
+		EVS_syslog(LOG_DEBUG, "SMTP: %s resolving next MX Record\n", __FUNCTION__);
+		return get_one_mx_host_ip(IO);
 	}
-
-	return 1;
 }
 
 
-
-void smtp_try(OneQueItem *MyQItem, 
-	      MailQEntry *MyQEntry, 
-	      StrBuf *MsgText, 
-	      int KeepMsgText,  /* KeepMsgText allows us to use MsgText as ours. */
-	      int MsgCount)
+void SetConnectStatus(AsyncIO *IO)
 {
-	SmtpOutMsg * SendMsg;
+	
+	SmtpOutMsg *SendMsg = IO->Data;
+	char buf[256];
+	void *src;
 
-	SendMsg = (SmtpOutMsg *) malloc(sizeof(SmtpOutMsg));
-	memset(SendMsg, 0, sizeof(SmtpOutMsg));
-	SendMsg->IO.sock = (-1);
-	SendMsg->n = MsgCount++;
-	SendMsg->MyQEntry = MyQEntry;
-	SendMsg->MyQItem = MyQItem;
-	SendMsg->IO.Data = SendMsg;
-	if (KeepMsgText)
-		SendMsg->msgtext = MsgText;
-	else 
-		SendMsg->msgtext = NewStrBufDup(MsgText);
+	buf[0] = '\0';
 
-	if (smtp_resolve_recipients(SendMsg)) {
-		QueueEventContext(SendMsg, 
-				  &SendMsg->IO,
-				  resolve_mx_records);
+	if (IO->ConnectMe->IPv6) {
+		src = &IO->ConnectMe->Addr.sin6_addr;
 	}
 	else {
-		if ((SendMsg==NULL) || 
-		    (SendMsg->MyQEntry == NULL)) {
-			SendMsg->MyQEntry->Status = 5;
-			StrBufPlain(SendMsg->MyQEntry->StatusMessage, 
-				    HKEY("Invalid Recipient!"));
-		}
-		FinalizeMessageSend(SendMsg);
-	}
-}
-
+		struct sockaddr_in *addr = (struct sockaddr_in *)&IO->ConnectMe->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);
+		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 */
 
-	/* Do a EHLO command.  If it fails, try the HELO command. */
-	StrBufPrintf(SendMsg->IO.SendBuf.Buf,
-		     "EHLO %s\r\n", config.c_fqdn);
+	inet_ntop((IO->ConnectMe->IPv6)?AF_INET6:AF_INET,
+		  src,
+		  buf, 
+		  sizeof(buf));
 
-	SMTP_DBG_SEND();
-	return eReadMessage;
-}
+	if (SendMsg->mx_host == NULL)
+		SendMsg->mx_host = "<no MX-Record>";
 
-eNextState SMTPC_read_EHLO_reply(SmtpOutMsg *SendMsg)
-{
-	SMTP_DBG_READ();
+	EVS_syslog(LOG_DEBUG,
+		  "SMTP client[%ld]: connecting to %s [%s]:%d ...\n", 
+		  SendMsg->n, 
+		  SendMsg->mx_host, 
+		  buf,
+		  SendMsg->IO.ConnectMe->Port);
 
-	if (SMTP_IS_STATE('2')) {
-		SendMsg->State ++;
-		if (IsEmptyStr(SendMsg->mx_user))
-			SendMsg->State ++; /* Skip auth... */
-	}
-	/* else we fall back to 'helo' */
-	return eSendReply;
+	SendMsg->MyQEntry->Status = 5; 
+	StrBufPrintf(SendMsg->MyQEntry->StatusMessage, 
+		     "Timeout while connecting %s [%s]:%d ", 
+		     SendMsg->mx_host,
+		     buf,
+		     SendMsg->IO.ConnectMe->Port);
+	SendMsg->IO.NextState = eConnect;
 }
 
-eNextState STMPC_send_HELO(SmtpOutMsg *SendMsg)
+/*****************************************************************************
+ * So we connect our Relay IP here.                                          *
+ *****************************************************************************/
+eNextState mx_connect_ip(AsyncIO *IO)
 {
-	StrBufPrintf(SendMsg->IO.SendBuf.Buf,
-		     "HELO %s\r\n", config.c_fqdn);
-
-	SMTP_DBG_SEND();
-	return eReadMessage;
-}
+	SmtpOutMsg *SendMsg = IO->Data;
 
-eNextState SMTPC_read_HELO_reply(SmtpOutMsg *SendMsg)
-{
-	SMTP_DBG_READ();
+	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	
+	IO->ConnectMe = SendMsg->pCurrRelay;
+	/*  Bypass the ns lookup result like this: IO->Addr.sin_addr.s_addr = inet_addr("127.0.0.1"); */
 
-	if (!SMTP_IS_STATE('2')) {
-		if (SMTP_IS_STATE('4'))
-			SMTP_VERROR(4);
-		else 
-			SMTP_VERROR(5);
-	}
-	if (!IsEmptyStr(SendMsg->mx_user))
-		SendMsg->State ++; /* Skip auth... */
-	return eSendReply;
-}
+	SetConnectStatus(IO);
 
-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->mx_user, '\0', 
-		SendMsg->mx_user, '\0', 
-		SendMsg->mx_pass);
-	CtdlEncodeBase64(encoded, buf, 
-			 strlen(SendMsg->mx_user) + 
-			 strlen(SendMsg->mx_user) + 
-			 strlen(SendMsg->mx_pass) + 2, 0);
-	StrBufPrintf(SendMsg->IO.SendBuf.Buf,
-		     "AUTH PLAIN %s\r\n", encoded);
-	
-	SMTP_DBG_SEND();
-	return eReadMessage;
+	return EvConnectSock(IO, SendMsg, 
+			     SMTP_C_ConnTimeout, 
+			     SMTP_C_ReadTimeouts[0],
+			     1);
 }
 
-eNextState SMTPC_read_auth_reply(SmtpOutMsg *SendMsg)
+eNextState get_one_mx_host_ip_done(AsyncIO *IO)
 {
-	/* 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);
+	SmtpOutMsg *SendMsg = IO->Data;
+	struct hostent *hostent;
+
+	QueryCbDone(IO);
+
+	hostent = SendMsg->HostLookup.VParsedDNSReply;
+	if ((SendMsg->HostLookup.DNSStatus == ARES_SUCCESS) && 
+	    (hostent != NULL) ) {
+		memset(&SendMsg->pCurrRelay->Addr, 0, sizeof(struct in6_addr));
+		if (SendMsg->pCurrRelay->IPv6) {
+			memcpy(&SendMsg->pCurrRelay->Addr.sin6_addr.s6_addr, 
+			       &hostent->h_addr_list[0],
+			       sizeof(struct in6_addr));
+			
+			SendMsg->pCurrRelay->Addr.sin6_family = hostent->h_addrtype;
+			SendMsg->pCurrRelay->Addr.sin6_port   = htons(DefaultMXPort);
+		}
+		else {
+			struct sockaddr_in *addr = (struct sockaddr_in*) &SendMsg->pCurrRelay->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]);
+			memcpy(&addr->sin_addr.s_addr, 
+			       hostent->h_addr_list[0], 
+			       sizeof(uint32_t));
+			
+			addr->sin_family = hostent->h_addrtype;
+			addr->sin_port   = htons(DefaultMXPort);
+			
+		}
+		SendMsg->mx_host = SendMsg->pCurrRelay->Host;
+		return mx_connect_ip(IO);
 	}
-	return eSendReply;
-}
-
-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);
-
-	SMTP_DBG_SEND();
-	return eReadMessage;
+	else // TODO: here we need to find out whether there are more mx'es, backup relay, and so on
+		return FailOneAttempt(IO);
 }
 
-eNextState SMTPC_read_FROM_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 * SendMsg = 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
+	 */ 
+
+	InitC_ares_dns(IO);
+
+	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+
+	EVS_syslog(LOG_DEBUG, 
+		  "SMTP client[%ld]: looking up %s-Record %s : %d ...\n", 
+		  SendMsg->n, 
+		  (SendMsg->pCurrRelay->IPv6)? "aaaa": "a",
+		  SendMsg->pCurrRelay->Host, 
+		  SendMsg->pCurrRelay->Port);
+
+	if (!QueueQuery((SendMsg->pCurrRelay->IPv6)? ns_t_aaaa : ns_t_a, 
+			SendMsg->pCurrRelay->Host, 
+			&SendMsg->IO, 
+			&SendMsg->HostLookup, 
+			get_one_mx_host_ip_done))
+	{
+		SendMsg->MyQEntry->Status = 5;
+		StrBufPrintf(SendMsg->MyQEntry->StatusMessage, 
+			     "No MX hosts found for <%s>", SendMsg->node);
+		SendMsg->IO.NextState = eTerminateConnection;
+		return IO->NextState;
 	}
-	return eSendReply;
+	IO->NextState = eReadDNSReply;
+	return IO->NextState;
 }
 
 
-eNextState SMTPC_send_RCPT(SmtpOutMsg *SendMsg)
+/*****************************************************************************
+ * here we try to find out about the MX records for our recipients.          *
+ *****************************************************************************/
+eNextState smtp_resolve_mx_record_done(AsyncIO *IO)
 {
-	/* 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)
-{
-	SMTP_DBG_READ();
+	SmtpOutMsg * SendMsg = IO->Data;
+	ParsedURL **pp;
 
-	if (!SMTP_IS_STATE('2')) {
-		if (SMTP_IS_STATE('4')) 
-			SMTP_VERROR(4);
-		else 
-			SMTP_VERROR(5);
-	}
-	return eSendReply;
-}
+	QueryCbDone(IO);
 
-eNextState SMTPC_send_DATAcmd(SmtpOutMsg *SendMsg)
-{
-	/* RCPT succeeded, now try the DATA command */
-	StrBufPlain(SendMsg->IO.SendBuf.Buf,
-		    HKEY("DATA\r\n"));
+	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	pp = &SendMsg->Relay;
+	while ((pp != NULL) && (*pp != NULL) && ((*pp)->Next != NULL))
+		pp = &(*pp)->Next;
 
-	SMTP_DBG_SEND();
-	return eReadMessage;
+	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->DNS.Query->VParsedDNSReply;
+		while (SendMsg->CurrMX) {
+			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 = SendMsg->CurrMX->host;
+				
+				*pp = p;
+				pp = &p->Next;
+			}
+			SendMsg->CurrMX    = SendMsg->CurrMX->next;
+		}
+		SendMsg->CXFlags   = SendMsg->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 = SendMsg->node;
+				
+			*pp = p;
+			pp = &p->Next;
+		}
+		SendMsg->CXFlags   = SendMsg->CXFlags & F_DIRECT;
+	}
+	*pp = SendMsg->MyQItem->FallBackHost;
+	SendMsg->pCurrRelay = SendMsg->Relay;
+	return get_one_mx_host_ip(IO);
 }
 
-eNextState SMTPC_read_DATAcmd_reply(SmtpOutMsg *SendMsg)
+eNextState resolve_mx_records(AsyncIO *IO)
 {
-	SMTP_DBG_READ();
+	SmtpOutMsg * SendMsg = IO->Data;
 
-	if (!SMTP_IS_STATE('3')) {
-		if (SMTP_IS_STATE('4')) 
-			SMTP_VERROR(3);
-		else 
-			SMTP_VERROR(5);
+	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	/* start resolving MX records here. */
+	if (!QueueQuery(ns_t_mx, 
+			SendMsg->node, 
+			&SendMsg->IO, 
+			&SendMsg->MxLookup, 
+			smtp_resolve_mx_record_done))
+	{
+		SendMsg->MyQEntry->Status = 5;
+		StrBufPrintf(SendMsg->MyQEntry->StatusMessage, 
+			     "No MX hosts found for <%s>", SendMsg->node);
+		return IO->NextState;
 	}
-	return eSendReply;
+	SendMsg->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;
-	//// TODO timeout like that: (SendMsg->msg_size / 128) + 50);
-	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 * SendMsg;
 
-	Buf = SendMsg->IO.SendBuf.Buf;
-	SendMsg->IO.SendBuf.Buf = SendMsg->msgtext;
-	SendMsg->msgtext = Buf;
+	SendMsg = (SmtpOutMsg *) malloc(sizeof(SmtpOutMsg));
+	memset(SendMsg, 0, sizeof(SmtpOutMsg));
 
-	StrBufPlain(SendMsg->IO.SendBuf.Buf,
-		    HKEY(".\r\n"));
+	SendMsg->n                = MsgCount;
+	SendMsg->MyQEntry         = MyQEntry;
+	SendMsg->MyQItem          = MyQItem;
+	SendMsg->pCurrRelay       = MyQItem->URL;
 
-	return eReadMessage;
+	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.DNS.Fail      = SMTP_C_DNSFail;
+	SendMsg->IO.Timeout       = SMTP_C_Timeout;
+	SendMsg->IO.ShutdownAbort = SMTP_C_Shutdown;
 
-eNextState SMTPC_read_data_body_reply(SmtpOutMsg *SendMsg)
-{
-	SMTP_DBG_READ();
+	SendMsg->IO.SendBuf.Buf   = NewStrBufPlain(NULL, 1024);
+	SendMsg->IO.RecvBuf.Buf   = NewStrBufPlain(NULL, 1024);
+	SendMsg->IO.IOBuf         = NewStrBuf();
 
-	if (!SMTP_IS_STATE('2')) {
-		if (SMTP_IS_STATE('4'))
-			SMTP_VERROR(4);
-		else 
-			SMTP_VERROR(5);
-	}
+	SendMsg->IO.NextState     = eReadMessage;
 
-	/* 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;
+	return SendMsg;
 }
 
-eNextState SMTPC_send_QUIT(SmtpOutMsg *SendMsg)
+void smtp_try_one_queue_entry(OneQueItem *MyQItem, 
+			      MailQEntry *MyQEntry, 
+			      StrBuf *MsgText, 
+			      int KeepMsgText,  /* KeepMsgText allows us to use MsgText as ours. */
+			      int MsgCount)
 {
-	StrBufPlain(SendMsg->IO.SendBuf.Buf,
-		    HKEY("QUIT\r\n"));
+	AsyncIO *IO;
+	SmtpOutMsg *SendMsg;
+
+	syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
 
-	SMTP_DBG_SEND();
-	return eReadMessage;
+	SendMsg = new_smtp_outmsg(MyQItem, MyQEntry, MsgCount);
+	IO = &SendMsg->IO;
+	if (KeepMsgText) SendMsg->msgtext = MsgText;
+	else 		 SendMsg->msgtext = NewStrBufDup(MsgText);
+	
+	if (smtp_resolve_recipients(SendMsg)) {
+		CitContext *SubC;
+		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);
+		else { /* oh... via relay host */
+			if (SendMsg->pCurrRelay->IsIP) {
+				QueueEventContext(&SendMsg->IO,
+						  mx_connect_ip);
+			}
+			else { /* uneducated admin has chosen to add DNS to the equation... */
+				QueueEventContext(&SendMsg->IO,
+						  get_one_mx_host_ip);
+			}
+		}
+	}
+	else {
+		/* No recipients? well fail then. */
+		if ((SendMsg==NULL) || 
+		    (SendMsg->MyQEntry == NULL)) {
+			SendMsg->MyQEntry->Status = 5;
+			StrBufPlain(SendMsg->MyQEntry->StatusMessage, 
+				    HKEY("Invalid Recipient!"));
+		}
+		FinalizeMessageSend(SendMsg);
+	}
 }
 
-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
-};
-eNextState SMTP_C_DispatchReadDone(void *Data)
+
+void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg)
+{
+	double Timeout = 0.0;
+	AsyncIO *IO = &pMsg->IO;
+
+	EVS_syslog(LOG_DEBUG, "SMTP: %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;
+		}
+		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 += StrLength(pMsg->msgtext) / 1024;
+		}
+		break;
+	case eSendDNSQuery:
+	case eReadDNSReply:
+	case eDBQuery:
+	case eReadFile:
+	case eReadMore:
+	case eReadPayload:
+	case eConnect:
+	case eTerminateConnection:
+	case eAbort:
+		return;
+	}
+	SetNextTimeout(&pMsg->IO, Timeout);
+}
+eNextState SMTP_C_DispatchReadDone(AsyncIO *IO)
 {
-	SmtpOutMsg *pMsg = Data;
-	eNextState rc = ReadHandlers[pMsg->State](pMsg);
-	pMsg->State++;
+	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	SmtpOutMsg *pMsg = IO->Data;
+	eNextState rc;
+
+	rc = ReadHandlers[pMsg->State](pMsg);
+	if (rc != eAbort)
+	{
+		pMsg->State++;
+		SMTPSetTimeout(rc, pMsg);
+	}
 	return rc;
 }
-eNextState SMTP_C_DispatchWriteDone(void *Data)
+eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO)
 {
-	SmtpOutMsg *pMsg = Data;
-	return SendHandlers[pMsg->State](pMsg);	
+	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	SmtpOutMsg *pMsg = IO->Data;
+	eNextState rc;
+
+	rc = SendHandlers[pMsg->State](pMsg);
+	SMTPSetTimeout(rc, pMsg);
+	return rc;
 }
 
 
 /*****************************************************************************/
 /*                     SMTP CLIENT ERROR CATCHERS                            */
 /*****************************************************************************/
-eNextState SMTP_C_Terminate(void *Data)
+eNextState SMTP_C_Terminate(AsyncIO *IO)
 {
-	AsyncIO *IO = Data;
 	SmtpOutMsg *pMsg = IO->Data;
+
+	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
 	FinalizeMessageSend(pMsg);
-	return 0;
+	return eAbort;
 }
-eNextState SMTP_C_Timeout(void *Data)
+eNextState SMTP_C_Timeout(AsyncIO *IO)
 {
-	AsyncIO *IO = Data;
 	SmtpOutMsg *pMsg = IO->Data;
-	FinalizeMessageSend(pMsg);
-	return 0;
+
+	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State]));
+	return FailOneAttempt(IO);
+}
+eNextState SMTP_C_ConnFail(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_DNSFail(AsyncIO *IO)
+{
+	SmtpOutMsg *pMsg = IO->Data;
+
+	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
+	return FailOneAttempt(IO);
 }
-eNextState SMTP_C_ConnFail(void *Data)
+eNextState SMTP_C_Shutdown(AsyncIO *IO)
 {
-	AsyncIO *IO = Data;
+	EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
 	SmtpOutMsg *pMsg = IO->Data;
+
+	pMsg->MyQEntry->Status = 3;
+	StrBufPlain(pMsg->MyQEntry->StatusMessage, HKEY("server shutdown during message submit."));
 	FinalizeMessageSend(pMsg);
-	return 0;
+	return eAbort;
 }
 
 
@@ -834,8 +675,6 @@ eReadState SMTP_C_ReadServerStatus(AsyncIO *IO)
 	return Finished;
 }
 
-
-#endif
 CTDL_MODULE_INIT(smtp_eventclient)
 {
 	return "smtpeventclient";