X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=e4b79821f2acfa6fab0467c2f84689a92f36336d;hb=66f72c07b70ed9500c49e8ff3c3f895e5269d339;hp=2e1dcbbed148ecb9f6d98e773b594f67addef786;hpb=7e7b550e3d5de53fdf4b8c46833af5df9a159729;p=citadel.git diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c index 2e1dcbbed..e4b79821f 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,17 +90,21 @@ #include "smtpqueue.h" #include "smtp_clienthandlers.h" -#ifdef EXPERIMENTAL_SMTP_EVENT_CLIENT const unsigned short DefaultMXPort = 25; void DeleteSmtpOutMsg(void *v) { SmtpOutMsg *Msg = v; + /* these are kept in our own space and free'd below */ + Msg->IO.ConnectMe = NULL; + 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); } @@ -109,9 +113,13 @@ 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); +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,* @@ -120,136 +128,150 @@ eReadState SMTP_C_ReadServerStatus(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; + + 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); } + RemoveContext(Msg->IO.CitContext); + if (IDestructQueItem) + RemoveQItem(Msg->MyQItem); DeleteSmtpOutMsg(Msg); } eNextState FailOneAttempt(AsyncIO *IO) { - /* - * possible ways here: - * - connection timeout - * - - */ -} + SmtpOutMsg *SendMsg = IO->Data; + + if (SendMsg->MyQEntry->Status == 2) + return eAbort; + + /* + * possible ways here: + * - connection timeout + * - dns lookup failed + */ + StopClientWatchers(IO); -////TODO + if (SendMsg->pCurrRelay != NULL) + SendMsg->pCurrRelay = SendMsg->pCurrRelay->Next; + + if (SendMsg->pCurrRelay == NULL) { + EVS_syslog(LOG_DEBUG, "SMTP: %s Aborting\n", __FUNCTION__); + return eAbort; + } + if (SendMsg->pCurrRelay->IsIP) { + EVS_syslog(LOG_DEBUG, "SMTP: %s connecting IP\n", __FUNCTION__); + return mx_connect_ip(IO); + } + else { + EVS_syslog(LOG_DEBUG, + "SMTP: %s resolving next MX Record\n", + __FUNCTION__); + return get_one_mx_host_ip(IO); + } +} void SetConnectStatus(AsyncIO *IO) { - SmtpOutMsg *SendMsg = IO->Data; char buf[256]; void *src; buf[0] = '\0'; - if (IO->IP6) { - src = &IO->Addr.sin6_addr; + if (IO->ConnectMe->IPv6) { + src = &IO->ConnectMe->Addr.sin6_addr; } else { - struct sockaddr_in *addr = (struct sockaddr_in *)&IO->Addr; + struct sockaddr_in *addr; + addr = (struct sockaddr_in *)&IO->ConnectMe->Addr; src = &addr->sin_addr.s_addr; } - inet_ntop((IO->IP6)?AF_INET6:AF_INET, + inet_ntop((IO->ConnectMe->IPv6)?AF_INET6:AF_INET, src, - buf, sizeof(buf)); + buf, + sizeof(buf)); + 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.dport); - - SendMsg->MyQEntry->Status = 5; - StrBufPrintf(SendMsg->MyQEntry->StatusMessage, - "Timeout while connecting %s [%s]:%d ", + SendMsg->mx_host = ""; + + 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, + "Timeout while connecting %s [%s]:%d ", SendMsg->mx_host, buf, - SendMsg->IO.dport); + SendMsg->IO.ConnectMe->Port); + SendMsg->IO.NextState = eConnect; } /***************************************************************************** * So we connect our Relay IP here. * *****************************************************************************/ -eNextState mx_connect_relay_ip(AsyncIO *IO) +eNextState mx_connect_ip(AsyncIO *IO) { - SmtpOutMsg *SendMsg = IO->Data; - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); - - IO->IP6 = SendMsg->pCurrRelay->af == AF_INET6; - - if (SendMsg->pCurrRelay->Port != 0) - IO->dport = SendMsg->pCurrRelay->Port; + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); - memset(&IO->Addr, 0, sizeof(struct sockaddr_in6)); - if (IO->IP6) { - memcpy(&IO->Addr.sin6_addr.s6_addr, - &SendMsg->pCurrRelay->Addr, - sizeof(struct in6_addr)); - - IO->Addr.sin6_family = AF_INET6; - IO->Addr.sin6_port = htons(IO->dport); - } - else { - struct sockaddr_in *addr = (struct sockaddr_in*) &IO->Addr; - /* Bypass the ns lookup result like this: IO->Addr.sin_addr.s_addr = inet_addr("127.0.0.1"); */ - memcpy(&addr->sin_addr,///.s_addr, - &SendMsg->pCurrRelay->Addr, - sizeof(struct in_addr)); - - addr->sin_family = AF_INET; - addr->sin_port = htons(IO->dport); - } + IO->ConnectMe = SendMsg->pCurrRelay; SetConnectStatus(IO); - return InitEventIO(IO, SendMsg, - SMTP_C_ConnTimeout, - SMTP_C_ReadTimeouts[0], - 1); + return EvConnectSock(IO, + SMTP_C_ConnTimeout, + SMTP_C_ReadTimeouts[0], + 1); } eNextState get_one_mx_host_ip_done(AsyncIO *IO) @@ -260,92 +282,78 @@ eNextState get_one_mx_host_ip_done(AsyncIO *IO) QueryCbDone(IO); hostent = SendMsg->HostLookup.VParsedDNSReply; - if ((SendMsg->HostLookup.DNSStatus == ARES_SUCCESS) && + if ((SendMsg->HostLookup.DNSStatus == ARES_SUCCESS) && (hostent != NULL) ) { - - IO->IP6 = hostent->h_addrtype == AF_INET6; - ////IO->HEnt = hostent; - - memset(&IO->Addr, 0, sizeof(struct in6_addr)); - if (IO->IP6) { - memcpy(&IO->Addr.sin6_addr.s6_addr, + 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)); - - IO->Addr.sin6_family = hostent->h_addrtype; - IO->Addr.sin6_port = htons(IO->dport); + + SendMsg->pCurrRelay->Addr.sin6_family = + hostent->h_addrtype; + SendMsg->pCurrRelay->Addr.sin6_port = + htons(DefaultMXPort); } else { - struct sockaddr_in *addr = (struct sockaddr_in*) &IO->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], + struct sockaddr_in *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]); + */ + + addr = (struct sockaddr_in*) &SendMsg->pCurrRelay->Addr; + + memcpy(&addr->sin_addr.s_addr, + hostent->h_addr_list[0], sizeof(uint32_t)); - + addr->sin_family = hostent->h_addrtype; - addr->sin_port = htons(IO->dport); - + addr->sin_port = htons(DefaultMXPort); } - ////SendMsg->IO.HEnt = hostent; - SetConnectStatus(IO); - return InitEventIO(IO, - SendMsg, - SMTP_C_ConnTimeout, - SMTP_C_ReadTimeouts[0], - 1); + SendMsg->mx_host = SendMsg->pCurrRelay->Host; + return mx_connect_ip(IO); } - else // TODO: here we need to find out whether there are more mx'es, backup relay, and so on - return SMTP_C_Terminate(IO); + else + return FailOneAttempt(IO); } -/* - - if (SendMsg->pCurrRelay != NULL) { - SendMsg->mx_host = Hostname = SendMsg->pCurrRelay->Host; - if (SendMsg->pCurrRelay->Port != 0) - SendMsg->IO.dport = SendMsg->pCurrRelay->Port; - } - else -*/ eNextState get_one_mx_host_ip(AsyncIO *IO) { SmtpOutMsg * SendMsg = IO->Data; - const char *Hostname; - //char *endpart; - //char buf[SIZ]; - - /* + /* * 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); - if (SendMsg->mx_host != NULL) Hostname = SendMsg->mx_host; - else Hostname = SendMsg->node; - - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); - - CtdlLogPrintf(CTDL_DEBUG, - "SMTP client[%ld]: looking up %s : %d ...\n", - SendMsg->n, - Hostname, - SendMsg->IO.dport); -// TODO: ns_t_aaaa - if (!QueueQuery(ns_t_a, - Hostname, - &SendMsg->IO, - &SendMsg->HostLookup, + 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, + StrBufPrintf(SendMsg->MyQEntry->StatusMessage, "No MX hosts found for <%s>", SendMsg->node); + SendMsg->IO.NextState = eTerminateConnection; return IO->NextState; } + IO->NextState = eReadDNSReply; return IO->NextState; } @@ -360,19 +368,19 @@ 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; - if ((IO->DNSQuery->DNSStatus == ARES_SUCCESS) && - (IO->DNSQuery->VParsedDNSReply != NULL)) + 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->DNSQuery->VParsedDNSReply; + SendMsg->CurrMX + = SendMsg->AllMX + = IO->DNS.Query->VParsedDNSReply; while (SendMsg->CurrMX) { int i; for (i = 0; i < 2; i++) { @@ -381,17 +389,15 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO) p = (ParsedURL*) malloc(sizeof(ParsedURL)); memset(p, 0, sizeof(ParsedURL)); p->IsIP = 0; - p->Port = 25; //// TODO define. + p->Port = DefaultMXPort; p->IPv6 = i == 1; p->Host = SendMsg->CurrMX->host; - + *pp = p; - pp = &p; + pp = &p->Next; } SendMsg->CurrMX = SendMsg->CurrMX->next; } -// SendMsg->mx_host = SendMsg->CurrMX->host; -// SendMsg->CurrMX = SendMsg->CurrMX->next; SendMsg->CXFlags = SendMsg->CXFlags & F_HAVE_MX; } else { /* else fall back to the plain hostname */ @@ -402,17 +408,17 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO) p = (ParsedURL*) malloc(sizeof(ParsedURL)); memset(p, 0, sizeof(ParsedURL)); p->IsIP = 0; - p->Port = 25; //// TODO define. + p->Port = DefaultMXPort; p->IPv6 = i == 1; p->Host = SendMsg->node; - + *pp = p; - pp = &p; + pp = &p->Next; } - /// SendMsg->mx_host = SendMsg->node; SendMsg->CXFlags = SendMsg->CXFlags & F_DIRECT; } - (*pp)->Next = SendMsg->MyQItem->FallBackHost; + *pp = SendMsg->MyQItem->FallBackHost; + SendMsg->pCurrRelay = SendMsg->Relay; return get_one_mx_host_ip(IO); } @@ -420,20 +426,21 @@ 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, - &SendMsg->IO, - &SendMsg->MxLookup, + if (!QueueQuery(ns_t_mx, + SendMsg->node, + &SendMsg->IO, + &SendMsg->MxLookup, smtp_resolve_mx_record_done)) { SendMsg->MyQEntry->Status = 5; - StrBufPrintf(SendMsg->MyQEntry->StatusMessage, + StrBufPrintf(SendMsg->MyQEntry->StatusMessage, "No MX hosts found for <%s>", SendMsg->node); return IO->NextState; } - return eAbort; + SendMsg->IO.NextState = eReadDNSReply; + return IO->NextState; } @@ -442,8 +449,8 @@ eNextState resolve_mx_records(AsyncIO *IO) * so, we're going to start a SMTP delivery. lets get it on. * ******************************************************************************/ -SmtpOutMsg *new_smtp_outmsg(OneQueItem *MyQItem, - MailQEntry *MyQEntry, +SmtpOutMsg *new_smtp_outmsg(OneQueItem *MyQItem, + MailQEntry *MyQEntry, int MsgCount) { SmtpOutMsg * SendMsg; @@ -456,51 +463,59 @@ SmtpOutMsg *new_smtp_outmsg(OneQueItem *MyQItem, SendMsg->MyQItem = MyQItem; SendMsg->pCurrRelay = MyQItem->URL; - 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.Timeout = SMTP_C_Timeout; - SendMsg->IO.ShutdownAbort = SMTP_C_Shutdown; - - SendMsg->IO.SendBuf.Buf = NewStrBufPlain(NULL, 1024); - SendMsg->IO.RecvBuf.Buf = NewStrBufPlain(NULL, 1024); - SendMsg->IO.IOBuf = NewStrBuf(); - - SendMsg->IO.sock = (-1); - SendMsg->IO.NextState = eReadMessage; - SendMsg->IO.dport = DefaultMXPort; + InitIOStruct(&SendMsg->IO, + SendMsg, + eReadMessage, + SMTP_C_ReadServerStatus, + SMTP_C_DNSFail, + SMTP_C_DispatchWriteDone, + SMTP_C_DispatchReadDone, + SMTP_C_Terminate, + SMTP_C_ConnFail, + SMTP_C_Timeout, + SMTP_C_Shutdown); return SendMsg; } -void smtp_try_one_queue_entry(OneQueItem *MyQItem, - MailQEntry *MyQEntry, - StrBuf *MsgText, - int KeepMsgText, /* KeepMsgText allows us to use MsgText as ours. */ +void smtp_try_one_queue_entry(OneQueItem *MyQItem, + MailQEntry *MyQEntry, + StrBuf *MsgText, + /*KeepMsgText allows us to use MsgText as ours.*/ + int KeepMsgText, int MsgCount) { 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; - else SendMsg->msgtext = NewStrBufDup(MsgText); - + else SendMsg->msgtext = NewStrBufDup(MsgText); + if (smtp_resolve_recipients(SendMsg)) { + + safestrncpy( + ((CitContext *)SendMsg->IO.CitContext)->cs_host, + SendMsg->node, + sizeof(((CitContext *) + SendMsg->IO.CitContext)->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_relay_ip); + mx_connect_ip); } - else { /* uneducated admin has chosen to add DNS to the equation... */ + else { + /* uneducated admin has chosen to + add DNS to the equation... */ QueueEventContext(&SendMsg->IO, get_one_mx_host_ip); } @@ -508,10 +523,10 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem, } else { /* No recipients? well fail then. */ - if ((SendMsg==NULL) || + if ((SendMsg==NULL) || (SendMsg->MyQEntry == NULL)) { SendMsg->MyQEntry->Status = 5; - StrBufPlain(SendMsg->MyQEntry->StatusMessage, + StrBufPlain(SendMsg->MyQEntry->StatusMessage, HKEY("Invalid Recipient!")); } FinalizeMessageSend(SendMsg); @@ -529,27 +544,40 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem, void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg) { - CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__); - double Timeout; + 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. */ + /* 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. + /* + * 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; @@ -558,18 +586,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; @@ -586,7 +617,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; } @@ -594,7 +625,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); } @@ -602,34 +633,41 @@ 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) +{ + EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); + 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; - StrBufPlain(pMsg->MyQEntry->StatusMessage, HKEY("server shutdown during message submit.")); + StrBufPlain(pMsg->MyQEntry->StatusMessage, + HKEY("server shutdown during message submit.")); FinalizeMessageSend(pMsg); return eAbort; } /** - * @brief lineread Handler; understands when to read more SMTP lines, and when this is a one-lined reply. + * @brief lineread Handler; + * understands when to read more SMTP lines, and when this is a one-lined reply. */ eReadState SMTP_C_ReadServerStatus(AsyncIO *IO) { - eReadState Finished = eBufferNotEmpty; + eReadState Finished = eBufferNotEmpty; while (Finished == eBufferNotEmpty) { Finished = StrBufChunkSipLine(IO->IOBuf, &IO->RecvBuf); - + switch (Finished) { - case eMustReadMore: /// read new from socket... + case eMustReadMore: /// read new from socket... return Finished; break; case eBufferNotEmpty: /* shouldn't happen... */ @@ -638,18 +676,17 @@ eReadState SMTP_C_ReadServerStatus(AsyncIO *IO) continue; if (ChrPtr(IO->IOBuf)[3] == '-') Finished = eBufferNotEmpty; - else + else return Finished; break; case eReadFail: /// WHUT? - ///todo: shut down! + ///todo: shut down! break; } } return Finished; } -#endif CTDL_MODULE_INIT(smtp_eventclient) { return "smtpeventclient";