projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidyup the networker
[citadel.git]
/
citadel
/
modules
/
networkclient
/
serv_networkclient.c
diff --git
a/citadel/modules/networkclient/serv_networkclient.c
b/citadel/modules/networkclient/serv_networkclient.c
index 317741d199de751857c166ffaa42109bd6186aa4..deffa4f6c488be4e0cecf2ff314d808578f7ff8c 100644
(file)
--- a/
citadel/modules/networkclient/serv_networkclient.c
+++ b/
citadel/modules/networkclient/serv_networkclient.c
@@
-194,7
+194,7
@@
void DeleteNetworker(void *vptr)
#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)
#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 SendFailureMessage(AsyncIO *IO)
+eNextState
NWC_
SendFailureMessage(AsyncIO *IO)
{
AsyncNetworker *NW = IO->Data;
long lens[2];
{
AsyncNetworker *NW = IO->Data;
long lens[2];
@@
-243,7
+243,7
@@
eNextState NWC_ReadGreeting(AsyncNetworker *NW)
connected_to, ChrPtr(NW->node));
EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
StopClientWatchers(IO, 1);
connected_to, ChrPtr(NW->node));
EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
StopClientWatchers(IO, 1);
- return QueueDBOperation(IO, SendFailureMessage);
+ return QueueDBOperation(IO,
NWC_
SendFailureMessage);
}
return eSendReply;
}
}
return eSendReply;
}
@@
-287,7
+287,7
@@
eNextState NWC_ReadAuthReply(AsyncNetworker *NW)
SetNWCState(IO, eNWCVSAuthFailNTT);
EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
StopClientWatchers(IO, 1);
SetNWCState(IO, eNWCVSAuthFailNTT);
EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
StopClientWatchers(IO, 1);
- return QueueDBOperation(IO, SendFailureMessage);
+ return QueueDBOperation(IO,
NWC_
SendFailureMessage);
}
return eAbort;
}
}
return eAbort;
}
@@
-845,7
+845,7
@@
eNextState NWC_FailNetworkConnection(AsyncIO *IO)
{
SetNWCState(IO, eNWCVSConnFail);
StopClientWatchers(IO, 1);
{
SetNWCState(IO, eNWCVSConnFail);
StopClientWatchers(IO, 1);
- return QueueDBOperation(IO, SendFailureMessage);
+ return QueueDBOperation(IO,
NWC_
SendFailureMessage);
}
void NWC_SetTimeout(eNextState NextTCPState, AsyncNetworker *NW)
}
void NWC_SetTimeout(eNextState NextTCPState, AsyncNetworker *NW)
@@
-856,26
+856,23
@@
void NWC_SetTimeout(eNextState NextTCPState, AsyncNetworker *NW)
EVN_syslog(LOG_DEBUG, "%s - %d\n", __FUNCTION__, NextTCPState);
switch (NextTCPState) {
EVN_syslog(LOG_DEBUG, "%s - %d\n", __FUNCTION__, NextTCPState);
switch (NextTCPState) {
- case eSendReply:
case eSendMore:
case eSendMore:
- break;
- case eReadFile:
+ case eSendReply:
case eReadMessage:
Timeout = NWC_ReadTimeouts[NW->State];
break;
case eReadMessage:
Timeout = NWC_ReadTimeouts[NW->State];
break;
+ case eReadFile:
+ case eSendFile:
case eReadPayload:
Timeout = 100000;
case eReadPayload:
Timeout = 100000;
- /* TODO!!! */
break;
case eSendDNSQuery:
case eReadDNSReply:
break;
case eSendDNSQuery:
case eReadDNSReply:
+ case eDBQuery:
+ case eReadMore:
case eConnect:
case eConnect:
- case eSendFile:
-//TODO
case eTerminateConnection:
case eTerminateConnection:
- case eDBQuery:
case eAbort:
case eAbort:
- case eReadMore://// TODO
return;
}
if (Timeout > 0) {
return;
}
if (Timeout > 0) {
@@
-896,11
+893,11
@@
eNextState NWC_DispatchReadDone(AsyncIO *IO)
eNextState rc;
rc = NWC_ReadHandlers[NW->State](NW);
eNextState rc;
rc = NWC_ReadHandlers[NW->State](NW);
+
if (rc != eReadMore)
NW->State++;
if (rc != eReadMore)
NW->State++;
- if (rc != eAbort)
- NWC_SetTimeout(rc, NW);
+ NWC_SetTimeout(rc, NW);
return rc;
}
return rc;
}