X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=c744bb6e4cb81fd3bf2d99a60834d6c21c04f435;hb=9e07e8e851dcb5758feacb349cbb94b15799d632;hp=a411ef7d1ecf2575ef0bface76afe53da8ca20cc;hpb=35db85f6ff87358e3448d71704bd2f86252762dd;p=citadel.git diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c index a411ef7d1..c744bb6e4 100644 --- a/citadel/modules/smtp/serv_smtpeventclient.c +++ b/citadel/modules/smtp/serv_smtpeventclient.c @@ -90,8 +90,28 @@ #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; + 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; @@ -135,12 +155,18 @@ eNextState FinalizeMessageSend_DB(AsyncIO *IO) const char *Status; SmtpOutMsg *Msg = IO->Data; - if (Msg->MyQEntry->Status == 2) + 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", @@ -154,9 +180,10 @@ eNextState FinalizeMessageSend_DB(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? */ @@ -177,7 +204,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, Msg->msgtext, Msg->pCurrRelay); if (Msg->nRemain > 0) { @@ -226,6 +253,7 @@ eNextState FailOneAttempt(AsyncIO *IO) { SmtpOutMsg *Msg = IO->Data; + SetSMTPState(IO, eSTMPfailOne); if (Msg->MyQEntry->Status == 2) return eAbort; @@ -234,10 +262,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 +346,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 +366,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 +385,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 +403,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 +413,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 +431,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 +548,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, @@ -578,8 +628,10 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem, 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, @@ -590,15 +642,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, @@ -607,14 +663,16 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem, } } else { + SetSMTPState(&Msg->IO, eSMTPFailTotal); /* No recipients? well fail then. */ 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); } } @@ -743,6 +801,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."));