* This module handles shared rooms, inter-Citadel mail, and outbound
* mailing list processing.
*
- * Copyright (c) 2000-2015 by the citadel.org team
+ * Copyright (c) 2000-2017 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 3.
#define NODE ChrPtr(((AsyncNetworker*)IO->Data)->node)
#define N ((AsyncNetworker*)IO->Data)->n
-int NetworkClientDebugEnabled = 0;
-
-#define NCDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (NetworkClientDebugEnabled != 0))
-
-#define EVN_syslog(LEVEL, FORMAT, ...) \
- NCDBGLOG(LEVEL) syslog(LEVEL, \
- "%s[%ld]CC[%d]NW[%s][%ld]" FORMAT, \
- IOSTR, IO->ID, CCID, NODE, N, __VA_ARGS__)
-
-#define EVNM_syslog(LEVEL, FORMAT) \
- NCDBGLOG(LEVEL) syslog(LEVEL, \
- "%s[%ld]CC[%d]NW[%s][%ld]" FORMAT, \
- IOSTR, IO->ID, CCID, NODE, N)
-
-#define EVNCS_syslog(LEVEL, FORMAT, ...) \
- NCDBGLOG(LEVEL) syslog(LEVEL, "%s[%ld]NW[%s][%ld]" FORMAT, \
- IOSTR, IO->ID, NODE, N, __VA_ARGS__)
-
-#define EVNCSM_syslog(LEVEL, FORMAT) \
- NCDBGLOG(LEVEL) syslog(LEVEL, "%s[%ld]NW[%s][%ld]" FORMAT, \
- IOSTR, IO->ID, NODE, N)
-
-
typedef enum _eNWCState {
eGreating,
eAuth,
free(NW);
}
-#define NWC_DBG_SEND() EVN_syslog(LOG_DEBUG, ": > %s", ChrPtr(NW->IO.SendBuf.Buf))
-#define NWC_DBG_READ() EVN_syslog(LOG_DEBUG, ": < %s\n", ChrPtr(NW->IO.IOBuf))
-#define NWC_OK (strncasecmp(ChrPtr(NW->IO.IOBuf), "+OK", 3) == 0)
-
eNextState NWC_SendFailureMessage(AsyncIO *IO)
{
AsyncNetworker *NW = IO->Data;
long lens[2];
const char *strs[2];
- EVN_syslog(LOG_DEBUG, "NWC: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "NWC: %s\n", __FUNCTION__);
strs[0] = ChrPtr(NW->node);
lens[0] = StrLength(NW->node);
char connected_to[SIZ];
AsyncIO *IO = &NW->IO;
SetNWCState(IO, eNWCVSGreating);
- NWC_DBG_READ();
/* Read the server greeting */
/* Check that the remote is who we think it is and warn the Aide if not */
extract_token (connected_to, ChrPtr(NW->IO.IOBuf), 1, ' ', sizeof connected_to);
StrBufPrintf(NW->IO.ErrMsg,
"Connected to node \"%s\" but I was expecting to connect to node \"%s\".",
connected_to, ChrPtr(NW->node));
- EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
+ syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
return EventQueueDBOperation(IO, NWC_SendFailureMessage, 1);
}
StrBufPrintf(NW->IO.SendBuf.Buf, "NETP %s|%s\n",
CtdlGetConfigStr("c_nodename"),
ChrPtr(NW->secret));
- NWC_DBG_SEND();
return eSendReply;
}
eNextState NWC_ReadAuthReply(AsyncNetworker *NW)
{
AsyncIO *IO = &NW->IO;
- NWC_DBG_READ();
if (ChrPtr(NW->IO.IOBuf)[0] == '2')
{
return eSendReply;
ChrPtr(NW->node), ChrPtr(NW->IO.IOBuf) + 4);
if (Error == 552) {
SetNWCState(IO, eNWCVSAuthFailNTT);
- EVN_syslog(LOG_INFO,
+ syslog(LOG_INFO,
"Already talking to %s; skipping this time.\n",
ChrPtr(NW->node));
}
else {
SetNWCState(IO, eNWCVSAuthFailNTT);
- EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
+ syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
return EventQueueDBOperation(IO, NWC_SendFailureMessage, 1);
}
return eAbort;
StrBufStripSlashes(NW->tempFileName, 1);
/* We're talking to the correct node. Now identify ourselves. */
StrBufPlain(NW->IO.SendBuf.Buf, HKEY("NDOP\n"));
- NWC_DBG_SEND();
return eSendReply;
}
{
AsyncIO *IO = &NW->IO;
int TotalSendSize;
- NWC_DBG_READ();
if (ChrPtr(NW->IO.IOBuf)[0] == '2')
{
int LogLevel = LOG_DEBUG;
if (TotalSendSize > 0)
LogLevel = LOG_INFO;
- EVN_syslog(LogLevel,
+ syslog(LogLevel,
"Expecting to transfer %d bytes to %s\n",
TotalSendSize,
ChrPtr(NW->tempFileName));
if (fd < 0)
{
SetNWCState(IO, eNWCVSFail);
- EVN_syslog(LOG_CRIT,
+ syslog(LOG_CRIT,
"cannot open %s: %s\n",
ChrPtr(NW->tempFileName),
strerror(errno));
(NW->IO.IOB.TotalSendSize - NW->IO.IOB.TotalSentAlready))
);
*/
- NWC_DBG_SEND();
return eSendReply;
}
else
{
NW->State = eCLOS;
rc = NWC_DispatchWriteDone(&NW->IO);
- NWC_DBG_SEND();
return rc;
}
eNextState NWC_ReadREADState(AsyncNetworker *NW)
{
AsyncIO *IO = &NW->IO;
- NWC_DBG_READ();
if (ChrPtr(NW->IO.IOBuf)[0] == '6')
{
NW->IO.IOB.ChunkSendRemain =
eNextState NWC_ReadREADBlob(AsyncNetworker *NW)
{
eNextState rc;
- AsyncIO *IO = &NW->IO;
- NWC_DBG_READ();
if (NW->IO.IOB.TotalSendSize == NW->IO.IOB.TotalSentAlready)
{
NW->State ++;
FDIOBufferDelete(&NW->IO.IOB);
if (link(ChrPtr(NW->tempFileName), ChrPtr(NW->SpoolFileName)) != 0) {
- EVN_syslog(LOG_ALERT,
+ syslog(LOG_ALERT,
"Could not link %s to %s: %s\n",
ChrPtr(NW->tempFileName),
ChrPtr(NW->SpoolFileName),
strerror(errno));
}
else {
- EVN_syslog(LOG_INFO,
+ syslog(LOG_INFO,
"moved %s to %s\n",
ChrPtr(NW->tempFileName),
ChrPtr(NW->SpoolFileName));
eNextState NWC_ReadREADBlobDone(AsyncNetworker *NW)
{
eNextState rc;
- AsyncIO *IO = &NW->IO;
/* we don't have any data to debug print here. */
if (NW->IO.IOB.TotalSentAlready >= NW->IO.IOB.TotalSendSize)
{
FDIOBufferDelete(&NW->IO.IOB);
if (link(ChrPtr(NW->tempFileName), ChrPtr(NW->SpoolFileName)) != 0) {
- EVN_syslog(LOG_ALERT,
+ syslog(LOG_ALERT,
"Could not link %s to %s: %s\n",
ChrPtr(NW->tempFileName),
ChrPtr(NW->SpoolFileName),
strerror(errno));
}
else {
- EVN_syslog(LOG_INFO,
+ syslog(LOG_INFO,
"moved %s to %s\n",
ChrPtr(NW->tempFileName),
ChrPtr(NW->SpoolFileName));
AsyncIO *IO = &NW->IO;
SetNWCState(IO, eNWCVSNDOPDone);
StrBufPlain(NW->IO.SendBuf.Buf, HKEY("CLOS\n"));
- NWC_DBG_SEND();
return eSendReply;
}
eNextState NWC_ReadCLOSReply(AsyncNetworker *NW)
{
AsyncIO *IO = &NW->IO;
- NWC_DBG_READ();
FDIOBufferDelete(&IO->IOB);
if (ChrPtr(NW->IO.IOBuf)[0] != '2')
return eTerminateConnection;
fd = open(ChrPtr(NW->SpoolFileName), O_EXCL|O_NONBLOCK|O_RDONLY);
if (fd < 0) {
if (errno != ENOENT) {
- EVN_syslog(LOG_CRIT,
+ syslog(LOG_CRIT,
"cannot open %s: %s\n",
ChrPtr(NW->SpoolFileName),
strerror(errno));
}
NW->State = eQUIT;
rc = NWC_SendQUIT(NW);
- NWC_DBG_SEND();
return rc;
}
if (fstat(fd, &statbuf) == -1) {
- EVN_syslog(LOG_CRIT, "FSTAT FAILED %s [%s]--\n",
+ syslog(LOG_CRIT, "FSTAT FAILED %s [%s]--\n",
ChrPtr(NW->SpoolFileName),
strerror(errno));
if (fd > 0) close(fd);
}
TotalSendSize = statbuf.st_size;
if (TotalSendSize == 0) {
- EVNM_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"Nothing to send.\n");
NW->State = eQUIT;
rc = NWC_SendQUIT(NW);
- NWC_DBG_SEND();
if (fd > 0) close(fd);
return rc;
}
else
{
- EVN_syslog(LOG_INFO,
+ syslog(LOG_INFO,
"sending %s to %s\n",
ChrPtr(NW->SpoolFileName),
ChrPtr(NW->node));
FDIOBufferInit(&NW->IO.IOB, &NW->IO.SendBuf, fd, TotalSendSize);
StrBufPlain(NW->IO.SendBuf.Buf, HKEY("NUOP\n"));
- NWC_DBG_SEND();
return eSendReply;
}
eNextState NWC_ReadNUOPReply(AsyncNetworker *NW)
{
AsyncIO *IO = &NW->IO;
- NWC_DBG_READ();
if (ChrPtr(NW->IO.IOBuf)[0] != '2') {
FDIOBufferDelete(&IO->IOB);
return eAbort;
eNextState NWC_SendWRIT(AsyncNetworker *NW)
{
- AsyncIO *IO = &NW->IO;
StrBufPrintf(NW->IO.SendBuf.Buf, "WRIT "LOFF_T_FMT"\n",
NW->IO.IOB.TotalSendSize - NW->IO.IOB.TotalSentAlready);
- NWC_DBG_SEND();
return eSendReply;
}
eNextState NWC_ReadWRITReply(AsyncNetworker *NW)
{
AsyncIO *IO = &NW->IO;
- NWC_DBG_READ();
if (ChrPtr(NW->IO.IOBuf)[0] != '7')
{
FDIOBufferDelete(&IO->IOB);
eNextState NWC_SendUCLS(AsyncNetworker *NW)
{
- AsyncIO *IO = &NW->IO;
StrBufPlain(NW->IO.SendBuf.Buf, HKEY("UCLS 1\n"));
- NWC_DBG_SEND();
return eSendReply;
}
eNextState NWC_ReadUCLS(AsyncNetworker *NW)
{
AsyncIO *IO = &NW->IO;
- NWC_DBG_READ();
- EVN_syslog(LOG_NOTICE,
+ syslog(LOG_NOTICE,
"Sent %s [%ld] octets to <%s>\n",
ChrPtr(NW->SpoolFileName),
NW->IO.IOB.ChunkSize,
ChrPtr(NW->node));
if (ChrPtr(NW->IO.IOBuf)[0] == '2') {
- EVN_syslog(LOG_DEBUG, "Removing <%s>\n", ChrPtr(NW->SpoolFileName));
+ syslog(LOG_DEBUG, "Removing <%s>\n", ChrPtr(NW->SpoolFileName));
unlink(ChrPtr(NW->SpoolFileName));
}
FDIOBufferDelete(&IO->IOB);
eNextState NWC_SendQUIT(AsyncNetworker *NW)
{
- AsyncIO *IO = &NW->IO;
StrBufPlain(NW->IO.SendBuf.Buf, HKEY("QUIT\n"));
- NWC_DBG_SEND();
return eSendReply;
}
eNextState NWC_ReadQUIT(AsyncNetworker *NW)
{
- AsyncIO *IO = &NW->IO;
- NWC_DBG_READ();
-
return eAbort;
}
};
-
-
eNextState nwc_get_one_host_ip_done(AsyncIO *IO)
{
AsyncNetworker *NW = IO->Data;
* here we start with the lookup of one host.
*/
- EVN_syslog(LOG_DEBUG, "NWC: %s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "NWC: %s\n", __FUNCTION__);
- EVN_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"NWC client[%ld]: looking up %s-Record %s : %d ...\n",
NW->n,
(NW->IO.ConnectMe->IPv6)? "aaaa": "a",
{
double Timeout = 0.0;
- //EVN_syslog(LOG_DEBUG, "%s - %d\n", __FUNCTION__, NextTCPState);
+ //syslog(LOG_DEBUG, "%s - %d\n", __FUNCTION__, NextTCPState);
switch (NextTCPState) {
case eSendMore:
return;
}
if (Timeout > 0) {
- AsyncIO *IO = &NW->IO;
- EVN_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"%s - %d %f\n",
__FUNCTION__,
NextTCPState,
eNextState NWC_DispatchReadDone(AsyncIO *IO)
{
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
AsyncNetworker *NW = IO->Data;
eNextState rc;
}
eNextState NWC_DispatchWriteDone(AsyncIO *IO)
{
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
AsyncNetworker *NW = IO->Data;
eNextState rc;
/*****************************************************************************/
eNextState NWC_Terminate(AsyncIO *IO)
{
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
FinalizeNetworker(IO);
return eAbort;
}
eNextState NWC_TerminateDB(AsyncIO *IO)
{
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
FinalizeNetworker(IO);
return eAbort;
}
eNextState NWC_Timeout(AsyncIO *IO)
{
AsyncNetworker *NW = IO->Data;
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
if (NW->IO.ErrMsg == NULL)
NW->IO.ErrMsg = NewStrBuf();
{
AsyncNetworker *NW = IO->Data;
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
if (NW->IO.ErrMsg == NULL)
NW->IO.ErrMsg = NewStrBuf();
StrBufPrintf(NW->IO.ErrMsg, "failed to connect %s \r\n", ChrPtr(NW->host));
{
AsyncNetworker *NW = IO->Data;
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
if (NW->IO.ErrMsg == NULL)
NW->IO.ErrMsg = NewStrBuf();
StrBufPrintf(NW->IO.ErrMsg, "failed to look up %s \r\n", ChrPtr(NW->host));
}
eNextState NWC_Shutdown(AsyncIO *IO)
{
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
FinalizeNetworker(IO);
return eAbort;
AsyncNetworker *NW = IO->Data;
SetNWCState(&NW->IO, eNWCVSConnecting);
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
- EVN_syslog(LOG_NOTICE, "Connecting to <%s> at %s:%s\n",
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_NOTICE, "Connecting to <%s> at %s:%s\n",
ChrPtr(NW->node),
ChrPtr(NW->host),
ChrPtr(NW->port));
int poll = 0;
if (GetCount(ignetcfg) ==0) {
- MARKM_syslog(LOG_DEBUG, "network: no neighbor nodes are configured - not polling.\n");
+ syslog(LOG_DEBUG, "network: no neighbor nodes are configured - not polling.\n");
return;
}
become_session(&networker_client_CC);
DeleteHash(&working_ignetcfg);
}
-void LogDebugEnableNetworkClient(const int n)
-{
- NetworkClientDebugEnabled = n;
-}
/*
* Module entry point
*/
if (!threading)
{
CtdlFillSystemContext(&networker_client_CC, "CitNetworker");
-
CtdlRegisterSessionHook(network_do_clientqueue, EVT_TIMER, PRIO_SEND + 10);
- CtdlRegisterDebugFlagHook(HKEY("networkclient"), LogDebugEnableNetworkClient, &NetworkClientDebugEnabled);
}
return "networkclient";
int EnableSMTPLog = 0;
-#define SMTPLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (EnableSMTPLog != 0))
-
-#define SMTP_syslog(LEVEL, FORMAT, ...) \
- SMTPLOG(LEVEL) syslog(LEVEL, \
- "%s CC[%d]: " FORMAT, IOSTR, CCCID, __VA_ARGS__)
-
-#define SMTPM_syslog(LEVEL, FORMAT) \
- SMTPLOG(LEVEL) syslog(LEVEL, \
- "%s CC[%d]: " FORMAT, IOSTR, CCCID);
-
HashList *SMTPCmds = NULL;
#define MaxSMTPCmdLen 10
void smtp_auth_greeting(long offset, long Flags) {
struct CitContext *CCC = CC;
cprintf("235 Hello, %s\r\n", CCC->user.fullname);
- SMTP_syslog(LOG_NOTICE, "SMTP authenticated %s", CCC->user.fullname);
+ syslog(LOG_NOTICE, "SMTP authenticated %s", CCC->user.fullname);
CCC->internal_pgm = 0;
CCC->cs_flags &= ~CS_STEALTH;
}
*/
void smtp_get_pass(long offset, long Flags)
{
- struct CitContext *CCC = CC;
citsmtp *sSMTP = SMTP;
char password[SIZ];
memset(password, 0, sizeof(password));
StrBufDecodeBase64(sSMTP->Cmd);
- SMTP_syslog(LOG_DEBUG, "Trying <%s>", password);
+ syslog(LOG_DEBUG, "Trying <%s>", password);
if (CtdlTryPassword(SKEY(sSMTP->Cmd)) == pass_ok) {
smtp_auth_greeting(offset, Flags);
}
*/
else if (CtdlGetConfigInt("c_allow_spoofing") == 0) {
process_rfc822_addr(ChrPtr(sSMTP->from), user, node, name);
- SMTP_syslog(LOG_DEBUG, "Claimed envelope sender is '%s' == '%s' @ '%s' ('%s')",
+ syslog(LOG_DEBUG, "Claimed envelope sender is '%s' == '%s' @ '%s' ('%s')",
ChrPtr(sSMTP->from), user, node, name
);
if (CtdlHostAlias(node) != hostalias_nomatch) {
cprintf("550 You must log in to send mail from %s\r\n", node);
FlushStrBuf(sSMTP->from);
- SMTP_syslog(LOG_DEBUG, "Rejecting unauthenticated mail from %s", node);
+ syslog(LOG_DEBUG, "Rejecting unauthenticated mail from %s", node);
return;
}
}
return;
}
- SMTPM_syslog(LOG_DEBUG, "Converting message...");
+ syslog(LOG_DEBUG, "Converting message...");
msg = convert_internet_message_buf(&body);
/* If the user is locally authenticated, FORCE the From: header to
}
if (!validemail && (CtdlGetConfigInt("c_rfc822_strict_from") == CFG_SMTP_FROM_REJECT)) {
- SMTP_syslog(LOG_ERR, "invalid sender '%s' - rejecting this message", msg->cm_fields[erFc822Addr]);
+ syslog(LOG_ERR, "invalid sender '%s' - rejecting this message", msg->cm_fields[erFc822Addr]);
cprintf("550 Invalid sender '%s' - rejecting this message.\r\n", msg->cm_fields[erFc822Addr]);
return;
}
/* Write something to the syslog(which may or may not be where the
* rest of the Citadel logs are going; some sysadmins want LOG_MAIL).
*/
- SMTP_syslog((LOG_MAIL | LOG_INFO),
+ syslog((LOG_MAIL | LOG_INFO),
"%ld: from=<%s>, nrcpts=%d, relay=%s [%s], stat=%s",
msgnum,
ChrPtr(sSMTP->from),
char CMD[MaxSMTPCmdLen + 1];
if (sSMTP == NULL) {
- SMTPM_syslog(LOG_EMERG, "Session SMTP data is null. WTF? We will crash now.");
+ syslog(LOG_EMERG, "Session SMTP data is null. WTF? We will crash now.");
return cit_panic_backtrace (0);
}
time(&CCC->lastcmd);
if (CtdlClientGetLine(sSMTP->Cmd) < 1) {
- SMTPM_syslog(LOG_CRIT, "SMTP: client disconnected: ending session.");
+ syslog(LOG_CRIT, "SMTP: client disconnected: ending session.");
CC->kill_me = KILLME_CLIENT_DISCONNECTED;
return;
}
- SMTP_syslog(LOG_DEBUG, "SMTP server: %s", ChrPtr(sSMTP->Cmd));
+ syslog(LOG_DEBUG, "SMTP server: %s", ChrPtr(sSMTP->Cmd));
if (sSMTP->command_state == smtp_user) {
if (!strncmp(ChrPtr(sSMTP->Cmd), AuthPlainStr.Key, AuthPlainStr.len))
/* Don't do this stuff if this is not an SMTP session! */
if (CCC->h_command_function != smtp_command_loop) return;
- SMTPM_syslog(LOG_DEBUG, "Performing SMTP cleanup hook");
+ syslog(LOG_DEBUG, "Performing SMTP cleanup hook");
FreeStrBuf(&sSMTP->Cmd);
FreeStrBuf(&sSMTP->helo_node);
const char *CitadelServiceSMTP_LMTP="LMTP";
const char *CitadelServiceSMTP_LMTP_UNF="LMTP-UnF";
-void DebugSMTPEnable(const int n)
-{
- EnableSMTPLog = n;
-}
CTDL_MODULE_INIT(smtp)
{
if (!threading)
{
- CtdlRegisterDebugFlagHook(HKEY("SMTP"), DebugSMTPEnable, &EnableSMTPLog);
-
SMTPCmds = NewHash(1, NULL);
RegisterSmtpCMD("AUTH", smtp_auth, 0);
memcpy(CCC->cs_clientname, SMTPStates[State].Key, SMTPStates[State].len + 1);
}
-int SMTPClientDebugEnabled = 0;
void DeleteSmtpOutMsg(void *v)
{
SmtpOutMsg *Msg = v;
- AsyncIO *IO = &Msg->IO;
- EV_syslog(LOG_DEBUG, "%s Exit\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s Exit\n", __FUNCTION__);
/* these are kept in our own space and free'd below */
Msg->IO.ConnectMe = NULL;
Status = "Delivery failed temporarily; will retry later.";
}
- EVS_syslog(LOG_INFO,
+ syslog(LOG_INFO,
"%s Time[%fs] Recipient <%s> @ <%s> (%s) Status message: %s\n",
Status,
Msg->IO.Now - Msg->IO.StartIO,
* Uncompleted delivery instructions remain, so delete the old
* instructions and replace with the updated ones.
*/
- EVS_syslog(LOG_DEBUG, "%ld", Msg->MyQItem->QueMsgID);
+ syslog(LOG_DEBUG, "%ld", Msg->MyQItem->QueMsgID);
CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
Msg->MyQItem->QueMsgID = -1;
CM_SetField(msg, eMsgSubject, HKEY("QMSG"));
Msg->MyQItem->QueMsgID =
CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
- EVS_syslog(LOG_DEBUG, "%ld", Msg->MyQItem->QueMsgID);
+ syslog(LOG_DEBUG, "%ld", Msg->MyQItem->QueMsgID);
CM_Free(msg);
}
else {
!Msg->pCurrRelay->IsRelay &&
Msg->MyQItem->HaveRelay)
{
- EVS_syslog(LOG_DEBUG, "%s Aborting; last relay failed.\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s Aborting; last relay failed.\n", __FUNCTION__);
return FinalizeMessageSend(Msg);
}
if (Msg->pCurrRelay == NULL) {
- EVS_syslog(LOG_DEBUG, "%s Aborting\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s Aborting\n", __FUNCTION__);
return FinalizeMessageSend(Msg);
}
if (Msg->pCurrRelay->IsIP) {
- EVS_syslog(LOG_DEBUG, "%s connecting IP\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s connecting IP\n", __FUNCTION__);
return mx_connect_ip(IO);
}
else {
- EVS_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"%s resolving next MX Record\n",
__FUNCTION__);
return get_one_mx_host_ip(IO);
if (Msg->mx_host == NULL)
Msg->mx_host = "<no MX-Record>";
- EVS_syslog(LOG_INFO,
+ syslog(LOG_INFO,
"connecting to %s [%s]:%d ...\n",
Msg->mx_host,
buf,
SmtpOutMsg *Msg = IO->Data;
SetSMTPState(IO, eSTMPconnecting);
- EVS_syslog(LOG_DEBUG, "%s(%s)\n", __FUNCTION__, (Msg->IsRelay)? "Relay":"Remote");
+ syslog(LOG_DEBUG, "%s(%s)\n", __FUNCTION__, (Msg->IsRelay)? "Relay":"Remote");
IO->ConnectMe = Msg->pCurrRelay;
Msg->State = eConnectMX;
IO->ConnectMe = Msg->pCurrRelay;
QueryCbDone(IO);
- EVS_syslog(LOG_DEBUG, "%s Time[%fs]\n",
+ syslog(LOG_DEBUG, "%s Time[%fs]\n",
__FUNCTION__,
IO->Now - IO->DNS.Start);
*/
SetSMTPState(IO, (Msg->pCurrRelay->IPv6)?eSTMPalookup:eSTMPaaaalookup);
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
- EVS_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"looking up %s-Record %s : %d ...\n",
(Msg->pCurrRelay->IPv6)? "aaaa": "a",
Msg->pCurrRelay->Host,
QueryCbDone(IO);
- EVS_syslog(LOG_DEBUG, "%s Time[%fs]\n",
+ syslog(LOG_DEBUG, "%s Time[%fs]\n",
__FUNCTION__,
IO->Now - IO->DNS.Start);
SetSMTPState(IO, eSTMPmxlookup);
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
/* start resolving MX records here. */
if (!QueueQuery(ns_t_mx,
Msg->node,
{
SmtpOutMsg *Msg;
- SMTPC_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
Msg = new_smtp_outmsg(MyQItem, MyQEntry, MsgCount);
if (Msg == NULL) {
- SMTPC_syslog(LOG_DEBUG, "%s Failed to alocate message context.\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s Failed to alocate message context.\n", __FUNCTION__);
if (KeepMsgText)
FreeStrBuf (&MsgText);
return;
sizeof(((CitContext *)
Msg->IO.CitContext)->cs_host));
- SMTPC_syslog(LOG_DEBUG, "Starting: [%ld] <%s> CC <%d> \n",
+ syslog(LOG_DEBUG, "Starting: [%ld] <%s> CC <%d> \n",
Msg->MyQItem->MessageID,
ChrPtr(Msg->MyQEntry->Recipient),
((CitContext*)Msg->IO.CitContext)->cs_pid);
void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *Msg)
{
double Timeout = 0.0;
- AsyncIO *IO = &Msg->IO;
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
switch (NextTCPState) {
case eSendFile:
}
eNextState SMTP_C_DispatchReadDone(AsyncIO *IO)
{
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
SmtpOutMsg *Msg = IO->Data;
eNextState rc;
}
eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO)
{
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
SmtpOutMsg *Msg = IO->Data;
eNextState rc;
{
SmtpOutMsg *Msg = IO->Data;
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
return FinalizeMessageSend(Msg);
}
eNextState SMTP_C_TerminateDB(AsyncIO *IO)
{
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
return Terminate(IO);
}
eNextState SMTP_C_Timeout(AsyncIO *IO)
SmtpOutMsg *Msg = IO->Data;
Msg->MyQEntry->Status = 4;
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
StrBufPrintf(IO->ErrMsg, "Timeout: %s while talking to %s",
ReadErrors[Msg->State].Key,
Msg->mx_host);
SmtpOutMsg *Msg = IO->Data;
Msg->MyQEntry->Status = 4;
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
StrBufPrintf(IO->ErrMsg, "Connection failure: %s while talking to %s",
ReadErrors[Msg->State].Key,
Msg->mx_host);
{
SmtpOutMsg *Msg = IO->Data;
Msg->MyQEntry->Status = 4;
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
return FailOneAttempt(IO);
}
eNextState SMTP_C_Shutdown(AsyncIO *IO)
{
- EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
SmtpOutMsg *Msg = IO->Data;
switch (IO->NextState) {
return Finished;
}
-void LogDebugEnableSMTPClient(const int n)
-{
- SMTPClientDebugEnabled = n;
-}
-
CTDL_MODULE_INIT(smtp_eventclient)
{
- if (!threading)
- CtdlRegisterDebugFlagHook(HKEY("smtpeventclient"), LogDebugEnableSMTPClient, &SMTPClientDebugEnabled);
+ if (!threading) {
+ // nothing here
+ }
return "smtpeventclient";
}
#define SMTP_IS_STATE(WHICH_STATE) (ChrPtr(Msg->IO.IOBuf)[0] == WHICH_STATE)
#define SMTP_DBG_SEND() \
- EVS_syslog(LOG_DEBUG, "> %s\n", ChrPtr(Msg->IO.SendBuf.Buf))
+ syslog(LOG_DEBUG, "> %s\n", ChrPtr(Msg->IO.SendBuf.Buf))
#define SMTP_DBG_READ() \
- EVS_syslog(LOG_DEBUG, "< %s\n", ChrPtr(Msg->IO.IOBuf))
+ syslog(LOG_DEBUG, "< %s\n", ChrPtr(Msg->IO.IOBuf))
/*
* if a Read handler wants to skip to a specific part use this macro.
eNextState SMTPC_send_EHLO(SmtpOutMsg *Msg)
{
- 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. */
eNextState SMTPC_read_EHLO_reply(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
SMTP_DBG_READ();
if (SMTP_IS_STATE('2')) {
eNextState STMPC_send_HELO(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
StrBufPrintf(Msg->IO.SendBuf.Buf, "HELO %s\r\n", CtdlGetConfigStr("c_fqdn"));
SMTP_DBG_SEND();
eNextState SMTPC_read_HELO_reply(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
SMTP_DBG_READ();
if (!SMTP_IS_STATE('2'))
eNextState SMTPC_send_auth(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
char buf[SIZ];
char encoded[1024];
eNextState SMTPC_read_auth_reply(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
/* Do an AUTH command if necessary */
SMTP_DBG_READ();
eNextState SMTPC_send_authplain_1(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
char buf[SIZ];
char encoded[1024];
long encodedlen;
}
eNextState SMTPC_read_auth_plain_reply_1(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
/* Do an AUTH command if necessary */
SMTP_DBG_READ();
eNextState SMTPC_send_authplain_2(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
char buf[SIZ];
char encoded[1024];
long encodedlen;
}
eNextState SMTPC_read_auth_plain_reply_2(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
/* Do an AUTH command if necessary */
SMTP_DBG_READ();
eNextState SMTPC_send_FROM(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
/* previous command succeeded, now try the MAIL FROM: command */
StrBufPrintf(Msg->IO.SendBuf.Buf,
"MAIL FROM:<%s>\r\n",
eNextState SMTPC_read_FROM_reply(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
SMTP_DBG_READ();
if (!SMTP_IS_STATE('2')) {
eNextState SMTPC_send_RCPT(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
/* MAIL succeeded, now try the RCPT To: command */
StrBufPrintf(Msg->IO.SendBuf.Buf,
"RCPT TO:<%s@%s>\r\n",
eNextState SMTPC_read_RCPT_reply(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
SMTP_DBG_READ();
if (!SMTP_IS_STATE('2')) {
eNextState SMTPC_send_DATAcmd(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
/* RCPT succeeded, now try the DATA command */
StrBufPlain(Msg->IO.SendBuf.Buf,
HKEY("DATA\r\n"));
eNextState SMTPC_send_QUIT(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
StrBufPlain(Msg->IO.SendBuf.Buf,
HKEY("QUIT\r\n"));
eNextState SMTPC_read_QUIT_reply(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
SMTP_DBG_READ();
- EVS_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"delivery to <%s> @ <%s> (%s) succeeded\n",
Msg->user,
Msg->node,
int smtp_resolve_recipients(SmtpOutMsg *Msg)
{
- AsyncIO *IO = &Msg->IO;
const char *ptr;
char buf[1024];
int scan_done;
int lp, rp;
int i;
- EVNCS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
if ((Msg==NULL) ||
(Msg->MyQEntry == NULL) ||
Msg->node,
Msg->name);
- EVNCS_syslog(LOG_DEBUG,
+ syslog(LOG_DEBUG,
"Attempting delivery to <%s> @ <%s> (%s)\n",
Msg->user,
Msg->node,
#define N ((SmtpOutMsg*)IO->Data)->n
#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (SMTPClientDebugEnabled != 0))
-#define EVS_syslog(LEVEL, FORMAT, ...) \
- DBGLOG(LEVEL) syslog(LEVEL, \
- "SMTPC:%s[%ld]CC[%d]S[%ld][%ld] " FORMAT, \
- IOSTR, IO->ID, CCID, QID, N, __VA_ARGS__)
-
-#define EVSM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, \
- "SMTPC:%s[%ld]CC[%d]S[%ld][%ld] " FORMAT, \
- IOSTR, IO->ID, CCID, QID, N)
-
-#define EVNCS_syslog(LEVEL, FORMAT, ...) \
- DBGLOG(LEVEL) syslog(LEVEL, "SMTPC:%s[%ld]S[%ld][%ld] " FORMAT, \
- IOSTR, IO->ID, QID, N, __VA_ARGS__)
-
-#define EVNCSM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, "SMTPC:%s[%ld]S[%ld][%ld] " FORMAT, \
- IOSTR, IO->ID, QID, N)
-
-#define SMTPC_syslog(LEVEL, FORMAT, ...) \
- DBGLOG(LEVEL) syslog(LEVEL, \
- "SMTPCQ: " FORMAT, \
- __VA_ARGS__)
-
-#define SMTPCM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, \
- "SMTPCQ: " FORMAT)
-
-
-
typedef enum __smtpstate {
eSTMPmxlookup,
eSTMPevaluatenext,
projects / citadel.git / commitdiff