* This module handles shared rooms, inter-Citadel mail, and outbound
* mailing list processing.
*
- * Copyright (c) 2000-2011 by the citadel.org team
+ * Copyright (c) 2000-2012 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 as published by
#define NODE ChrPtr(((AsyncNetworker*)IO->Data)->node)
#define N ((AsyncNetworker*)IO->Data)->n
+int NetworkClientDebugEnabled = 0;
+
+#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (NetworkClientDebugEnabled != 0))
+
#define EVN_syslog(LEVEL, FORMAT, ...) \
- syslog(LEVEL, \
+ DBGLOG(LEVEL) syslog(LEVEL, \
"IO[%ld]CC[%d]NW[%s][%ld]" FORMAT, \
IO->ID, CCID, NODE, N, __VA_ARGS__)
#define EVNM_syslog(LEVEL, FORMAT) \
- syslog(LEVEL, \
+ DBGLOG(LEVEL) syslog(LEVEL, \
"IO[%ld]CC[%d]NW[%s][%ld]" FORMAT, \
IO->ID, CCID, NODE, N)
#define EVNCS_syslog(LEVEL, FORMAT, ...) \
- syslog(LEVEL, "IO[%ld]NW[%s][%ld]" FORMAT, \
+ DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]NW[%s][%ld]" FORMAT, \
IO->ID, NODE, N, __VA_ARGS__)
#define EVNCSM_syslog(LEVEL, FORMAT) \
- syslog(LEVEL, "IO[%ld]NW[%s][%ld]" FORMAT, \
+ DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]NW[%s][%ld]" FORMAT, \
IO->ID, NODE, N)
FreeStrBuf(&NW->port);
FreeStrBuf(&NW->secret);
FreeStrBuf(&NW->Url);
+ FreeStrBuf(&NW->IO.ErrMsg);
FreeAsyncIOContents(&NW->IO);
+ if (NW->HostLookup.VParsedDNSReply != NULL) {
+ NW->HostLookup.DNSReplyFree(NW->HostLookup.VParsedDNSReply);
+ NW->HostLookup.VParsedDNSReply = NULL;
+ }
free(NW);
}
extract_token (connected_to, ChrPtr(NW->IO.IOBuf), 1, ' ', sizeof connected_to);
if (strcmp(connected_to, ChrPtr(NW->node)) != 0)
{
+ if (NW->IO.ErrMsg == NULL)
+ NW->IO.ErrMsg = NewStrBuf();
StrBufPrintf(NW->IO.ErrMsg,
"Connected to node \"%s\" but I was expecting to connect to node \"%s\".",
connected_to, ChrPtr(NW->node));
}
else
{
+ if (NW->IO.ErrMsg == NULL)
+ NW->IO.ErrMsg = NewStrBuf();
StrBufPrintf(NW->IO.ErrMsg,
"Connected to node \"%s\" but my secret wasn't accurate.",
ChrPtr(NW->node));
AsyncIO *IO = &NW->IO;
NW->tempFileName = NewStrBuf();
NW->SpoolFileName = NewStrBuf();
- StrBufPrintf(NW->tempFileName,
+ StrBufPrintf(NW->SpoolFileName,
"%s/%s.%lx%x",
ctdl_netin_dir,
ChrPtr(NW->node),
time(NULL),// TODO: get time from libev
rand());
- StrBufPrintf(NW->SpoolFileName,
+ StrBufStripSlashes(NW->SpoolFileName, 1);
+ StrBufPrintf(NW->tempFileName,
"%s/%s.%lx%x",
ctdl_nettmp_dir,
ChrPtr(NW->node),
time(NULL),// TODO: get time from libev
rand());
-
+ 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();
NW->IO.IOB.TotalSentAlready = 0;
TotalSendSize = atol (ChrPtr(NW->IO.IOBuf) + 4);
- EVN_syslog(LOG_DEBUG, "Expecting to transfer %ld bytes\n", NW->IO.IOB.TotalSendSize);
+ EVN_syslog(LOG_DEBUG, "Expecting to transfer %d bytes\n", TotalSendSize);
if (TotalSendSize <= 0) {
NW->State = eNUOP - 1;
}
else {
int fd;
- fd = open(ChrPtr(NW->SpoolFileName),
+ fd = open(ChrPtr(NW->tempFileName),
O_EXCL|O_CREAT|O_NONBLOCK|O_WRONLY,
S_IRUSR|S_IWUSR);
if (fd < 0)
{
EVN_syslog(LOG_CRIT,
"cannot open %s: %s\n",
- ChrPtr(NW->SpoolFileName),
+ ChrPtr(NW->tempFileName),
strerror(errno));
NW->State = eQUIT - 1;
eNextState NWC_ReadREADBlobDone(AsyncNetworker *NW);
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->SpoolFileName), ChrPtr(NW->tempFileName)) != 0) {
+
+ if (link(ChrPtr(NW->tempFileName), ChrPtr(NW->SpoolFileName)) != 0) {
EVN_syslog(LOG_ALERT,
"Could not link %s to %s: %s\n",
ChrPtr(NW->tempFileName),
}
unlink(ChrPtr(NW->tempFileName));
- return NWC_DispatchWriteDone(&NW->IO);
+ rc = NWC_DispatchWriteDone(&NW->IO);
+ NW->State --;
+ return rc;
}
else {
NW->State --;
NW->IO.IOB.ChunkSendRemain = NW->IO.IOB.ChunkSize;
- return NWC_DispatchWriteDone(&NW->IO);
+ return eSendReply; //NWC_DispatchWriteDone(&NW->IO);
}
}
eNextState NWC_ReadREADBlobDone(AsyncNetworker *NW)
{
+ eNextState rc;
AsyncIO *IO = &NW->IO;
- NWC_DBG_READ();
- if (NW->IO.IOB.TotalSendSize == NW->IO.IOB.TotalSentAlready)
+/* we don't have any data to debug print here. */
+ if (NW->IO.IOB.TotalSentAlready >= NW->IO.IOB.TotalSendSize)
{
NW->State ++;
FDIOBufferDelete(&NW->IO.IOB);
-
- if (link(ChrPtr(NW->SpoolFileName), ChrPtr(NW->tempFileName)) != 0) {
+
+ if (link(ChrPtr(NW->tempFileName), ChrPtr(NW->SpoolFileName)) != 0) {
EVN_syslog(LOG_ALERT,
"Could not link %s to %s: %s\n",
ChrPtr(NW->tempFileName),
}
unlink(ChrPtr(NW->tempFileName));
- return NWC_DispatchWriteDone(&NW->IO);
+ rc = NWC_DispatchWriteDone(&NW->IO);
+ NW->State --;
+ return rc;
}
else {
NW->State --;
struct stat statbuf;
int fd;
- StrBufPrintf(NW->tempFileName,
+ StrBufPrintf(NW->SpoolFileName,
"%s/%s",
ctdl_netout_dir,
ChrPtr(NW->node));
- fd = open(ChrPtr(NW->tempFileName), O_RDONLY);
+ StrBufStripSlashes(NW->SpoolFileName, 1);
+
+ 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->tempFileName),
+ 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->tempFileName),
+ ChrPtr(NW->SpoolFileName),
strerror(errno));
if (fd > 0) close(fd);
return eAbort;
{
AsyncIO *IO = &NW->IO;
eNextState rc;
- if (IO->IOB.TotalSendSize == NW->IO.IOB.TotalSentAlready)
+ if (NW->IO.IOB.TotalSentAlready >= IO->IOB.TotalSendSize)
{
NW->State ++;
else {
NW->State --;
IO->IOB.ChunkSendRemain = IO->IOB.ChunkSize;
- return NWC_DispatchWriteDone(IO);
+ rc = NWC_DispatchWriteDone(IO);
+ NW->State --;
+ return rc;
}
}
EVN_syslog(LOG_NOTICE, "Sent %ld octets to <%s>\n", NW->IO.IOB.ChunkSize, ChrPtr(NW->node));
if (ChrPtr(NW->IO.IOBuf)[0] == '2') {
- EVN_syslog(LOG_DEBUG, "Removing <%s>\n", ChrPtr(NW->tempFileName));
- unlink(ChrPtr(NW->tempFileName));
+ EVN_syslog(LOG_DEBUG, "Removing <%s>\n", ChrPtr(NW->SpoolFileName));
+ unlink(ChrPtr(NW->SpoolFileName));
}
return eSendReply;
}
AsyncIO *IO = &NW->IO;
double Timeout = 0.0;
- EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ EVN_syslog(LOG_DEBUG, "%s - %d\n", __FUNCTION__, NextTCPState);
switch (NextTCPState) {
case eSendReply:
case eReadMore://// TODO
return;
}
- SetNextTimeout(&NW->IO, Timeout);
+ if (Timeout > 0) {
+ EVN_syslog(LOG_DEBUG,
+ "%s - %d %f\n",
+ __FUNCTION__,
+ NextTCPState,
+ Timeout);
+ SetNextTimeout(&NW->IO, Timeout*100);
+ }
}
return eAbort;
}
+eNextState NWC_TerminateDB(AsyncIO *IO)
+{
+ EVN_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__);
+ if (NW->IO.ErrMsg == NULL)
+ NW->IO.ErrMsg = NewStrBuf();
+ StrBufPrintf(NW->IO.ErrMsg, "Timeout while talking to %s \r\n", ChrPtr(NW->host));
return NWC_FailNetworkConnection(IO);
}
eNextState NWC_ConnFail(AsyncIO *IO)
{
-/// AsyncNetworker *NW = IO->Data;
+ AsyncNetworker *NW = IO->Data;
EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
-//// StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State])); todo
+ if (NW->IO.ErrMsg == NULL)
+ NW->IO.ErrMsg = NewStrBuf();
+ StrBufPrintf(NW->IO.ErrMsg, "failed to connect %s \r\n", ChrPtr(NW->host));
+
return NWC_FailNetworkConnection(IO);
}
eNextState NWC_DNSFail(AsyncIO *IO)
{
-/// AsyncNetworker *NW = IO->Data;
+ AsyncNetworker *NW = IO->Data;
EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
-//// StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State])); todo
+ if (NW->IO.ErrMsg == NULL)
+ NW->IO.ErrMsg = NewStrBuf();
+ StrBufPrintf(NW->IO.ErrMsg, "failed to look up %s \r\n", ChrPtr(NW->host));
+
return NWC_FailNetworkConnection(IO);
}
eNextState NWC_Shutdown(AsyncIO *IO)
{
EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
-//// pop3aggr *pMsg = IO->Data;
FinalizeNetworker(IO);
return eAbort;
static int NetworkerCount = 0;
void RunNetworker(AsyncNetworker *NW)
{
- AsyncIO *IO = &NW->IO;
-
NW->n = NetworkerCount++;
network_talking_to(SKEY(NW->node), NTT_ADD);
syslog(LOG_DEBUG, "NW[%s][%ld]: polling\n", ChrPtr(NW->node), NW->n);
NWC_DispatchWriteDone,
NWC_DispatchReadDone,
NWC_Terminate,
+ NWC_TerminateDB,
NWC_ConnFail,
NWC_Timeout,
NWC_Shutdown);
* Set "full" to nonzero to force a poll of every node, or to zero to poll
* only nodes to which we have data to send.
*/
-void network_poll_other_citadel_nodes(int full_poll, char *working_ignetcfg)
+void network_poll_other_citadel_nodes(int full_poll, HashList *ignetcfg)
{
+ const char *key;
+ long len;
+ HashPos *Pos;
+ void *vCfg;
AsyncNetworker *NW;
- StrBuf *CfgData;
- StrBuf *Line;
- const char *lptr;
- const char *CfgPtr;
- int Done;
+ StrBuf *SpoolFileName;
int poll = 0;
- if ((working_ignetcfg == NULL) || (*working_ignetcfg == '\0')) {
+ if (GetCount(ignetcfg) ==0) {
syslog(LOG_DEBUG, "network: no neighbor nodes are configured - not polling.\n");
return;
}
become_session(&networker_client_CC);
- CfgData = NewStrBufPlain(working_ignetcfg, -1);
- Line = NewStrBufPlain(NULL, StrLength(CfgData));
- Done = 0;
- CfgPtr = NULL;
- while (!Done)
+ SpoolFileName = NewStrBufPlain(ctdl_netout_dir, -1);
+
+ Pos = GetNewHashPos(ignetcfg, 0);
+
+ while (GetNextHashPos(ignetcfg, Pos, &len, &key, &vCfg))
{
/* Use the string tokenizer to grab one line at a time */
- StrBufSipLine(Line, CfgData, &CfgPtr);
- Done = CfgPtr == StrBufNOTNULL;
- if (StrLength(Line) > 0)
+ if(server_shutting_down)
+ return;/* TODO free stuff*/
+ NodeConf *pNode = (NodeConf*) vCfg;
+ poll = 0;
+ NW = (AsyncNetworker*)malloc(sizeof(AsyncNetworker));
+ memset(NW, 0, sizeof(AsyncNetworker));
+
+ NW->node = NewStrBufDup(pNode->NodeName);
+ NW->host = NewStrBufDup(pNode->Host);
+ NW->port = NewStrBufDup(pNode->Port);
+ NW->secret = NewStrBufDup(pNode->Secret);
+
+ if ( (StrLength(NW->node) != 0) &&
+ (StrLength(NW->secret) != 0) &&
+ (StrLength(NW->host) != 0) &&
+ (StrLength(NW->port) != 0))
{
- if(server_shutting_down)
- return;/* TODO free stuff*/
- lptr = NULL;
- poll = 0;
- NW = (AsyncNetworker*)malloc(sizeof(AsyncNetworker));
- memset(NW, 0, sizeof(AsyncNetworker));
-
- NW->node = NewStrBufPlain(NULL, StrLength(Line));
- NW->host = NewStrBufPlain(NULL, StrLength(Line));
- NW->port = NewStrBufPlain(NULL, StrLength(Line));
- NW->secret = NewStrBufPlain(NULL, StrLength(Line));
-
- StrBufExtract_NextToken(NW->node, Line, &lptr, '|');
- StrBufExtract_NextToken(NW->secret, Line, &lptr, '|');
- StrBufExtract_NextToken(NW->host, Line, &lptr, '|');
- StrBufExtract_NextToken(NW->port, Line, &lptr, '|');
- if ( (StrLength(NW->node) != 0) &&
- (StrLength(NW->secret) != 0) &&
- (StrLength(NW->host) != 0) &&
- (StrLength(NW->port) != 0))
+ poll = full_poll;
+ if (poll == 0)
{
- poll = full_poll;
- if (poll == 0)
- {
- NW->SpoolFileName = NewStrBufPlain(ctdl_netout_dir, -1);
- StrBufAppendBufPlain(NW->SpoolFileName, HKEY("/"), 0);
- StrBufAppendBuf(NW->SpoolFileName, NW->node, 0);
- if (access(ChrPtr(NW->SpoolFileName), R_OK) == 0) {
- poll = 1;
- }
+ StrBufAppendBufPlain(SpoolFileName, HKEY("/"), 0);
+ StrBufAppendBuf(SpoolFileName, NW->node, 0);
+ StrBufStripSlashes(SpoolFileName, 1);
+
+ if (access(ChrPtr(SpoolFileName), R_OK) == 0) {
+ poll = 1;
}
}
- 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));
+ if (!network_talking_to(SKEY(NW->node), NTT_CHECK))
{
- NW->Url = NewStrBufPlain(NULL, StrLength(Line));
- StrBufPrintf(NW->Url, "citadel://:%s@%s:%s",
- ChrPtr(NW->secret),
- ChrPtr(NW->host),
- ChrPtr(NW->port));
- if (!network_talking_to(SKEY(NW->node), NTT_CHECK))
- {
- RunNetworker(NW);
- continue;
- }
+ RunNetworker(NW);
+ continue;
}
- DeleteNetworker(NW);
}
+ DeleteNetworker(NW);
}
- FreeStrBuf(&CfgData);
- FreeStrBuf(&Line);
-
+ FreeStrBuf(&SpoolFileName);
+ DeleteHashPos(&Pos);
}
void network_do_clientqueue(void)
{
- char *working_ignetcfg;
+ HashList *working_ignetcfg;
int full_processing = 1;
static time_t last_run = 0L;
);
}
- working_ignetcfg = load_working_ignetcfg();
+ working_ignetcfg = load_ignetcfg();
/*
* Poll other Citadel nodes. Maybe. If "full_processing" is set
* then we poll everyone. Otherwise we only poll nodes we have stuff
* to send to.
*/
network_poll_other_citadel_nodes(full_processing, working_ignetcfg);
- if (working_ignetcfg)
- free(working_ignetcfg);
+ DeleteHash(&working_ignetcfg);
}
-
-
+void LogDebugEnableNetworkClient(const int n)
+{
+ NetworkClientDebugEnabled = n;
+}
/*
* Module entry point
*/
CtdlFillSystemContext(&networker_client_CC, "CitNetworker");
CtdlRegisterSessionHook(network_do_clientqueue, EVT_TIMER);
+ CtdlRegisterDebugFlagHook(HKEY("networkclient"), LogDebugEnableNetworkClient, &NetworkClientDebugEnabled);
+
}
- return "network_client";
+ return "networkclient";
}
projects / citadel.git / blobdiff