* This module handles shared rooms, inter-Citadel mail, and outbound
* mailing list processing.
*
- * Copyright (c) 2000-2012 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.
+ * 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.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
* ** NOTE ** A word on the S_NETCONFIGS semaphore:
* This is a fairly high-level type of critical section. It ensures that no
#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, "netpoll: %s", __FUNCTION__);
- strs[0] = ChrPtr(NW->node);
- lens[0] = StrLength(NW->node);
-
- strs[1] = ChrPtr(NW->IO.ErrMsg);
- lens[1] = StrLength(NW->IO.ErrMsg);
- CtdlAideFPMessage(
- ChrPtr(NW->IO.ErrMsg),
- "Networker error",
- 2, strs, (long*) &lens,
- IO->Now,
- IO->ID, CCID);
-
+ CtdlAideMessage(ChrPtr(NW->IO.ErrMsg), "Networker error");
return eAbort;
}
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, "netpoll: %s", ChrPtr(NW->IO.ErrMsg));
return EventQueueDBOperation(IO, NWC_SendFailureMessage, 1);
}
SetNWCState(IO, eNWCVSAuth);
/* We're talking to the correct node. Now identify ourselves. */
StrBufPrintf(NW->IO.SendBuf.Buf, "NETP %s|%s\n",
- config.c_nodename,
+ 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,
- "Already talking to %s; skipping this time.\n",
- ChrPtr(NW->node));
+ syslog(LOG_INFO, "netpoll: already talking to %s; skipping this time.", ChrPtr(NW->node));
}
else {
SetNWCState(IO, eNWCVSAuthFailNTT);
- EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
+ syslog(LOG_ERR, "netpoll: %s", 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,
- "Expecting to transfer %d bytes to %s\n",
- TotalSendSize,
- ChrPtr(NW->tempFileName));
+ syslog(LogLevel, "netpoll: expecting to transfer %d bytes to %s", TotalSendSize, ChrPtr(NW->tempFileName));
if (TotalSendSize <= 0) {
NW->State = eNUOP - 1;
if (fd < 0)
{
SetNWCState(IO, eNWCVSFail);
- EVN_syslog(LOG_CRIT,
- "cannot open %s: %s\n",
- ChrPtr(NW->tempFileName),
- strerror(errno));
+ syslog(LOG_ERR, "%s: %s", ChrPtr(NW->tempFileName), strerror(errno));
NW->State = eQUIT - 1;
return eAbort;
StrBufPrintf(NW->IO.SendBuf.Buf, "READ "LOFF_T_FMT"|%ld\n",
NW->IO.IOB.TotalSentAlready,
NW->IO.IOB.TotalSendSize);
-/*
- ((NW->IO.IOB.TotalSendSize - NW->IO.IOB.TotalSentAlready > IGNET_PACKET_SIZE)
- ? IGNET_PACKET_SIZE :
- (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,
- "Could not link %s to %s: %s\n",
- ChrPtr(NW->tempFileName),
- ChrPtr(NW->SpoolFileName),
- strerror(errno));
+ syslog(LOG_ERR, "netpoll: could not link %s to %s: %s", ChrPtr(NW->tempFileName), ChrPtr(NW->SpoolFileName), strerror(errno));
}
else {
- EVN_syslog(LOG_INFO,
- "moved %s to %s\n",
- ChrPtr(NW->tempFileName),
- ChrPtr(NW->SpoolFileName));
+ syslog(LOG_INFO, "netpoll: moved %s to %s", ChrPtr(NW->tempFileName), ChrPtr(NW->SpoolFileName));
}
unlink(ChrPtr(NW->tempFileName));
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,
- "Could not link %s to %s: %s\n",
- ChrPtr(NW->tempFileName),
- ChrPtr(NW->SpoolFileName),
- strerror(errno));
+ syslog(LOG_ERR, "netpoll: could not link %s to %s: %s", ChrPtr(NW->tempFileName), ChrPtr(NW->SpoolFileName), strerror(errno));
}
else {
- EVN_syslog(LOG_INFO,
- "moved %s to %s\n",
- ChrPtr(NW->tempFileName),
- ChrPtr(NW->SpoolFileName));
+ syslog(LOG_INFO, "netpoll: moved %s to %s", ChrPtr(NW->tempFileName), ChrPtr(NW->SpoolFileName));
}
unlink(ChrPtr(NW->tempFileName));
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,
- "cannot open %s: %s\n",
- ChrPtr(NW->SpoolFileName),
- strerror(errno));
+ syslog(LOG_ERR, "%s: %s", 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",
- ChrPtr(NW->SpoolFileName),
- strerror(errno));
+ syslog(LOG_ERR, "%s: %s", ChrPtr(NW->SpoolFileName), strerror(errno));
if (fd > 0) close(fd);
return eAbort;
}
TotalSendSize = statbuf.st_size;
if (TotalSendSize == 0) {
- EVNM_syslog(LOG_DEBUG,
- "Nothing to send.\n");
+ syslog(LOG_DEBUG, "netpoll: nothing to send.");
NW->State = eQUIT;
rc = NWC_SendQUIT(NW);
- NWC_DBG_SEND();
if (fd > 0) close(fd);
return rc;
}
else
{
- EVN_syslog(LOG_INFO,
- "sending %s to %s\n",
- ChrPtr(NW->SpoolFileName),
- ChrPtr(NW->node));
+ syslog(LOG_INFO, "netpoll: sending %s to %s", 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,
- "Sent %s [%ld] octets to <%s>\n",
- ChrPtr(NW->SpoolFileName),
- NW->IO.IOB.ChunkSize,
- ChrPtr(NW->node));
+ syslog(LOG_INFO, "netpoll: sent %s (%ld octets) to <%s>", 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, "netpoll: %s", __FUNCTION__);
- EVN_syslog(LOG_DEBUG,
- "NWC client[%ld]: looking up %s-Record %s : %d ...\n",
+ syslog(LOG_DEBUG,
+ "netpoll: [%ld]: looking up %s-Record %s : %d ...",
NW->n,
(NW->IO.ConnectMe->IPv6)? "aaaa": "a",
NW->IO.ConnectMe->Host,
{
double Timeout = 0.0;
- //EVN_syslog(LOG_DEBUG, "%s - %d\n", __FUNCTION__, NextTCPState);
-
switch (NextTCPState) {
case eSendMore:
case eSendReply:
return;
}
if (Timeout > 0) {
- AsyncIO *IO = &NW->IO;
- EVN_syslog(LOG_DEBUG,
- "%s - %d %f\n",
- __FUNCTION__,
- NextTCPState,
- Timeout);
+ syslog(LOG_DEBUG, "netpoll: %s - %d %f", __FUNCTION__, NextTCPState, Timeout);
SetNextTimeout(&NW->IO, Timeout*100);
}
}
eNextState NWC_DispatchReadDone(AsyncIO *IO)
{
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "netpoll: %s", __FUNCTION__);
AsyncNetworker *NW = IO->Data;
eNextState rc;
}
eNextState NWC_DispatchWriteDone(AsyncIO *IO)
{
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "netpoll: %s", __FUNCTION__);
AsyncNetworker *NW = IO->Data;
eNextState rc;
/*****************************************************************************/
eNextState NWC_Terminate(AsyncIO *IO)
{
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "netpoll: %s", __FUNCTION__);
FinalizeNetworker(IO);
return eAbort;
}
eNextState NWC_TerminateDB(AsyncIO *IO)
{
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "netpoll: %s", __FUNCTION__);
FinalizeNetworker(IO);
return eAbort;
}
eNextState NWC_Timeout(AsyncIO *IO)
{
AsyncNetworker *NW = IO->Data;
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "netpoll: %s", __FUNCTION__);
if (NW->IO.ErrMsg == NULL)
NW->IO.ErrMsg = NewStrBuf();
{
AsyncNetworker *NW = IO->Data;
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ syslog(LOG_DEBUG, "netpoll: %s", __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, "netpoll: %s", __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, "netpoll: %s", __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",
- ChrPtr(NW->node),
- ChrPtr(NW->host),
- ChrPtr(NW->port));
+ syslog(LOG_DEBUG, "netpoll: %s", __FUNCTION__);
+ syslog(LOG_INFO, "netpoll: onnecting to <%s> at %s:%s", ChrPtr(NW->node), ChrPtr(NW->host), ChrPtr(NW->port));
return EvConnectSock(IO,
NWC_ConnTimeout,
{
NW->n = NetworkerCount++;
CtdlNetworkTalkingTo(SKEY(NW->node), NTT_ADD);
- syslog(LOG_DEBUG, "NW[%s][%ld]: polling\n", ChrPtr(NW->node), NW->n);
+ syslog(LOG_DEBUG, "netpoll: NW[%s][%ld]: polling", ChrPtr(NW->node), NW->n);
ParseURL(&NW->IO.ConnectMe, NW->Url, 504);
InitIOStruct(&NW->IO,
}
}
+
/*
* Poll other Citadel nodes and transfer inbound/outbound network data.
* Set "full" to nonzero to force a poll of every node, or to zero to poll
int poll = 0;
if (GetCount(ignetcfg) ==0) {
- syslog(LOG_DEBUG, "network: no neighbor nodes are configured - not polling.\n");
+ syslog(LOG_DEBUG, "netpoll: no neighbor nodes are configured - not polling");
return;
}
become_session(&networker_client_CC);
}
}
}
- if (poll &&
- (StrLength(NW->host) > 0) &&
- strcmp("0.0.0.0", ChrPtr(NW->host)))
+ if (poll && (StrLength(NW->host) > 0) && strcmp("0.0.0.0", ChrPtr(NW->host)))
{
NW->Url = NewStrBuf();
- StrBufPrintf(NW->Url, "citadel://%s@%s:%s",
- ChrPtr(NW->secret),
- ChrPtr(NW->host),
- ChrPtr(NW->port));
+ StrBufPrintf(NW->Url, "citadel://%s@%s:%s", ChrPtr(NW->secret), ChrPtr(NW->host), ChrPtr(NW->port));
if (!CtdlNetworkTalkingTo(SKEY(NW->node), NTT_CHECK))
{
RunNetworker(NW);
* Run the full set of processing tasks no more frequently
* than once every n seconds
*/
- if ( (time(NULL) - last_run) < config.c_net_freq ) {
+ if ( (time(NULL) - last_run) < CtdlGetConfigLong("c_net_freq") )
+ {
full_processing = 0;
- syslog(LOG_DEBUG, "Network full processing in %ld seconds.\n",
- config.c_net_freq - (time(NULL)- last_run)
+ syslog(LOG_DEBUG, "netpoll: full processing in %ld seconds.",
+ CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run)
);
}
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";
projects / citadel.git / blobdiff