From 73422328a6781e5073a485cf85d54b43974153d9 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Sun, 29 Jan 2012 19:05:57 +0100 Subject: [PATCH] SMTP-Client: rename all SmtpOutMsg pointers to 'Msg' --- citadel/modules/smtp/serv_smtpeventclient.c | 250 +++++++++---------- citadel/modules/smtp/smtp_clienthandlers.c | 252 ++++++++++---------- 2 files changed, 251 insertions(+), 251 deletions(-) diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c index 518c00a33..e0ef6fd62 100644 --- a/citadel/modules/smtp/serv_smtpeventclient.c +++ b/citadel/modules/smtp/serv_smtpeventclient.c @@ -183,9 +183,9 @@ void FinalizeMessageSend(SmtpOutMsg *Msg) eNextState FailOneAttempt(AsyncIO *IO) { - SmtpOutMsg *SendMsg = IO->Data; + SmtpOutMsg *Msg = IO->Data; - if (SendMsg->MyQEntry->Status == 2) + if (Msg->MyQEntry->Status == 2) return eAbort; /* @@ -195,14 +195,14 @@ eNextState FailOneAttempt(AsyncIO *IO) */ StopClientWatchers(IO); - if (SendMsg->pCurrRelay != NULL) - SendMsg->pCurrRelay = SendMsg->pCurrRelay->Next; + if (Msg->pCurrRelay != NULL) + Msg->pCurrRelay = Msg->pCurrRelay->Next; - if (SendMsg->pCurrRelay == NULL) { + if (Msg->pCurrRelay == NULL) { EVS_syslog(LOG_DEBUG, "SMTP: %s Aborting\n", __FUNCTION__); return eAbort; } - if (SendMsg->pCurrRelay->IsIP) { + if (Msg->pCurrRelay->IsIP) { EVS_syslog(LOG_DEBUG, "SMTP: %s connecting IP\n", __FUNCTION__); return mx_connect_ip(IO); } @@ -217,7 +217,7 @@ eNextState FailOneAttempt(AsyncIO *IO) void SetConnectStatus(AsyncIO *IO) { - SmtpOutMsg *SendMsg = IO->Data; + SmtpOutMsg *Msg = IO->Data; char buf[256]; void *src; @@ -238,23 +238,23 @@ void SetConnectStatus(AsyncIO *IO) buf, sizeof(buf)); - if (SendMsg->mx_host == NULL) - SendMsg->mx_host = ""; + if (Msg->mx_host == NULL) + Msg->mx_host = ""; EVS_syslog(LOG_DEBUG, "SMTP client[%ld]: connecting to %s [%s]:%d ...\n", - SendMsg->n, - SendMsg->mx_host, + Msg->n, + Msg->mx_host, buf, - SendMsg->IO.ConnectMe->Port); + Msg->IO.ConnectMe->Port); - SendMsg->MyQEntry->Status = 5; - StrBufPrintf(SendMsg->MyQEntry->StatusMessage, + Msg->MyQEntry->Status = 5; + StrBufPrintf(Msg->MyQEntry->StatusMessage, "Timeout while connecting %s [%s]:%d ", - SendMsg->mx_host, + Msg->mx_host, buf, - SendMsg->IO.ConnectMe->Port); - SendMsg->IO.NextState = eConnect; + Msg->IO.ConnectMe->Port); + Msg->IO.NextState = eConnect; } /***************************************************************************** @@ -262,11 +262,11 @@ void SetConnectStatus(AsyncIO *IO) *****************************************************************************/ eNextState mx_connect_ip(AsyncIO *IO) { - SmtpOutMsg *SendMsg = IO->Data; + SmtpOutMsg *Msg = IO->Data; EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); - IO->ConnectMe = SendMsg->pCurrRelay; + IO->ConnectMe = Msg->pCurrRelay; SetConnectStatus(IO); @@ -278,23 +278,23 @@ eNextState mx_connect_ip(AsyncIO *IO) eNextState get_one_mx_host_ip_done(AsyncIO *IO) { - SmtpOutMsg *SendMsg = IO->Data; + SmtpOutMsg *Msg = IO->Data; struct hostent *hostent; QueryCbDone(IO); - hostent = SendMsg->HostLookup.VParsedDNSReply; - if ((SendMsg->HostLookup.DNSStatus == ARES_SUCCESS) && + hostent = Msg->HostLookup.VParsedDNSReply; + if ((Msg->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, + memset(&Msg->pCurrRelay->Addr, 0, sizeof(struct in6_addr)); + if (Msg->pCurrRelay->IPv6) { + memcpy(&Msg->pCurrRelay->Addr.sin6_addr.s6_addr, &hostent->h_addr_list[0], sizeof(struct in6_addr)); - SendMsg->pCurrRelay->Addr.sin6_family = + Msg->pCurrRelay->Addr.sin6_family = hostent->h_addrtype; - SendMsg->pCurrRelay->Addr.sin6_port = + Msg->pCurrRelay->Addr.sin6_port = htons(DefaultMXPort); } else { @@ -306,7 +306,7 @@ eNextState get_one_mx_host_ip_done(AsyncIO *IO) * htonl((uint32_t)&hostent->h_addr_list[0]); */ - addr = (struct sockaddr_in*) &SendMsg->pCurrRelay->Addr; + addr = (struct sockaddr_in*) &Msg->pCurrRelay->Addr; memcpy(&addr->sin_addr.s_addr, hostent->h_addr_list[0], @@ -315,7 +315,7 @@ eNextState get_one_mx_host_ip_done(AsyncIO *IO) addr->sin_family = hostent->h_addrtype; addr->sin_port = htons(DefaultMXPort); } - SendMsg->mx_host = SendMsg->pCurrRelay->Host; + Msg->mx_host = Msg->pCurrRelay->Host; return mx_connect_ip(IO); } else @@ -324,7 +324,7 @@ eNextState get_one_mx_host_ip_done(AsyncIO *IO) eNextState get_one_mx_host_ip(AsyncIO *IO) { - SmtpOutMsg * SendMsg = IO->Data; + SmtpOutMsg * Msg = IO->Data; /* * here we start with the lookup of one host. it might be... * - the relay host *sigh* @@ -338,21 +338,21 @@ eNextState get_one_mx_host_ip(AsyncIO *IO) 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, + Msg->n, + (Msg->pCurrRelay->IPv6)? "aaaa": "a", + Msg->pCurrRelay->Host, + Msg->pCurrRelay->Port); + + if (!QueueQuery((Msg->pCurrRelay->IPv6)? ns_t_aaaa : ns_t_a, + Msg->pCurrRelay->Host, + &Msg->IO, + &Msg->HostLookup, get_one_mx_host_ip_done)) { - SendMsg->MyQEntry->Status = 5; - StrBufPrintf(SendMsg->MyQEntry->StatusMessage, - "No MX hosts found for <%s>", SendMsg->node); - SendMsg->IO.NextState = eTerminateConnection; + Msg->MyQEntry->Status = 5; + StrBufPrintf(Msg->MyQEntry->StatusMessage, + "No MX hosts found for <%s>", Msg->node); + Msg->IO.NextState = eTerminateConnection; return IO->NextState; } IO->NextState = eReadDNSReply; @@ -365,25 +365,25 @@ eNextState get_one_mx_host_ip(AsyncIO *IO) *****************************************************************************/ eNextState smtp_resolve_mx_record_done(AsyncIO *IO) { - SmtpOutMsg * SendMsg = IO->Data; + SmtpOutMsg * Msg = IO->Data; ParsedURL **pp; QueryCbDone(IO); EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); - pp = &SendMsg->Relay; + pp = &Msg->Relay; while ((pp != NULL) && (*pp != NULL) && ((*pp)->Next != NULL)) pp = &(*pp)->Next; if ((IO->DNS.Query->DNSStatus == ARES_SUCCESS) && (IO->DNS.Query->VParsedDNSReply != NULL)) { /* ok, we found mx records. */ - SendMsg->IO.ErrMsg = SendMsg->MyQEntry->StatusMessage; + Msg->IO.ErrMsg = Msg->MyQEntry->StatusMessage; - SendMsg->CurrMX - = SendMsg->AllMX + Msg->CurrMX + = Msg->AllMX = IO->DNS.Query->VParsedDNSReply; - while (SendMsg->CurrMX) { + while (Msg->CurrMX) { int i; for (i = 0; i < 2; i++) { ParsedURL *p; @@ -393,14 +393,14 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO) p->IsIP = 0; p->Port = DefaultMXPort; p->IPv6 = i == 1; - p->Host = SendMsg->CurrMX->host; + p->Host = Msg->CurrMX->host; *pp = p; pp = &p->Next; } - SendMsg->CurrMX = SendMsg->CurrMX->next; + Msg->CurrMX = Msg->CurrMX->next; } - SendMsg->CXFlags = SendMsg->CXFlags & F_HAVE_MX; + Msg->CXFlags = Msg->CXFlags & F_HAVE_MX; } else { /* else fall back to the plain hostname */ int i; @@ -412,36 +412,36 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO) p->IsIP = 0; p->Port = DefaultMXPort; p->IPv6 = i == 1; - p->Host = SendMsg->node; + p->Host = Msg->node; *pp = p; pp = &p->Next; } - SendMsg->CXFlags = SendMsg->CXFlags & F_DIRECT; + Msg->CXFlags = Msg->CXFlags & F_DIRECT; } - *pp = SendMsg->MyQItem->FallBackHost; - SendMsg->pCurrRelay = SendMsg->Relay; + *pp = Msg->MyQItem->FallBackHost; + Msg->pCurrRelay = Msg->Relay; return get_one_mx_host_ip(IO); } eNextState resolve_mx_records(AsyncIO *IO) { - SmtpOutMsg * SendMsg = IO->Data; + SmtpOutMsg * Msg = IO->Data; EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); /* start resolving MX records here. */ if (!QueueQuery(ns_t_mx, - SendMsg->node, - &SendMsg->IO, - &SendMsg->MxLookup, + Msg->node, + &Msg->IO, + &Msg->MxLookup, smtp_resolve_mx_record_done)) { - SendMsg->MyQEntry->Status = 5; - StrBufPrintf(SendMsg->MyQEntry->StatusMessage, - "No MX hosts found for <%s>", SendMsg->node); + Msg->MyQEntry->Status = 5; + StrBufPrintf(Msg->MyQEntry->StatusMessage, + "No MX hosts found for <%s>", Msg->node); return IO->NextState; } - SendMsg->IO.NextState = eReadDNSReply; + Msg->IO.NextState = eReadDNSReply; return IO->NextState; } @@ -455,18 +455,18 @@ SmtpOutMsg *new_smtp_outmsg(OneQueItem *MyQItem, MailQEntry *MyQEntry, int MsgCount) { - SmtpOutMsg * SendMsg; + SmtpOutMsg * Msg; - SendMsg = (SmtpOutMsg *) malloc(sizeof(SmtpOutMsg)); - memset(SendMsg, 0, sizeof(SmtpOutMsg)); + Msg = (SmtpOutMsg *) malloc(sizeof(SmtpOutMsg)); + memset(Msg, 0, sizeof(SmtpOutMsg)); - SendMsg->n = MsgCount; - SendMsg->MyQEntry = MyQEntry; - SendMsg->MyQItem = MyQItem; - SendMsg->pCurrRelay = MyQItem->URL; + Msg->n = MsgCount; + Msg->MyQEntry = MyQEntry; + Msg->MyQItem = MyQItem; + Msg->pCurrRelay = MyQItem->URL; - InitIOStruct(&SendMsg->IO, - SendMsg, + InitIOStruct(&Msg->IO, + Msg, eReadMessage, SMTP_C_ReadServerStatus, SMTP_C_DNSFail, @@ -477,7 +477,7 @@ SmtpOutMsg *new_smtp_outmsg(OneQueItem *MyQItem, SMTP_C_Timeout, SMTP_C_Shutdown); - return SendMsg; + return Msg; } void smtp_try_one_queue_entry(OneQueItem *MyQItem, @@ -487,51 +487,51 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem, int KeepMsgText, int MsgCount) { - SmtpOutMsg *SendMsg; + SmtpOutMsg *Msg; syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); - SendMsg = new_smtp_outmsg(MyQItem, MyQEntry, MsgCount); - if (KeepMsgText) SendMsg->msgtext = MsgText; - else SendMsg->msgtext = NewStrBufDup(MsgText); + Msg = new_smtp_outmsg(MyQItem, MyQEntry, MsgCount); + if (KeepMsgText) Msg->msgtext = MsgText; + else Msg->msgtext = NewStrBufDup(MsgText); - if (smtp_resolve_recipients(SendMsg)) { + if (smtp_resolve_recipients(Msg)) { safestrncpy( - ((CitContext *)SendMsg->IO.CitContext)->cs_host, - SendMsg->node, + ((CitContext *)Msg->IO.CitContext)->cs_host, + Msg->node, sizeof(((CitContext *) - SendMsg->IO.CitContext)->cs_host)); + Msg->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, + Msg->MyQItem->MessageID, + ChrPtr(Msg->MyQEntry->Recipient), + ((CitContext*)Msg->IO.CitContext)->cs_pid); + if (Msg->pCurrRelay == NULL) + QueueEventContext(&Msg->IO, resolve_mx_records); else { /* oh... via relay host */ - if (SendMsg->pCurrRelay->IsIP) { - QueueEventContext(&SendMsg->IO, + if (Msg->pCurrRelay->IsIP) { + QueueEventContext(&Msg->IO, mx_connect_ip); } else { /* uneducated admin has chosen to add DNS to the equation... */ - QueueEventContext(&SendMsg->IO, + QueueEventContext(&Msg->IO, get_one_mx_host_ip); } } } else { /* No recipients? well fail then. */ - if ((SendMsg==NULL) || - (SendMsg->MyQEntry == NULL)) { - SendMsg->MyQEntry->Status = 5; - StrBufPlain(SendMsg->MyQEntry->StatusMessage, + if ((Msg==NULL) || + (Msg->MyQEntry == NULL)) { + Msg->MyQEntry->Status = 5; + StrBufPlain(Msg->MyQEntry->StatusMessage, HKEY("Invalid Recipient!")); } - FinalizeMessageSend(SendMsg); + FinalizeMessageSend(Msg); } } @@ -544,10 +544,10 @@ void smtp_try_one_queue_entry(OneQueItem *MyQItem, /* SMTP CLIENT DISPATCHER */ /*****************************************************************************/ -void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg) +void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *Msg) { double Timeout = 0.0; - AsyncIO *IO = &pMsg->IO; + AsyncIO *IO = &Msg->IO; EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); @@ -555,22 +555,22 @@ void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg) case eSendFile: case eSendReply: case eSendMore: - Timeout = SMTP_C_SendTimeouts[pMsg->State]; - if (pMsg->State == eDATABody) { + Timeout = SMTP_C_SendTimeouts[Msg->State]; + if (Msg->State == eDATABody) { /* if we're sending a huge message, * we need more time. */ - Timeout += StrLength(pMsg->msgtext) / 1024; + Timeout += StrLength(Msg->msgtext) / 1024; } break; case eReadMessage: - Timeout = SMTP_C_ReadTimeouts[pMsg->State]; - if (pMsg->State == eDATATerminateBody) { + Timeout = SMTP_C_ReadTimeouts[Msg->State]; + if (Msg->State == eDATATerminateBody) { /* * some mailservers take a nap before accepting * the message content inspection and such. */ - Timeout += StrLength(pMsg->msgtext) / 1024; + Timeout += StrLength(Msg->msgtext) / 1024; } break; case eSendDNSQuery: @@ -584,30 +584,30 @@ void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg) case eAbort: return; } - SetNextTimeout(&pMsg->IO, Timeout); + SetNextTimeout(&Msg->IO, Timeout); } eNextState SMTP_C_DispatchReadDone(AsyncIO *IO) { EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); - SmtpOutMsg *pMsg = IO->Data; + SmtpOutMsg *Msg = IO->Data; eNextState rc; - rc = ReadHandlers[pMsg->State](pMsg); + rc = ReadHandlers[Msg->State](Msg); if (rc != eAbort) { - pMsg->State++; - SMTPSetTimeout(rc, pMsg); + Msg->State++; + SMTPSetTimeout(rc, Msg); } return rc; } eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO) { EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); - SmtpOutMsg *pMsg = IO->Data; + SmtpOutMsg *Msg = IO->Data; eNextState rc; - rc = SendHandlers[pMsg->State](pMsg); - SMTPSetTimeout(rc, pMsg); + rc = SendHandlers[Msg->State](Msg); + SMTPSetTimeout(rc, Msg); return rc; } @@ -617,46 +617,46 @@ eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO) /*****************************************************************************/ eNextState SMTP_C_Terminate(AsyncIO *IO) { - SmtpOutMsg *pMsg = IO->Data; + SmtpOutMsg *Msg = IO->Data; EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); - FinalizeMessageSend(pMsg); + FinalizeMessageSend(Msg); return eAbort; } eNextState SMTP_C_Timeout(AsyncIO *IO) { - SmtpOutMsg *pMsg = IO->Data; + SmtpOutMsg *Msg = IO->Data; - pMsg->MyQEntry->Status = 4; + Msg->MyQEntry->Status = 4; EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); - StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State])); + StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State])); return FailOneAttempt(IO); } eNextState SMTP_C_ConnFail(AsyncIO *IO) { - SmtpOutMsg *pMsg = IO->Data; + SmtpOutMsg *Msg = IO->Data; - pMsg->MyQEntry->Status = 4; + Msg->MyQEntry->Status = 4; EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); - StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[pMsg->State])); + StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State])); return FailOneAttempt(IO); } eNextState SMTP_C_DNSFail(AsyncIO *IO) { - SmtpOutMsg *pMsg = IO->Data; - pMsg->MyQEntry->Status = 4; + SmtpOutMsg *Msg = IO->Data; + Msg->MyQEntry->Status = 4; EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); return FailOneAttempt(IO); } eNextState SMTP_C_Shutdown(AsyncIO *IO) { EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); - SmtpOutMsg *pMsg = IO->Data; + SmtpOutMsg *Msg = IO->Data; - pMsg->MyQEntry->Status = 3; - StrBufPlain(pMsg->MyQEntry->StatusMessage, + Msg->MyQEntry->Status = 3; + StrBufPlain(Msg->MyQEntry->StatusMessage, HKEY("server shutdown during message submit.")); - FinalizeMessageSend(pMsg); + FinalizeMessageSend(Msg); return eAbort; } diff --git a/citadel/modules/smtp/smtp_clienthandlers.c b/citadel/modules/smtp/smtp_clienthandlers.c index b41ab4f9c..ebc6a7cb0 100644 --- a/citadel/modules/smtp/smtp_clienthandlers.c +++ b/citadel/modules/smtp/smtp_clienthandlers.c @@ -89,36 +89,36 @@ #define SMTP_ERROR(WHICH_ERR, ERRSTR) do { \ - SendMsg->MyQEntry->Status = WHICH_ERR; \ - StrBufAppendBufPlain(SendMsg->MyQEntry->StatusMessage, \ + Msg->MyQEntry->Status = WHICH_ERR; \ + StrBufAppendBufPlain(Msg->MyQEntry->StatusMessage, \ HKEY(ERRSTR), 0); \ return eAbort; } \ while (0) #define SMTP_VERROR(WHICH_ERR) do { \ - SendMsg->MyQEntry->Status = WHICH_ERR; \ - StrBufPlain(SendMsg->MyQEntry->StatusMessage, \ - ChrPtr(SendMsg->IO.IOBuf) + 4, \ - StrLength(SendMsg->IO.IOBuf) - 4); \ + Msg->MyQEntry->Status = WHICH_ERR; \ + StrBufPlain(Msg->MyQEntry->StatusMessage, \ + ChrPtr(Msg->IO.IOBuf) + 4, \ + StrLength(Msg->IO.IOBuf) - 4); \ return eAbort; } \ while (0) -#define SMTP_IS_STATE(WHICH_STATE) (ChrPtr(SendMsg->IO.IOBuf)[0] == WHICH_STATE) +#define SMTP_IS_STATE(WHICH_STATE) (ChrPtr(Msg->IO.IOBuf)[0] == WHICH_STATE) #define SMTP_DBG_SEND() \ - EVS_syslog(LOG_DEBUG, "SMTP: > %s\n", ChrPtr(SendMsg->IO.SendBuf.Buf)) + EVS_syslog(LOG_DEBUG, "SMTP: > %s\n", ChrPtr(Msg->IO.SendBuf.Buf)) #define SMTP_DBG_READ() \ - EVS_syslog(LOG_DEBUG, "SMTP: < %s\n", ChrPtr(SendMsg->IO.IOBuf)) + EVS_syslog(LOG_DEBUG, "SMTP: < %s\n", ChrPtr(Msg->IO.IOBuf)) /*****************************************************************************/ /* SMTP CLIENT STATE CALLBACKS */ /*****************************************************************************/ -eNextState SMTPC_read_greeting(SmtpOutMsg *SendMsg) +eNextState SMTPC_read_greeting(SmtpOutMsg *Msg) { /* Process the SMTP greeting from the server */ - AsyncIO *IO = &SendMsg->IO; + AsyncIO *IO = &Msg->IO; SMTP_DBG_READ(); if (!SMTP_IS_STATE('2')) { @@ -130,48 +130,48 @@ eNextState SMTPC_read_greeting(SmtpOutMsg *SendMsg) return eSendReply; } -eNextState SMTPC_send_EHLO(SmtpOutMsg *SendMsg) +eNextState SMTPC_send_EHLO(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; + AsyncIO *IO = &Msg->IO; /* At this point we know we are talking to a real SMTP server */ /* Do a EHLO command. If it fails, try the HELO command. */ - StrBufPrintf(SendMsg->IO.SendBuf.Buf, + StrBufPrintf(Msg->IO.SendBuf.Buf, "EHLO %s\r\n", config.c_fqdn); SMTP_DBG_SEND(); return eReadMessage; } -eNextState SMTPC_read_EHLO_reply(SmtpOutMsg *SendMsg) +eNextState SMTPC_read_EHLO_reply(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; + AsyncIO *IO = &Msg->IO; SMTP_DBG_READ(); if (SMTP_IS_STATE('2')) { - SendMsg->State ++; + Msg->State ++; - if ((SendMsg->pCurrRelay == NULL) || - (SendMsg->pCurrRelay->User == NULL)) - SendMsg->State ++; /* Skip auth... */ + if ((Msg->pCurrRelay == NULL) || + (Msg->pCurrRelay->User == NULL)) + Msg->State ++; /* Skip auth... */ } /* else we fall back to 'helo' */ return eSendReply; } -eNextState STMPC_send_HELO(SmtpOutMsg *SendMsg) +eNextState STMPC_send_HELO(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; - StrBufPrintf(SendMsg->IO.SendBuf.Buf, + AsyncIO *IO = &Msg->IO; + StrBufPrintf(Msg->IO.SendBuf.Buf, "HELO %s\r\n", config.c_fqdn); SMTP_DBG_SEND(); return eReadMessage; } -eNextState SMTPC_read_HELO_reply(SmtpOutMsg *SendMsg) +eNextState SMTPC_read_HELO_reply(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; + AsyncIO *IO = &Msg->IO; SMTP_DBG_READ(); if (!SMTP_IS_STATE('2')) @@ -181,43 +181,43 @@ eNextState SMTPC_read_HELO_reply(SmtpOutMsg *SendMsg) else SMTP_VERROR(5); } - if ((SendMsg->pCurrRelay == NULL) || - (SendMsg->pCurrRelay->User == NULL)) - SendMsg->State ++; /* Skip auth... */ + if ((Msg->pCurrRelay == NULL) || + (Msg->pCurrRelay->User == NULL)) + Msg->State ++; /* Skip auth... */ return eSendReply; } -eNextState SMTPC_send_auth(SmtpOutMsg *SendMsg) +eNextState SMTPC_send_auth(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; + AsyncIO *IO = &Msg->IO; char buf[SIZ]; char encoded[1024]; - if ((SendMsg->pCurrRelay == NULL) || - (SendMsg->pCurrRelay->User == NULL)) - SendMsg->State ++; /* Skip auth, shouldn't even come here!... */ + if ((Msg->pCurrRelay == NULL) || + (Msg->pCurrRelay->User == NULL)) + Msg->State ++; /* Skip auth, shouldn't even come here!... */ else { /* Do an AUTH command if necessary */ sprintf(buf, "%s%c%s%c%s", - SendMsg->pCurrRelay->User, '\0', - SendMsg->pCurrRelay->User, '\0', - SendMsg->pCurrRelay->Pass); + Msg->pCurrRelay->User, '\0', + Msg->pCurrRelay->User, '\0', + Msg->pCurrRelay->Pass); CtdlEncodeBase64(encoded, buf, - strlen(SendMsg->pCurrRelay->User) * 2 + - strlen(SendMsg->pCurrRelay->Pass) + 2, 0); + strlen(Msg->pCurrRelay->User) * 2 + + strlen(Msg->pCurrRelay->Pass) + 2, 0); - StrBufPrintf(SendMsg->IO.SendBuf.Buf, + StrBufPrintf(Msg->IO.SendBuf.Buf, "AUTH PLAIN %s\r\n", encoded); } SMTP_DBG_SEND(); return eReadMessage; } -eNextState SMTPC_read_auth_reply(SmtpOutMsg *SendMsg) +eNextState SMTPC_read_auth_reply(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; + AsyncIO *IO = &Msg->IO; /* Do an AUTH command if necessary */ SMTP_DBG_READ(); @@ -231,21 +231,21 @@ eNextState SMTPC_read_auth_reply(SmtpOutMsg *SendMsg) return eSendReply; } -eNextState SMTPC_send_FROM(SmtpOutMsg *SendMsg) +eNextState SMTPC_send_FROM(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; + AsyncIO *IO = &Msg->IO; /* previous command succeeded, now try the MAIL FROM: command */ - StrBufPrintf(SendMsg->IO.SendBuf.Buf, + StrBufPrintf(Msg->IO.SendBuf.Buf, "MAIL FROM:<%s>\r\n", - SendMsg->envelope_from); + Msg->envelope_from); SMTP_DBG_SEND(); return eReadMessage; } -eNextState SMTPC_read_FROM_reply(SmtpOutMsg *SendMsg) +eNextState SMTPC_read_FROM_reply(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; + AsyncIO *IO = &Msg->IO; SMTP_DBG_READ(); if (!SMTP_IS_STATE('2')) { @@ -258,22 +258,22 @@ eNextState SMTPC_read_FROM_reply(SmtpOutMsg *SendMsg) } -eNextState SMTPC_send_RCPT(SmtpOutMsg *SendMsg) +eNextState SMTPC_send_RCPT(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; + AsyncIO *IO = &Msg->IO; /* MAIL succeeded, now try the RCPT To: command */ - StrBufPrintf(SendMsg->IO.SendBuf.Buf, + StrBufPrintf(Msg->IO.SendBuf.Buf, "RCPT TO:<%s@%s>\r\n", - SendMsg->user, - SendMsg->node); + Msg->user, + Msg->node); SMTP_DBG_SEND(); return eReadMessage; } -eNextState SMTPC_read_RCPT_reply(SmtpOutMsg *SendMsg) +eNextState SMTPC_read_RCPT_reply(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; + AsyncIO *IO = &Msg->IO; SMTP_DBG_READ(); if (!SMTP_IS_STATE('2')) { @@ -285,20 +285,20 @@ eNextState SMTPC_read_RCPT_reply(SmtpOutMsg *SendMsg) return eSendReply; } -eNextState SMTPC_send_DATAcmd(SmtpOutMsg *SendMsg) +eNextState SMTPC_send_DATAcmd(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; + AsyncIO *IO = &Msg->IO; /* RCPT succeeded, now try the DATA command */ - StrBufPlain(SendMsg->IO.SendBuf.Buf, + StrBufPlain(Msg->IO.SendBuf.Buf, HKEY("DATA\r\n")); SMTP_DBG_SEND(); return eReadMessage; } -eNextState SMTPC_read_DATAcmd_reply(SmtpOutMsg *SendMsg) +eNextState SMTPC_read_DATAcmd_reply(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; + AsyncIO *IO = &Msg->IO; SMTP_DBG_READ(); if (!SMTP_IS_STATE('3')) { @@ -310,37 +310,37 @@ eNextState SMTPC_read_DATAcmd_reply(SmtpOutMsg *SendMsg) return eSendReply; } -eNextState SMTPC_send_data_body(SmtpOutMsg *SendMsg) +eNextState SMTPC_send_data_body(SmtpOutMsg *Msg) { StrBuf *Buf; /* If we reach this point, the server is expecting data.*/ - Buf = SendMsg->IO.SendBuf.Buf; - SendMsg->IO.SendBuf.Buf = SendMsg->msgtext; - SendMsg->msgtext = Buf; - SendMsg->State ++; + Buf = Msg->IO.SendBuf.Buf; + Msg->IO.SendBuf.Buf = Msg->msgtext; + Msg->msgtext = Buf; + Msg->State ++; return eSendMore; } -eNextState SMTPC_send_terminate_data_body(SmtpOutMsg *SendMsg) +eNextState SMTPC_send_terminate_data_body(SmtpOutMsg *Msg) { StrBuf *Buf; - Buf = SendMsg->IO.SendBuf.Buf; - SendMsg->IO.SendBuf.Buf = SendMsg->msgtext; - SendMsg->msgtext = Buf; + Buf = Msg->IO.SendBuf.Buf; + Msg->IO.SendBuf.Buf = Msg->msgtext; + Msg->msgtext = Buf; - StrBufPlain(SendMsg->IO.SendBuf.Buf, + StrBufPlain(Msg->IO.SendBuf.Buf, HKEY(".\r\n")); return eReadMessage; } -eNextState SMTPC_read_data_body_reply(SmtpOutMsg *SendMsg) +eNextState SMTPC_read_data_body_reply(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; + AsyncIO *IO = &Msg->IO; SMTP_DBG_READ(); if (!SMTP_IS_STATE('2')) { @@ -351,44 +351,44 @@ eNextState SMTPC_read_data_body_reply(SmtpOutMsg *SendMsg) } /* We did it! */ - StrBufPlain(SendMsg->MyQEntry->StatusMessage, - &ChrPtr(SendMsg->IO.RecvBuf.Buf)[4], - StrLength(SendMsg->IO.RecvBuf.Buf) - 4); - SendMsg->MyQEntry->Status = 2; + StrBufPlain(Msg->MyQEntry->StatusMessage, + &ChrPtr(Msg->IO.RecvBuf.Buf)[4], + StrLength(Msg->IO.RecvBuf.Buf) - 4); + Msg->MyQEntry->Status = 2; return eSendReply; } -eNextState SMTPC_send_QUIT(SmtpOutMsg *SendMsg) +eNextState SMTPC_send_QUIT(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; - StrBufPlain(SendMsg->IO.SendBuf.Buf, + AsyncIO *IO = &Msg->IO; + StrBufPlain(Msg->IO.SendBuf.Buf, HKEY("QUIT\r\n")); SMTP_DBG_SEND(); return eReadMessage; } -eNextState SMTPC_read_QUIT_reply(SmtpOutMsg *SendMsg) +eNextState SMTPC_read_QUIT_reply(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; + AsyncIO *IO = &Msg->IO; SMTP_DBG_READ(); EVS_syslog(LOG_INFO, "SMTP client[%ld]: delivery to <%s> @ <%s> (%s) succeeded\n", - SendMsg->n, - SendMsg->user, - SendMsg->node, - SendMsg->name); + Msg->n, + Msg->user, + Msg->node, + Msg->name); return eTerminateConnection; } -eNextState SMTPC_read_dummy(SmtpOutMsg *SendMsg) +eNextState SMTPC_read_dummy(SmtpOutMsg *Msg) { return eSendReply; } -eNextState SMTPC_send_dummy(SmtpOutMsg *SendMsg) +eNextState SMTPC_send_dummy(SmtpOutMsg *Msg) { return eReadMessage; } @@ -466,9 +466,9 @@ const ConstStr ReadErrors[eMaxSMTPC + 1] = { -int smtp_resolve_recipients(SmtpOutMsg *SendMsg) +int smtp_resolve_recipients(SmtpOutMsg *Msg) { - AsyncIO *IO = &SendMsg->IO; + AsyncIO *IO = &Msg->IO; const char *ptr; char buf[1024]; int scan_done; @@ -477,33 +477,33 @@ int smtp_resolve_recipients(SmtpOutMsg *SendMsg) EVNCS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__); - if ((SendMsg==NULL) || - (SendMsg->MyQEntry == NULL) || - (StrLength(SendMsg->MyQEntry->Recipient) == 0)) { + if ((Msg==NULL) || + (Msg->MyQEntry == NULL) || + (StrLength(Msg->MyQEntry->Recipient) == 0)) { return 0; } /* Parse out the host portion of the recipient address */ - process_rfc822_addr(ChrPtr(SendMsg->MyQEntry->Recipient), - SendMsg->user, - SendMsg->node, - SendMsg->name); + process_rfc822_addr(ChrPtr(Msg->MyQEntry->Recipient), + Msg->user, + Msg->node, + Msg->name); EVNCS_syslog(LOG_DEBUG, "SMTP client[%ld]: Attempting delivery to " "<%s> @ <%s> (%s)\n", - SendMsg->n, - SendMsg->user, - SendMsg->node, - SendMsg->name); + Msg->n, + Msg->user, + Msg->node, + Msg->name); /* If no envelope_from is supplied, extract one from the message */ - SendMsg->envelope_from = ChrPtr(SendMsg->MyQItem->EnvelopeFrom); - if ( (SendMsg->envelope_from == NULL) || - (IsEmptyStr(SendMsg->envelope_from)) ) { - SendMsg->mailfrom[0] = '\0'; + Msg->envelope_from = ChrPtr(Msg->MyQItem->EnvelopeFrom); + if ( (Msg->envelope_from == NULL) || + (IsEmptyStr(Msg->envelope_from)) ) { + Msg->mailfrom[0] = '\0'; scan_done = 0; - ptr = ChrPtr(SendMsg->msgtext); + ptr = ChrPtr(Msg->msgtext); do { if (ptr = cmemreadline(ptr, buf, sizeof buf), *ptr == 0) { @@ -511,16 +511,16 @@ int smtp_resolve_recipients(SmtpOutMsg *SendMsg) } if (!strncasecmp(buf, "From:", 5)) { - safestrncpy(SendMsg->mailfrom, + safestrncpy(Msg->mailfrom, &buf[5], - sizeof SendMsg->mailfrom); + sizeof Msg->mailfrom); - striplt(SendMsg->mailfrom); - for (i=0; SendMsg->mailfrom[i]; ++i) { - if (!isprint(SendMsg->mailfrom[i])) + striplt(Msg->mailfrom); + for (i=0; Msg->mailfrom[i]; ++i) { + if (!isprint(Msg->mailfrom[i])) { - strcpy(&SendMsg->mailfrom[i], - &SendMsg->mailfrom[i+1]); + strcpy(&Msg->mailfrom[i], + &Msg->mailfrom[i+1]); i=0; } } @@ -529,43 +529,43 @@ int smtp_resolve_recipients(SmtpOutMsg *SendMsg) lp = (-1); rp = (-1); for (i=0; - !IsEmptyStr(SendMsg->mailfrom + i); + !IsEmptyStr(Msg->mailfrom + i); ++i) { - if (SendMsg->mailfrom[i] == '(') lp = i; - if (SendMsg->mailfrom[i] == ')') rp = i; + if (Msg->mailfrom[i] == '(') lp = i; + if (Msg->mailfrom[i] == ')') rp = i; } if ((lp>0)&&(rp>lp)) { - strcpy(&SendMsg->mailfrom[lp-1], - &SendMsg->mailfrom[rp+1]); + strcpy(&Msg->mailfrom[lp-1], + &Msg->mailfrom[rp+1]); } /* Prefer brokketized names */ lp = (-1); rp = (-1); for (i=0; - !IsEmptyStr(SendMsg->mailfrom + i); + !IsEmptyStr(Msg->mailfrom + i); ++i) { - if (SendMsg->mailfrom[i] == '<') lp = i; - if (SendMsg->mailfrom[i] == '>') rp = i; + if (Msg->mailfrom[i] == '<') lp = i; + if (Msg->mailfrom[i] == '>') rp = i; } if ( (lp>=0) && (rp>lp) ) { - SendMsg->mailfrom[rp] = 0; - memmove(SendMsg->mailfrom, - &SendMsg->mailfrom[lp + 1], + Msg->mailfrom[rp] = 0; + memmove(Msg->mailfrom, + &Msg->mailfrom[lp + 1], rp - lp); } scan_done = 1; } } while (scan_done == 0); - if (IsEmptyStr(SendMsg->mailfrom)) - strcpy(SendMsg->mailfrom, "someone@somewhere.org"); + if (IsEmptyStr(Msg->mailfrom)) + strcpy(Msg->mailfrom, "someone@somewhere.org"); - stripallbut(SendMsg->mailfrom, '<', '>'); - SendMsg->envelope_from = SendMsg->mailfrom; + stripallbut(Msg->mailfrom, '<', '>'); + Msg->envelope_from = Msg->mailfrom; } return 1; -- 2.30.2