From: Wilfried Goesgens <dothebart@citadel.org>
Date: Mon, 20 Oct 2014 23:16:43 +0000 (+0200)
Subject: Tidyup the networker
X-Git-Tag: v9.01~114
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=931ed7a4e3bdf272f135b1cee2665cdea43ce7c2

Tidyup the networker
---

diff --git a/citadel/modules/networkclient/serv_networkclient.c b/citadel/modules/networkclient/serv_networkclient.c
index 317741d19..deffa4f6c 100644
--- 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)
 
-eNextState SendFailureMessage(AsyncIO *IO)
+eNextState NWC_SendFailureMessage(AsyncIO *IO)
 {
 	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);
-		return QueueDBOperation(IO, SendFailureMessage);
+		return QueueDBOperation(IO, NWC_SendFailureMessage);
 	}
 	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);
-			return QueueDBOperation(IO, SendFailureMessage);
+			return QueueDBOperation(IO, NWC_SendFailureMessage);
 		}
 		return eAbort;
 	}
@@ -845,7 +845,7 @@ eNextState NWC_FailNetworkConnection(AsyncIO *IO)
 {
 	SetNWCState(IO, eNWCVSConnFail);
 	StopClientWatchers(IO, 1);
-	return QueueDBOperation(IO, SendFailureMessage);
+	return QueueDBOperation(IO, NWC_SendFailureMessage);
 }
 
 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) {
-	case eSendReply:
 	case eSendMore:
-		break;
-	case eReadFile:
+	case eSendReply:
 	case eReadMessage:
 		Timeout = NWC_ReadTimeouts[NW->State];
 		break;
+	case eReadFile:
+	case eSendFile:
 	case eReadPayload:
 		Timeout = 100000;
-		/* TODO!!! */
 		break;
 	case eSendDNSQuery:
 	case eReadDNSReply:
+	case eDBQuery:
+	case eReadMore:
 	case eConnect:
-	case eSendFile:
-//TODO
 	case eTerminateConnection:
-	case eDBQuery:
 	case eAbort:
-	case eReadMore://// TODO
 		return;
 	}
 	if (Timeout > 0) {
@@ -896,11 +893,11 @@ eNextState NWC_DispatchReadDone(AsyncIO *IO)
 	eNextState rc;
 
 	rc = NWC_ReadHandlers[NW->State](NW);
+
 	if (rc != eReadMore)
 		NW->State++;
 
-	if (rc != eAbort)
-		NWC_SetTimeout(rc, NW);
+	NWC_SetTimeout(rc, NW);
 
 	return rc;
 }