X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=dd4e3e2662b08a05a10784a4e36ee4a26dda378f;hb=63dc1de06b047b4be691541935e98845457c4c04;hp=4b6dea3954c39c48cb681eb066e02f442754d8bd;hpb=82fcf5721fdbf10ac860bd551409ae7b8a4aed0c;p=citadel.git diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c index 4b6dea395..dd4e3e266 100644 --- a/citadel/modules/smtp/serv_smtpeventclient.c +++ b/citadel/modules/smtp/serv_smtpeventclient.c @@ -90,13 +90,34 @@ #include "smtpqueue.h" #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")} +}; + +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; -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; @@ -134,13 +155,26 @@ eNextState FinalizeMessageSend_DB(AsyncIO *IO) { const char *Status; SmtpOutMsg *Msg = IO->Data; - - if (Msg->MyQEntry->Status == 2) + 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) + } + else if (Msg->MyQEntry->Status == 5) { + SetSMTPState(IO, eSMTPFailTotal); Status = "Delivery failed permanently; giving up."; - else + } + else { + 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", @@ -149,14 +183,15 @@ eNextState FinalizeMessageSend_DB(AsyncIO *IO) 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? */ @@ -177,7 +212,7 @@ eNextState FinalizeMessageSend_DB(AsyncIO *IO) Msg->MyQItem->QueMsgID = -1; if (Msg->IDestructQueItem) - smtpq_do_bounce(Msg->MyQItem, Msg->msgtext); + smtpq_do_bounce(Msg->MyQItem, StatusMessage, Msg->msgtext, Msg->pCurrRelay); if (Msg->nRemain > 0) { @@ -226,6 +261,7 @@ eNextState FailOneAttempt(AsyncIO *IO) { SmtpOutMsg *Msg = IO->Data; + SetSMTPState(IO, eSTMPfailOne); if (Msg->MyQEntry->Status == 2) return eAbort; @@ -234,10 +270,25 @@ 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, "%s Aborting\n", __FUNCTION__); @@ -303,6 +354,7 @@ void SetConnectStatus(AsyncIO *IO) eNextState mx_connect_ip(AsyncIO *IO) { SmtpOutMsg *Msg = IO->Data; + SetSMTPState(IO, eSTMPconnecting); EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__); @@ -322,6 +374,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__, @@ -339,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; @@ -357,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) { @@ -367,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; @@ -384,6 +439,7 @@ 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, "%s\n", __FUNCTION__); @@ -500,6 +556,8 @@ eNextState resolve_mx_records(AsyncIO *IO) { SmtpOutMsg * Msg = IO->Data; + SetSMTPState(IO, eSTMPmxlookup); + EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__); /* start resolving MX records here. */ if (!QueueQuery(ns_t_mx, @@ -530,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; @@ -567,11 +627,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 (smtp_resolve_recipients(Msg) && + (!MyQItem->HaveRelay || + (MyQItem->URL != NULL))) + { safestrncpy( ((CitContext *)Msg->IO.CitContext)->cs_host, Msg->node, @@ -582,15 +650,19 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem, Msg->MyQItem->MessageID, ChrPtr(Msg->MyQEntry->Recipient), ((CitContext*)Msg->IO.CitContext)->cs_pid); - if (Msg->pCurrRelay == NULL) + 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, @@ -599,15 +671,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_DB(&Msg->IO); - DeleteSmtpOutMsg(&Msg->IO); + DeleteSmtpOutMsg(Msg); } } @@ -709,7 +782,9 @@ eNextState SMTP_C_Timeout(AsyncIO *IO) Msg->MyQEntry->Status = 4; EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__); - StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State])); + StrBufPrintf(IO->ErrMsg, "Timeout: %s while talking to %s", + ReadErrors[Msg->State].Key, + Msg->mx_host); if (Msg->State > eRCPT) return eAbort; else @@ -721,7 +796,10 @@ eNextState SMTP_C_ConnFail(AsyncIO *IO) Msg->MyQEntry->Status = 4; EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__); - StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State])); + 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) @@ -736,6 +814,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."));