struct CitContext networker_client_CC;
+#define NODE ChrPtr(((AsyncNetworker*)IO->Data)->node)
+#define N ((AsyncNetworker*)IO->Data)->n
+
+#define EVN_syslog(LEVEL, FORMAT, ...) \
+ syslog(LEVEL, \
+ "IO[%ld]CC[%d]NW[%s][%ld]" FORMAT, \
+ IO->ID, CCID, NODE, N, __VA_ARGS__)
+
+#define EVNM_syslog(LEVEL, FORMAT) \
+ 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, \
+ IO->ID, NODE, N, __VA_ARGS__)
+
+#define EVNCSM_syslog(LEVEL, FORMAT) \
+ syslog(LEVEL, "IO[%ld]NW[%s][%ld]" FORMAT, \
+ IO->ID, NODE, N)
+
+
typedef enum _eNWCState {
eeGreating,
eAuth,
eNextState NWC_SendQUIT(AsyncNetworker *NW);
eNextState NWC_DispatchWriteDone(AsyncIO *IO);
-
-void DestroyNetworker(AsyncNetworker *NW)
+void DeleteNetworker(void *vptr)
{
+ AsyncNetworker *NW = (AsyncNetworker *)vptr;
+ FreeStrBuf(&NW->SpoolFileName);
+ FreeStrBuf(&NW->tempFileName);
+ FreeStrBuf(&NW->node);
+ FreeStrBuf(&NW->host);
+ FreeStrBuf(&NW->port);
+ FreeStrBuf(&NW->secret);
+ FreeStrBuf(&NW->Url);
+ FreeAsyncIOContents(&NW->IO);
+ 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(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 */
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')
{
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,
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;
}
S_IRUSR|S_IWUSR);
if (fd < 0)
{
- syslog(LOG_CRIT,
+ EVN_syslog(LOG_CRIT,
"cannot open %s: %s\n",
ChrPtr(NW->SpoolFileName),
strerror(errno));
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);
-////// unlink(ChrPtr(NW->tempFileName));
+ FDIOBufferDelete(&NW->IO.IOB);
+ unlink(ChrPtr(NW->tempFileName));
return eAbort;
}
StrBufPrintf(NW->IO.SendBuf.Buf, "READ %ld|%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;
}
- else {} // continue sending
- return eSendReply;
}
eNextState NWC_ReadREADState(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
NWC_DBG_READ();
if (ChrPtr(NW->IO.IOBuf)[0] == '6')
{
NW->IO.IOB.ChunkSendRemain =
NW->IO.IOB.ChunkSize = atol(ChrPtr(NW->IO.IOBuf)+4);
-/// NW->IO.IOB.TotalSentAlready += NW->IO.IOB.ChunkSize;
-/// TODO StrBufReadjustIOBuffer(NW->IO.RecvBuf, NW->BlobReadSize);
return eReadFile;
}
return eAbort;
eNextState NWC_ReadREADBlobDone(AsyncNetworker *NW);
eNextState NWC_ReadREADBlob(AsyncNetworker *NW)
{
- /// FlushIOBuffer(NW->IO.RecvBuf); /// TODO
-
- ///NW->bytes_received += NW->IO.IOB.ChunkSize;
-
- if (NW->IO.IOB.TotalSentAlready < NW->IO.IOB.TotalSendSize)
+ AsyncIO *IO = &NW->IO;
+ NWC_DBG_READ();
+ if (NW->IO.IOB.TotalSendSize == NW->IO.IOB.TotalSentAlready)
{
- NW->State = eREAD - 1;
- return eSendReply;/* now fetch next chunk*/
+ NW->State ++;
+
+ FDIOBufferDelete(&NW->IO.IOB);
+
+ if (link(ChrPtr(NW->SpoolFileName), ChrPtr(NW->tempFileName)) != 0) {
+ EVN_syslog(LOG_ALERT,
+ "Could not link %s to %s: %s\n",
+ ChrPtr(NW->tempFileName),
+ ChrPtr(NW->SpoolFileName),
+ strerror(errno));
+ }
+
+ unlink(ChrPtr(NW->tempFileName));
+ return NWC_DispatchWriteDone(&NW->IO);
+ }
+ else {
+ NW->State --;
+ NW->IO.IOB.ChunkSendRemain = NW->IO.IOB.ChunkSize;
+ return NWC_DispatchWriteDone(&NW->IO);
}
- else
- return NWC_ReadREADBlobDone(NW);
}
eNextState NWC_ReadREADBlobDone(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
+ NWC_DBG_READ();
if (NW->IO.IOB.TotalSendSize == NW->IO.IOB.TotalSentAlready)
{
NW->State ++;
- close(NW->IO.IOB.OtherFD);
+ FDIOBufferDelete(&NW->IO.IOB);
if (link(ChrPtr(NW->SpoolFileName), ChrPtr(NW->tempFileName)) != 0) {
- syslog(LOG_ALERT,
+ EVN_syslog(LOG_ALERT,
"Could not link %s to %s: %s\n",
ChrPtr(NW->tempFileName),
ChrPtr(NW->SpoolFileName),
strerror(errno));
}
-///// unlink(ChrPtr(NW->tempFileName));
+ unlink(ChrPtr(NW->tempFileName));
return NWC_DispatchWriteDone(&NW->IO);
}
else {
NW->State --;
+ NW->IO.IOB.ChunkSendRemain = NW->IO.IOB.ChunkSize;
return NWC_DispatchWriteDone(&NW->IO);
}
}
eNextState NWC_SendCLOS(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
StrBufPlain(NW->IO.SendBuf.Buf, HKEY("CLOS\n"));
-//// unlink(ChrPtr(NW->tempFileName));
- return eReadMessage;
+ NWC_DBG_SEND();
+ return eSendReply;
}
eNextState NWC_ReadCLOSReply(AsyncNetworker *NW)
{
-/// todo
+ AsyncIO *IO = &NW->IO;
+ NWC_DBG_READ();
if (ChrPtr(NW->IO.IOBuf)[0] != '2')
return eTerminateConnection;
return eSendReply;
eNextState NWC_SendNUOP(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
+ eNextState rc;
long TotalSendSize;
struct stat statbuf;
int fd;
fd = open(ChrPtr(NW->tempFileName), O_RDONLY);
if (fd < 0) {
if (errno != ENOENT) {
- syslog(LOG_CRIT,
+ EVN_syslog(LOG_CRIT,
"cannot open %s: %s\n",
ChrPtr(NW->tempFileName),
strerror(errno));
}
NW->State = eQUIT;
- return NWC_SendQUIT(NW);
+ rc = NWC_SendQUIT(NW);
+ NWC_DBG_SEND();
}
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->tempFileName),
+ 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;
- return NWC_SendQUIT(NW);
+ rc = NWC_SendQUIT(NW);
+ NWC_DBG_SEND();
+ return rc;
}
FDIOBufferInit(&NW->IO.IOB, &NW->IO.SendBuf, fd, TotalSendSize);
-//// NW->bytes_written = 0;
-
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')
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();
return eSendReply;
}
eNextState NWC_ReadWRITReply(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
NWC_DBG_READ();
if (ChrPtr(NW->IO.IOBuf)[0] != '7')
{
NW->IO.IOB.ChunkSendRemain =
NW->IO.IOB.ChunkSize = atol(ChrPtr(NW->IO.IOBuf)+4);
-/// NW->IO.IOB.TotalSentAlready += NW->IO.IOB.ChunkSize;
return eSendFile;
}
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);
-//// TODO: unlink networker file?
- rc = NWC_DispatchWriteDone(&NW->IO);
+ FDIOBufferDelete(&IO->IOB);
+ rc = NWC_DispatchWriteDone(IO);
NW->State --;
return rc;
}
else {
NW->State --;
- return NWC_DispatchWriteDone(&NW->IO);
+ IO->IOB.ChunkSendRemain = IO->IOB.ChunkSize;
+ return NWC_DispatchWriteDone(IO);
}
}
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));
-/// syslog(LOG_DEBUG, "<%s\n", buf);
+ 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->tempFileName));
+ unlink(ChrPtr(NW->tempFileName));
}
return eSendReply;
}
eNextState NWC_SendQUIT(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
StrBufPlain(NW->IO.SendBuf.Buf, HKEY("QUIT\n"));
- network_talking_to(ChrPtr(NW->node), NTT_REMOVE);
+ NWC_DBG_SEND();
return eSendReply;
}
eNextState NWC_ReadQUIT(AsyncNetworker *NW)
{
+ AsyncIO *IO = &NW->IO;
NWC_DBG_READ();
- return eTerminateConnection;
+ return eAbort;
}
NWC_ReadWRITReply,
NWC_SendBlobDone,
NWC_ReadUCLS,
- NWC_ReadQUIT
-};
+ NWC_ReadQUIT};
+
+long NWC_ConnTimeout = 100;
const long NWC_SendTimeouts[] = {
100,
{
AsyncNetworker *NW = IO->Data;
/*
- * here we start with the lookup of one host. it might be...
- * - the relay host *sigh*
- * - the direct hostname if there was no mx record
- * - one of the mx'es
+ * 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,
*/
eReadState NWC_ReadServerStatus(AsyncIO *IO)
{
- AsyncNetworker *NW = IO->Data;
+// AsyncNetworker *NW = IO->Data;
eReadState Finished = eBufferNotEmpty;
switch (IO->NextState) {
case eReadFile:
case eSendFile:
case eReadPayload:
-////TODO Finished = IOBufferStrLength(&IO->RecvBuf) >= NW->BlobReadSize;
break;
}
return Finished;
eNextState NWC_FailNetworkConnection(AsyncIO *IO)
{
- return eTerminateConnection;
+ return eAbort;
+}
+
+void NWC_SetTimeout(eNextState NextTCPState, AsyncNetworker *NW)
+{
+ AsyncIO *IO = &NW->IO;
+ double Timeout = 0.0;
+
+ EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+
+ switch (NextTCPState) {
+ case eSendReply:
+ case eSendMore:
+ break;
+ case eReadFile:
+ case eReadMessage:
+ Timeout = NWC_ReadTimeouts[NW->State];
+ break;
+ case eReadPayload:
+ Timeout = 100000;
+ /* TODO!!! */
+ break;
+ case eSendDNSQuery:
+ case eReadDNSReply:
+ case eConnect:
+ case eSendFile:
+//TODO
+ case eTerminateConnection:
+ case eDBQuery:
+ case eAbort:
+ case eReadMore://// TODO
+ return;
+ }
+ SetNextTimeout(&NW->IO, Timeout);
}
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;
rc = NWC_ReadHandlers[NW->State](NW);
if (rc != eReadMore)
NW->State++;
- ////NWCSetTimeout(rc, NW);
+ NWC_SetTimeout(rc, NW);
return 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;
rc = NWC_SendHandlers[NW->State](NW);
- ////NWCSetTimeout(rc, NW);
+ NWC_SetTimeout(rc, NW);
return rc;
}
/*****************************************************************************/
eNextState NWC_Terminate(AsyncIO *IO)
{
- syslog(LOG_DEBUG, "Nw: %s\n", __FUNCTION__);
-/// FinalizeNetworker(IO); TODO
+ 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__);
- syslog(LOG_DEBUG, "NW: %s\n", __FUNCTION__);
-// StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State])); todo
return NWC_FailNetworkConnection(IO);
}
eNextState NWC_ConnFail(AsyncIO *IO)
{
/// AsyncNetworker *NW = IO->Data;
- syslog(LOG_DEBUG, "NW: %s\n", __FUNCTION__);
+ EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
//// StrBufPlain(IO->ErrMsg, CKEY(POP3C_ReadErrors[pMsg->State])); todo
return NWC_FailNetworkConnection(IO);
}
{
/// AsyncNetworker *NW = IO->Data;
- syslog(LOG_DEBUG, "NW: %s\n", __FUNCTION__);
+ EVN_syslog(LOG_DEBUG, "%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__);
+ EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
//// pop3aggr *pMsg = IO->Data;
- ////pMsg->MyQEntry->Status = 3;
- ///StrBufPlain(pMsg->MyQEntry->StatusMessage, HKEY("server shutdown during message retrieval."));
-/// FinalizePOP3AggrRun(IO); todo
+ 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));
-//// IO->ConnectMe = &NW->Pop3Host;
- /* Bypass the ns lookup result like this: IO->Addr.sin_addr.s_addr = inet_addr("127.0.0.1"); */
-
- /////// SetConnectStatus(IO);
-
- return InitEventIO(IO, NW, 100, 100, 1); /*
- 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;
+ 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);
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_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,
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;
}
}
}
- 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;
}
}
- DestroyNetworker(NW);
+ DeleteNetworker(NW);
}
}
+ FreeStrBuf(&CfgData);
+ FreeStrBuf(&Line);
}
projects / citadel.git / blobdiff