X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpeventclient.c;h=e4b79821f2acfa6fab0467c2f84689a92f36336d;hb=66f72c07b70ed9500c49e8ff3c3f895e5269d339;hp=af5d12d9467328f4ac9f2bb51fb32b07efcbd2a0;hpb=cf7cb2463d47a4a9ed36c8d1c13f188418389437;p=citadel.git diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c index af5d12d94..e4b79821f 100644 --- a/citadel/modules/smtp/serv_smtpeventclient.c +++ b/citadel/modules/smtp/serv_smtpeventclient.c @@ -95,6 +95,9 @@ 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); @@ -183,9 +186,9 @@ eNextState FailOneAttempt(AsyncIO *IO) if (SendMsg->MyQEntry->Status == 2) return eAbort; - /* - * possible ways here: - * - connection timeout + /* + * possible ways here: + * - connection timeout * - dns lookup failed */ StopClientWatchers(IO); @@ -202,7 +205,9 @@ eNextState FailOneAttempt(AsyncIO *IO) return mx_connect_ip(IO); } else { - EVS_syslog(LOG_DEBUG, "SMTP: %s resolving next MX Record\n", __FUNCTION__); + EVS_syslog(LOG_DEBUG, + "SMTP: %s resolving next MX Record\n", + __FUNCTION__); return get_one_mx_host_ip(IO); } } @@ -210,7 +215,6 @@ eNextState FailOneAttempt(AsyncIO *IO) void SetConnectStatus(AsyncIO *IO) { - SmtpOutMsg *SendMsg = IO->Data; char buf[256]; void *src; @@ -221,29 +225,30 @@ void SetConnectStatus(AsyncIO *IO) src = &IO->ConnectMe->Addr.sin6_addr; } else { - struct sockaddr_in *addr = (struct sockaddr_in *)&IO->ConnectMe->Addr; + struct sockaddr_in *addr; + addr = (struct sockaddr_in *)&IO->ConnectMe->Addr; src = &addr->sin_addr.s_addr; } inet_ntop((IO->ConnectMe->IPv6)?AF_INET6:AF_INET, src, - buf, + buf, sizeof(buf)); if (SendMsg->mx_host == NULL) SendMsg->mx_host = ""; EVS_syslog(LOG_DEBUG, - "SMTP client[%ld]: connecting to %s [%s]:%d ...\n", - SendMsg->n, - SendMsg->mx_host, + "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->MyQEntry->Status = 5; + StrBufPrintf(SendMsg->MyQEntry->StatusMessage, + "Timeout while connecting %s [%s]:%d ", SendMsg->mx_host, buf, SendMsg->IO.ConnectMe->Port); @@ -258,14 +263,13 @@ eNextState mx_connect_ip(AsyncIO *IO) SmtpOutMsg *SendMsg = IO->Data; 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"); */ SetConnectStatus(IO); - return EvConnectSock(IO, SendMsg, - SMTP_C_ConnTimeout, + return EvConnectSock(IO, + SMTP_C_ConnTimeout, SMTP_C_ReadTimeouts[0], 1); } @@ -278,65 +282,73 @@ 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) ) { memset(&SendMsg->pCurrRelay->Addr, 0, sizeof(struct in6_addr)); if (SendMsg->pCurrRelay->IPv6) { - memcpy(&SendMsg->pCurrRelay->Addr.sin6_addr.s6_addr, + memcpy(&SendMsg->pCurrRelay->Addr.sin6_addr.s6_addr, &hostent->h_addr_list[0], sizeof(struct in6_addr)); - - SendMsg->pCurrRelay->Addr.sin6_family = hostent->h_addrtype; - SendMsg->pCurrRelay->Addr.sin6_port = htons(DefaultMXPort); + + SendMsg->pCurrRelay->Addr.sin6_family = + hostent->h_addrtype; + SendMsg->pCurrRelay->Addr.sin6_port = + htons(DefaultMXPort); } else { - struct sockaddr_in *addr = (struct sockaddr_in*) &SendMsg->pCurrRelay->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(DefaultMXPort); - } 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 + else return FailOneAttempt(IO); } eNextState get_one_mx_host_ip(AsyncIO *IO) { SmtpOutMsg * SendMsg = IO->Data; - /* + /* * 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); EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); - EVS_syslog(LOG_DEBUG, - "SMTP client[%ld]: looking up %s-Record %s : %d ...\n", - SendMsg->n, + 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->Host, SendMsg->pCurrRelay->Port); - if (!QueueQuery((SendMsg->pCurrRelay->IPv6)? ns_t_aaaa : ns_t_a, - SendMsg->pCurrRelay->Host, - &SendMsg->IO, - &SendMsg->HostLookup, + 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; @@ -361,13 +373,14 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO) while ((pp != NULL) && (*pp != NULL) && ((*pp)->Next != NULL)) pp = &(*pp)->Next; - if ((IO->DNS.Query->DNSStatus == ARES_SUCCESS) && + 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->DNS.Query->VParsedDNSReply; + + SendMsg->CurrMX + = SendMsg->AllMX + = IO->DNS.Query->VParsedDNSReply; while (SendMsg->CurrMX) { int i; for (i = 0; i < 2; i++) { @@ -379,7 +392,7 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO) p->Port = DefaultMXPort; p->IPv6 = i == 1; p->Host = SendMsg->CurrMX->host; - + *pp = p; pp = &p->Next; } @@ -398,7 +411,7 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO) p->Port = DefaultMXPort; p->IPv6 = i == 1; p->Host = SendMsg->node; - + *pp = p; pp = &p->Next; } @@ -415,14 +428,14 @@ eNextState resolve_mx_records(AsyncIO *IO) 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; } @@ -436,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; @@ -450,51 +463,46 @@ 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.DNS.Fail = SMTP_C_DNSFail; - 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.NextState = eReadMessage; + 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) { - AsyncIO *IO; SmtpOutMsg *SendMsg; syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); SendMsg = new_smtp_outmsg(MyQItem, MyQEntry, MsgCount); - IO = &SendMsg->IO; if (KeepMsgText) SendMsg->msgtext = MsgText; - else SendMsg->msgtext = NewStrBufDup(MsgText); - + else SendMsg->msgtext = NewStrBufDup(MsgText); + if (smtp_resolve_recipients(SendMsg)) { - CitContext *SubC; - SubC = CloneContext (CC); - SubC->session_specific_data = (char*) SendMsg; - SendMsg->IO.CitContext = SubC; - - safestrncpy(SubC->cs_host, SendMsg->node, sizeof(SubC->cs_host)); + + 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, + SendMsg->MyQItem->MessageID, ChrPtr(SendMsg->MyQEntry->Recipient), ((CitContext*)SendMsg->IO.CitContext)->cs_pid); if (SendMsg->pCurrRelay == NULL) @@ -505,7 +513,9 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem, QueueEventContext(&SendMsg->IO, 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); } @@ -513,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); @@ -545,16 +555,18 @@ void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg) 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; } @@ -627,8 +639,6 @@ eNextState SMTP_C_ConnFail(AsyncIO *IO) } eNextState SMTP_C_DNSFail(AsyncIO *IO) { - SmtpOutMsg *pMsg = IO->Data; - EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); return FailOneAttempt(IO); } @@ -638,24 +648,26 @@ eNextState SMTP_C_Shutdown(AsyncIO *IO) 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... */ @@ -664,11 +676,11 @@ 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; } }