X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=f6a4116492b4fb662543e3e8a3921be585f78fad;hb=f95c2fe7adf28661d9d0ac7dbab858b40de2c296;hp=a523f9347f8da87ec204caff45a783479d3c4d33;hpb=13e9fdfd75a549cf922077a94588a68a1e456dd9;p=citadel.git diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c index a523f9347..f6a411649 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. * @@ -90,7 +90,6 @@ #include "smtpqueue.h" #include "smtp_clienthandlers.h" -#ifdef EXPERIMENTAL_SMTP_EVENT_CLIENT const unsigned short DefaultMXPort = 25; void DeleteSmtpOutMsg(void *v) { @@ -99,6 +98,7 @@ void DeleteSmtpOutMsg(void *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... */ @@ -110,6 +110,7 @@ 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); @@ -124,41 +125,54 @@ eNextState get_one_mx_host_ip(AsyncIO *IO); ******************************************************************************/ void FinalizeMessageSend(SmtpOutMsg *Msg) { - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); - - if (DecreaseQReference(Msg->MyQItem)) - { - int nRemain; - StrBuf *MsgData; + int IDestructQueItem; + int nRemain; + StrBuf *MsgData; + AsyncIO *IO = &Msg->IO; + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); + + IDestructQueItem = DecreaseQReference(Msg->MyQItem); - nRemain = CountActiveQueueEntries(Msg->MyQItem); + nRemain = CountActiveQueueEntries(Msg->MyQItem); + if ((nRemain > 0) || IDestructQueItem) 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); - } + else + MsgData = NULL; - RemoveQItem(Msg->MyQItem); + /* + * 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); + + 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); + Msg->MyQItem->QueMsgID = + CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR); + EVS_syslog(LOG_DEBUG, "SMTPQ: %ld", Msg->MyQItem->QueMsgID); + CtdlFreeMessage(msg); } + else { + CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, + &Msg->MyQItem->MessageID, + 1, + ""); + FreeStrBuf(&MsgData); + } + if (IDestructQueItem) + RemoveQItem(Msg->MyQItem); RemoveContext(Msg->IO.CitContext); DeleteSmtpOutMsg(Msg); @@ -167,6 +181,10 @@ void FinalizeMessageSend(SmtpOutMsg *Msg) eNextState FailOneAttempt(AsyncIO *IO) { SmtpOutMsg *SendMsg = IO->Data; + + if (SendMsg->MyQEntry->Status == 2) + return eAbort; + /* * possible ways here: * - connection timeout @@ -212,12 +230,12 @@ void SetConnectStatus(AsyncIO *IO) if (SendMsg->mx_host == NULL) SendMsg->mx_host = ""; - CtdlLogPrintf(CTDL_DEBUG, - "SMTP client[%ld]: connecting to %s [%s]:%d ...\n", - SendMsg->n, - SendMsg->mx_host, - buf, - SendMsg->IO.ConnectMe->Port); + EVS_syslog(LOG_DEBUG, + "SMTP client[%ld]: connecting to %s [%s]:%d ...\n", + SendMsg->n, + SendMsg->mx_host, + buf, + SendMsg->IO.ConnectMe->Port); SendMsg->MyQEntry->Status = 5; StrBufPrintf(SendMsg->MyQEntry->StatusMessage, @@ -235,7 +253,7 @@ eNextState mx_connect_ip(AsyncIO *IO) { SmtpOutMsg *SendMsg = IO->Data; - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + 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"); */ @@ -298,14 +316,14 @@ eNextState get_one_mx_host_ip(AsyncIO *IO) InitC_ares_dns(IO); - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); - CtdlLogPrintf(CTDL_DEBUG, - "SMTP client[%ld]: looking up %s-Record %s : %d ...\n", - SendMsg->n, - (SendMsg->pCurrRelay->IPv6)? "aaaa": "a", - SendMsg->pCurrRelay->Host, - SendMsg->pCurrRelay->Port); + 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, @@ -334,7 +352,7 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO) QueryCbDone(IO); - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); pp = &SendMsg->Relay; while ((pp != NULL) && (*pp != NULL) && ((*pp)->Next != NULL)) pp = &(*pp)->Next; @@ -378,7 +396,7 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO) p->Host = SendMsg->node; *pp = p; - pp = &p; + pp = &p->Next; } SendMsg->CXFlags = SendMsg->CXFlags & F_DIRECT; } @@ -391,7 +409,7 @@ eNextState resolve_mx_records(AsyncIO *IO) { SmtpOutMsg * SendMsg = IO->Data; - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); /* start resolving MX records here. */ if (!QueueQuery(ns_t_mx, SendMsg->node, @@ -435,6 +453,7 @@ SmtpOutMsg *new_smtp_outmsg(OneQueItem *MyQItem, SendMsg->IO.Terminate = SMTP_C_Terminate; SendMsg->IO.LineReader = SMTP_C_ReadServerStatus; SendMsg->IO.ConnFail = SMTP_C_ConnFail; + SendMsg->IO.DNSFail = SMTP_C_DNSFail; SendMsg->IO.Timeout = SMTP_C_Timeout; SendMsg->IO.ShutdownAbort = SMTP_C_Shutdown; @@ -455,7 +474,7 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem, { SmtpOutMsg *SendMsg; - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); SendMsg = new_smtp_outmsg(MyQItem, MyQEntry, MsgCount); if (KeepMsgText) SendMsg->msgtext = MsgText; @@ -467,6 +486,9 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem, SubC->session_specific_data = (char*) SendMsg; SendMsg->IO.CitContext = SubC; + syslog(LOG_DEBUG, "SMTP Starting: [%ld] <%s> \n", + SendMsg->MyQItem->MessageID, + ChrPtr(SendMsg->MyQEntry->Recipient)); if (SendMsg->pCurrRelay == NULL) QueueEventContext(&SendMsg->IO, resolve_mx_records); @@ -505,10 +527,12 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem, void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg) { double Timeout = 0.0; + AsyncIO *IO = &pMsg->IO; - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); switch (NextTCPState) { + case eSendFile: case eSendReply: case eSendMore: Timeout = SMTP_C_SendTimeouts[pMsg->State]; @@ -529,6 +553,10 @@ void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg) break; case eSendDNSQuery: case eReadDNSReply: + case eDBQuery: + case eReadFile: + case eReadMore: + case eReadPayload: case eConnect: case eTerminateConnection: case eAbort: @@ -538,18 +566,21 @@ void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg) } eNextState SMTP_C_DispatchReadDone(AsyncIO *IO) { - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); SmtpOutMsg *pMsg = IO->Data; eNextState rc; rc = ReadHandlers[pMsg->State](pMsg); - pMsg->State++; - SMTPSetTimeout(rc, pMsg); + if (rc != eAbort) + { + pMsg->State++; + SMTPSetTimeout(rc, pMsg); + } return rc; } eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO) { - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); SmtpOutMsg *pMsg = IO->Data; eNextState rc; @@ -566,7 +597,7 @@ eNextState SMTP_C_Terminate(AsyncIO *IO) { SmtpOutMsg *pMsg = IO->Data; - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); FinalizeMessageSend(pMsg); return eAbort; } @@ -574,7 +605,7 @@ eNextState SMTP_C_Timeout(AsyncIO *IO) { SmtpOutMsg *pMsg = IO->Data; - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State])); return FailOneAttempt(IO); } @@ -582,13 +613,21 @@ eNextState SMTP_C_ConnFail(AsyncIO *IO) { SmtpOutMsg *pMsg = IO->Data; - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + 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__); StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State])); return FailOneAttempt(IO); } eNextState SMTP_C_Shutdown(AsyncIO *IO) { - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); SmtpOutMsg *pMsg = IO->Data; pMsg->MyQEntry->Status = 3; @@ -629,7 +668,6 @@ eReadState SMTP_C_ReadServerStatus(AsyncIO *IO) return Finished; } -#endif CTDL_MODULE_INIT(smtp_eventclient) { return "smtpeventclient";