struct CitContext networker_client_CC;
+#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, ...) \
+ DBGLOG(LEVEL) syslog(LEVEL, \
+ "IO[%ld]CC[%d]NW[%s][%ld]" FORMAT, \
+ IO->ID, CCID, NODE, N, __VA_ARGS__)
+
+#define EVNM_syslog(LEVEL, FORMAT) \
+ DBGLOG(LEVEL) syslog(LEVEL, \
+ "IO[%ld]CC[%d]NW[%s][%ld]" FORMAT, \
+ IO->ID, CCID, NODE, N)
+
+#define EVNCS_syslog(LEVEL, FORMAT, ...) \
+ DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]NW[%s][%ld]" FORMAT, \
+ IO->ID, NODE, N, __VA_ARGS__)
+
+#define EVNCSM_syslog(LEVEL, FORMAT) \
+ DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]NW[%s][%ld]" FORMAT, \
+ IO->ID, NODE, N)
+
+
typedef enum _eNWCState {
eeGreating,
eAuth,
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);
}
-#define NWC_DBG_SEND() syslog(LOG_DEBUG, "NW client[%ld]: > %s", NW->n, ChrPtr(NW->IO.SendBuf.Buf))
-#define NWC_DBG_READ() syslog(LOG_DEBUG, "NW client[%ld]: < %s\n", NW->n, ChrPtr(NW->IO.IOBuf))
+#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 FinalizeNetworker(AsyncIO *IO)
{
AsyncNetworker *NW = (AsyncNetworker *)IO->Data;
- network_talking_to(ChrPtr(NW->node), NTT_REMOVE);
+ network_talking_to(SKEY(NW->node), NTT_REMOVE);
DeleteNetworker(IO->Data);
return eAbort;
eNextState NWC_ReadGreeting(AsyncNetworker *NW)
{
char connected_to[SIZ];
+ AsyncIO *IO = &NW->IO;
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);
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));
- syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
+ EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
CtdlAideMessage(ChrPtr(NW->IO.ErrMsg), "Network error");
return eAbort;/// todo: aide message in anderer queue speichern
}
eNextState NWC_SendAuth(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
/* We're talking to the correct node. Now identify ourselves. */
StrBufPrintf(NW->IO.SendBuf.Buf, "NETP %s|%s\n",
config.c_nodename,
eNextState NWC_ReadAuthReply(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
NWC_DBG_READ();
if (ChrPtr(NW->IO.IOBuf)[0] == '2')
{
}
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));
- syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
+ EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
CtdlAideMessage(ChrPtr(NW->IO.ErrMsg), "Network error");
return eAbort;
eNextState NWC_SendNDOP(AsyncNetworker *NW)
{
+ 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();
eNextState NWC_ReadNDOPReply(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
int TotalSendSize;
NWC_DBG_READ();
if (ChrPtr(NW->IO.IOBuf)[0] == '2')
NW->IO.IOB.TotalSentAlready = 0;
TotalSendSize = atol (ChrPtr(NW->IO.IOBuf) + 4);
- syslog(LOG_DEBUG, "Expecting to transfer %ld bytes\n", NW->IO.IOB.TotalSendSize);
+ EVN_syslog(LOG_DEBUG, "Expecting to transfer %ld bytes\n", NW->IO.IOB.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)
{
- syslog(LOG_CRIT,
+ EVN_syslog(LOG_CRIT,
"cannot open %s: %s\n",
- ChrPtr(NW->SpoolFileName),
+ ChrPtr(NW->tempFileName),
strerror(errno));
NW->State = eQUIT - 1;
eNextState NWC_SendREAD(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
eNextState rc;
if (NW->IO.IOB.TotalSentAlready < NW->IO.IOB.TotalSendSize)
*/
if (server_shutting_down)
{
- close(NW->IO.IOB.OtherFD);
+ FDIOBufferDelete(&NW->IO.IOB);
unlink(ChrPtr(NW->tempFileName));
return eAbort;
}
eNextState NWC_ReadREADState(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
NWC_DBG_READ();
if (ChrPtr(NW->IO.IOBuf)[0] == '6')
{
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 ++;
- close(NW->IO.IOB.OtherFD);
-
- if (link(ChrPtr(NW->SpoolFileName), ChrPtr(NW->tempFileName)) != 0) {
- syslog(LOG_ALERT,
+ 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),
}
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)
{
- NWC_DBG_READ();
+ eNextState rc;
+ AsyncIO *IO = &NW->IO;
+/* we don't have any data to debug print here. */
if (NW->IO.IOB.TotalSendSize == NW->IO.IOB.TotalSentAlready)
{
NW->State ++;
- close(NW->IO.IOB.OtherFD);
-
- if (link(ChrPtr(NW->SpoolFileName), ChrPtr(NW->tempFileName)) != 0) {
- syslog(LOG_ALERT,
+ 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),
}
unlink(ChrPtr(NW->tempFileName));
- return NWC_DispatchWriteDone(&NW->IO);
+ rc = NWC_DispatchWriteDone(&NW->IO);
+ NW->State --;
+ return rc;
}
else {
NW->State --;
}
eNextState NWC_SendCLOS(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
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();
if (ChrPtr(NW->IO.IOBuf)[0] != '2')
return eTerminateConnection;
eNextState NWC_SendNUOP(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
eNextState rc;
long TotalSendSize;
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_RDONLY);
if (fd < 0) {
if (errno != ENOENT) {
- syslog(LOG_CRIT,
+ 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) {
- syslog(9, "FSTAT FAILED %s [%s]--\n",
- ChrPtr(NW->tempFileName),
- strerror(errno));
+ EVN_syslog(LOG_CRIT, "FSTAT FAILED %s [%s]--\n",
+ ChrPtr(NW->SpoolFileName),
+ strerror(errno));
if (fd > 0) close(fd);
return eAbort;
}
TotalSendSize = statbuf.st_size;
if (TotalSendSize == 0) {
- syslog(LOG_DEBUG,
+ EVNM_syslog(LOG_DEBUG,
"Nothing to send.\n");
NW->State = eQUIT;
rc = NWC_SendQUIT(NW);
}
eNextState NWC_ReadNUOPReply(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
NWC_DBG_READ();
if (ChrPtr(NW->IO.IOBuf)[0] != '2')
return eAbort;
eNextState NWC_SendWRIT(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
StrBufPrintf(NW->IO.SendBuf.Buf, "WRIT %ld\n",
NW->IO.IOB.TotalSendSize - NW->IO.IOB.TotalSentAlready);
NWC_DBG_SEND();
}
eNextState NWC_ReadWRITReply(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
NWC_DBG_READ();
if (ChrPtr(NW->IO.IOBuf)[0] != '7')
{
eNextState NWC_SendBlobDone(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
eNextState rc;
- if (NW->IO.IOB.TotalSendSize == NW->IO.IOB.TotalSentAlready)
+ if (IO->IOB.TotalSendSize == NW->IO.IOB.TotalSentAlready)
{
NW->State ++;
- close(NW->IO.IOB.OtherFD);
- rc = NWC_DispatchWriteDone(&NW->IO);
+ FDIOBufferDelete(&IO->IOB);
+ rc = NWC_DispatchWriteDone(IO);
NW->State --;
return rc;
}
else {
NW->State --;
- NW->IO.IOB.ChunkSendRemain = NW->IO.IOB.ChunkSize;
- return NWC_DispatchWriteDone(&NW->IO);
+ IO->IOB.ChunkSendRemain = IO->IOB.ChunkSize;
+ rc = NWC_DispatchWriteDone(IO);
+ NW->State --;
+ return rc;
}
}
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();
- syslog(LOG_NOTICE, "Sent %ld octets to <%s>\n", NW->IO.IOB.ChunkSize, ChrPtr(NW->node));
+ EVN_syslog(LOG_NOTICE, "Sent %ld octets to <%s>\n", NW->IO.IOB.ChunkSize, ChrPtr(NW->node));
if (ChrPtr(NW->IO.IOBuf)[0] == '2') {
- 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;
}
eNextState NWC_SendQUIT(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
StrBufPlain(NW->IO.SendBuf.Buf, HKEY("QUIT\n"));
NWC_DBG_SEND();
eNextState NWC_ReadQUIT(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
NWC_DBG_READ();
return eAbort;
* here we start with the lookup of one host.
*/
- InitC_ares_dns(IO);
-
- syslog(LOG_DEBUG, "NWC: %s\n", __FUNCTION__);
+ EVN_syslog(LOG_DEBUG, "NWC: %s\n", __FUNCTION__);
- syslog(LOG_DEBUG,
- "NWC client[%ld]: looking up %s-Record %s : %d ...\n",
- NW->n,
- (NW->IO.ConnectMe->IPv6)? "aaaa": "a",
- NW->IO.ConnectMe->Host,
- NW->IO.ConnectMe->Port);
+ EVN_syslog(LOG_DEBUG,
+ "NWC client[%ld]: looking up %s-Record %s : %d ...\n",
+ NW->n,
+ (NW->IO.ConnectMe->IPv6)? "aaaa": "a",
+ NW->IO.ConnectMe->Host,
+ NW->IO.ConnectMe->Port);
QueueQuery((NW->IO.ConnectMe->IPv6)? ns_t_aaaa : ns_t_a,
NW->IO.ConnectMe->Host,
void NWC_SetTimeout(eNextState NextTCPState, AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
double Timeout = 0.0;
- syslog(LOG_DEBUG, "NWC3: %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);
+ }
}
eNextState NWC_DispatchReadDone(AsyncIO *IO)
{
- syslog(LOG_DEBUG, "NWC: %s\n", __FUNCTION__);
+ EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
AsyncNetworker *NW = IO->Data;
eNextState rc;
}
eNextState NWC_DispatchWriteDone(AsyncIO *IO)
{
- syslog(LOG_DEBUG, "NWC: %s\n", __FUNCTION__);
+ EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
AsyncNetworker *NW = IO->Data;
eNextState rc;
/*****************************************************************************/
eNextState NWC_Terminate(AsyncIO *IO)
{
- syslog(LOG_DEBUG, "Nw: %s\n", __FUNCTION__);
+ EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+ FinalizeNetworker(IO);
+ return eAbort;
+}
+
+eNextState NWC_TerminateDB(AsyncIO *IO)
+{
+ EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
FinalizeNetworker(IO);
return eAbort;
}
eNextState NWC_Timeout(AsyncIO *IO)
{
- syslog(LOG_DEBUG, "NW: %s\n", __FUNCTION__);
+ 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__);
+ if (NW->IO.ErrMsg == NULL)
+ NW->IO.ErrMsg = NewStrBuf();
+ StrBufPrintf(NW->IO.ErrMsg, "failed to connect %s \r\n", ChrPtr(NW->host));
- syslog(LOG_DEBUG, "NW: %s\n", __FUNCTION__);
-//// StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State])); todo
return NWC_FailNetworkConnection(IO);
}
eNextState NWC_DNSFail(AsyncIO *IO)
{
-/// AsyncNetworker *NW = IO->Data;
+ AsyncNetworker *NW = IO->Data;
+
+ EVN_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));
- syslog(LOG_DEBUG, "NW: %s\n", __FUNCTION__);
-//// StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State])); todo
return NWC_FailNetworkConnection(IO);
}
eNextState NWC_Shutdown(AsyncIO *IO)
{
- syslog(LOG_DEBUG, "NW: %s\n", __FUNCTION__);
-//// pop3aggr *pMsg = IO->Data;
+ EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
FinalizeNetworker(IO);
return eAbort;
{
AsyncNetworker *NW = IO->Data;
- syslog(LOG_DEBUG, "NW: %s\n", __FUNCTION__);
- syslog(LOG_DEBUG, "network: polling <%s>\n", ChrPtr(NW->node));
- syslog(LOG_NOTICE, "Connecting to <%s> at %s:%s\n",
- ChrPtr(NW->node),
- ChrPtr(NW->host),
- ChrPtr(NW->port));
+ 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));
- return InitEventIO(IO, NW,
- NWC_ConnTimeout,
- NWC_ReadTimeouts[0],
- 1);
+ return EvConnectSock(IO,
+ NWC_ConnTimeout,
+ NWC_ReadTimeouts[0],
+ 1);
}
+static int NetworkerCount = 0;
void RunNetworker(AsyncNetworker *NW)
{
- CitContext *SubC;
-
+ NW->n = NetworkerCount++;
+ network_talking_to(SKEY(NW->node), NTT_ADD);
+ syslog(LOG_DEBUG, "NW[%s][%ld]: polling\n", ChrPtr(NW->node), NW->n);
ParseURL(&NW->IO.ConnectMe, NW->Url, 504);
- NW->IO.Data = NW;
- NW->IO.SendDone = NWC_DispatchWriteDone;
- NW->IO.ReadDone = NWC_DispatchReadDone;
- NW->IO.Terminate = NWC_Terminate;
- NW->IO.LineReader = NWC_ReadServerStatus;
- NW->IO.ConnFail = NWC_ConnFail;
- NW->IO.DNSFail = NWC_DNSFail;
- NW->IO.Timeout = NWC_Timeout;
- NW->IO.ShutdownAbort = NWC_Shutdown;
-
- NW->IO.SendBuf.Buf = NewStrBufPlain(NULL, 1024);
- NW->IO.RecvBuf.Buf = NewStrBufPlain(NULL, 1024);
- NW->IO.IOBuf = NewStrBuf();
-
- NW->IO.NextState = eReadMessage;
- SubC = CloneContext (&networker_client_CC);
- SubC->session_specific_data = (char*) NW;
- NW->IO.CitContext = SubC;
+ InitIOStruct(&NW->IO,
+ NW,
+ eReadMessage,
+ NWC_ReadServerStatus,
+ NWC_DNSFail,
+ NWC_DispatchWriteDone,
+ NWC_DispatchReadDone,
+ NWC_Terminate,
+ NWC_TerminateDB,
+ NWC_ConnFail,
+ NWC_Timeout,
+ NWC_Shutdown);
+
+ safestrncpy(((CitContext *)NW->IO.CitContext)->cs_host,
+ ChrPtr(NW->host),
+ sizeof(((CitContext *)NW->IO.CitContext)->cs_host));
if (NW->IO.ConnectMe->IsIP) {
QueueEventContext(&NW->IO,
AsyncNetworker *NW;
StrBuf *CfgData;
StrBuf *Line;
+ StrBuf *SpoolFileName;
const char *lptr;
const char *CfgPtr;
int Done;
syslog(LOG_DEBUG, "network: no neighbor nodes are configured - not polling.\n");
return;
}
+ become_session(&networker_client_CC);
+
CfgData = NewStrBufPlain(working_ignetcfg, -1);
+ SpoolFileName = NewStrBufPlain(ctdl_netout_dir, -1);
Line = NewStrBufPlain(NULL, StrLength(CfgData));
Done = 0;
CfgPtr = NULL;
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) {
+ StrBufAppendBufPlain(SpoolFileName, HKEY("/"), 0);
+ StrBufAppendBuf(SpoolFileName, NW->node, 0);
+ StrBufStripSlashes(SpoolFileName, 1);
+
+ if (access(ChrPtr(SpoolFileName), R_OK) == 0) {
poll = 1;
}
}
}
- if (poll) {
+ if (poll &&
+ (StrLength(NW->host) > 0) &&
+ strcmp("0.0.0.0", ChrPtr(NW->host)))
+ {
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(ChrPtr(NW->node), NTT_CHECK))
+ if (!network_talking_to(SKEY(NW->node), NTT_CHECK))
{
- network_talking_to(ChrPtr(NW->node), NTT_ADD);
RunNetworker(NW);
continue;
}
DeleteNetworker(NW);
}
}
+ FreeStrBuf(&SpoolFileName);
FreeStrBuf(&CfgData);
FreeStrBuf(&Line);
free(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