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));
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)
}
unlink(ChrPtr(NW->tempFileName));
- return NWC_DispatchWriteDone(&NW->IO);
+ rc = NWC_DispatchWriteDone(&NW->IO);
+ NW->State --;
+ return rc;
}
else {
NW->State --;
eNextState NWC_ReadREADBlobDone(AsyncNetworker *NW)
{
+ eNextState rc;
AsyncIO *IO = &NW->IO;
NWC_DBG_READ();
if (NW->IO.IOB.TotalSendSize == NW->IO.IOB.TotalSentAlready)
}
unlink(ChrPtr(NW->tempFileName));
- return NWC_DispatchWriteDone(&NW->IO);
+ rc = NWC_DispatchWriteDone(&NW->IO);
+ NW->State --;
+ return rc;
}
else {
NW->State --;
NW->State = eQUIT;
rc = NWC_SendQUIT(NW);
NWC_DBG_SEND();
+ return rc;
}
if (fstat(fd, &statbuf) == -1) {
else {
NW->State --;
IO->IOB.ChunkSendRemain = IO->IOB.ChunkSize;
- return NWC_DispatchWriteDone(IO);
+ rc = NWC_DispatchWriteDone(IO);
+ NW->State --;
+ return rc;
}
}
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);