long lens[2];
const char *strs[2];
+ EVN_syslog(LOG_DEBUG, "NWC: %s\n", __FUNCTION__);
+
strs[0] = ChrPtr(NW->node);
lens[0] = StrLength(NW->node);
ChrPtr(NW->IO.ErrMsg),
"Networker error",
2, strs, (long*) &lens,
- IO->Now,
- IO->ID, CCID);
+ CCID, IO->ID,
+ EvGetNow(IO));
return eAbort;
}
else {
SetNWCState(IO, eNWCVSAuthFailNTT);
EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
- StopClientWatchers(IO, 1);
- return QueueDBOperation(IO, NWC_SendFailureMessage);
+ return EventQueueDBOperation(IO, NWC_SendFailureMessage, 1);
}
return eAbort;
}
eNextState NWC_FailNetworkConnection(AsyncIO *IO)
{
SetNWCState(IO, eNWCVSConnFail);
- StopClientWatchers(IO, 1);
- return QueueDBOperation(IO, NWC_SendFailureMessage);
+ return EventQueueDBOperation(IO, NWC_SendFailureMessage, 1);
}
void NWC_SetTimeout(eNextState NextTCPState, AsyncNetworker *NW)
{
- AsyncIO *IO = &NW->IO;
double Timeout = 0.0;
- EVN_syslog(LOG_DEBUG, "%s - %d\n", __FUNCTION__, NextTCPState);
+ //EVN_syslog(LOG_DEBUG, "%s - %d\n", __FUNCTION__, NextTCPState);
switch (NextTCPState) {
case eSendMore:
return;
}
if (Timeout > 0) {
+ AsyncIO *IO = &NW->IO;
EVN_syslog(LOG_DEBUG,
"%s - %d %f\n",
__FUNCTION__,
rc = NWC_ReadHandlers[NW->State](NW);
- if (rc != eReadMore)
+ if ((rc != eReadMore) &&
+ (rc != eAbort) &&
+ (rc != eDBQuery)) {
NW->State++;
+ }
NWC_SetTimeout(rc, NW);