X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=fbcf67c2ced45a0c8c56f8ed27efe74831800b8c;hb=18f747e331fdcb3619105c03fbac77cdb1bf9cfc;hp=dbe2c297db94d940f03d74078ac3ef5cd0b97100;hpb=eee9a1429dd032114946aad9e70fd8d84afbe918;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index dbe2c297d..fbcf67c2c 100644
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -91,12 +91,11 @@
 #include "smtp_clienthandlers.h"
 
 int SMTPClientDebugEnabled = 0;
-const unsigned short DefaultMXPort = 25;
 void DeleteSmtpOutMsg(void *v)
 {
 	SmtpOutMsg *Msg = v;
 	AsyncIO *IO = &Msg->IO;
-	EVS_syslog(LOG_DEBUG, "%s Exit\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;
@@ -123,11 +122,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)         *
@@ -135,7 +129,7 @@ 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;
@@ -159,9 +153,10 @@ inline void FinalizeMessageSend_1(AsyncIO *IO)
 
 	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? */
@@ -172,15 +167,6 @@ 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
@@ -188,33 +174,10 @@ inline void FinalizeMessageSend_DB_1(AsyncIO *IO)
 	 */
 	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)
 	{
@@ -238,39 +201,26 @@ 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 QueueDBOperation(&Msg->IO, FinalizeMessageSend_DB);
+}
 
 eNextState FailOneAttempt(AsyncIO *IO)
 {
@@ -284,10 +234,17 @@ eNextState FailOneAttempt(AsyncIO *IO)
 	 * - connection timeout
 	 * - dns lookup failed
 	 */
-	StopClientWatchers(IO);
+	StopClientWatchers(IO, 1);
 
 	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, "%s Aborting\n", __FUNCTION__);
@@ -338,7 +295,7 @@ void SetConnectStatus(AsyncIO *IO)
 		  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,
@@ -372,6 +329,8 @@ 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__,
@@ -389,7 +348,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;
@@ -407,7 +366,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) {
@@ -580,6 +539,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;
@@ -617,11 +578,19 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
 	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 (((!MyQItem->HaveRelay ||
+	      (MyQItem->URL != NULL)) &&
+	     smtp_resolve_recipients(Msg)))
+	{
 		safestrncpy(
 			((CitContext *)Msg->IO.CitContext)->cs_host,
 			Msg->node,
@@ -650,17 +619,14 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem,
 	}
 	else {
 		/* 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);
 	}
 }
 
@@ -754,7 +720,7 @@ eNextState SMTP_C_Terminate(AsyncIO *IO)
 eNextState SMTP_C_TerminateDB(AsyncIO *IO)
 {
 	EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
-	return FinalizeMessageSend_DB(IO);
+	return Terminate(IO);
 }
 eNextState SMTP_C_Timeout(AsyncIO *IO)
 {
@@ -789,6 +755,28 @@ 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."));