X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_networkclient.c;h=1a027ea2384e8ed481398cec9f6104e895118c6b;hb=eee9a1429dd032114946aad9e70fd8d84afbe918;hp=3d22f9eb45b85a99943c93498cf0a32be496bb31;hpb=44cb21d5240f313fd6177ba402ded4436c9bb085;p=citadel.git

diff --git a/citadel/modules/network/serv_networkclient.c b/citadel/modules/network/serv_networkclient.c
index 3d22f9eb4..1a027ea23 100644
--- a/citadel/modules/network/serv_networkclient.c
+++ b/citadel/modules/network/serv_networkclient.c
@@ -88,6 +88,32 @@
 
 struct CitContext networker_client_CC;
 
+#define NODE ChrPtr(((AsyncNetworker*)IO->Data)->node)
+#define N ((AsyncNetworker*)IO->Data)->n
+
+int NetworkClientDebugEnabled = 0;
+
+#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (NetworkClientDebugEnabled != 0))
+
+#define EVN_syslog(LEVEL, FORMAT, ...) \
+	DBGLOG(LEVEL) syslog(LEVEL, \
+	       "IO[%ld]CC[%d]NW[%s][%ld]" FORMAT, \
+	       IO->ID, CCID, NODE, N, __VA_ARGS__)
+
+#define EVNM_syslog(LEVEL, FORMAT) \
+	DBGLOG(LEVEL) syslog(LEVEL, \
+	       "IO[%ld]CC[%d]NW[%s][%ld]" FORMAT, \
+	       IO->ID, CCID, NODE, N)
+
+#define EVNCS_syslog(LEVEL, FORMAT, ...) \
+	DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]NW[%s][%ld]" FORMAT, \
+	       IO->ID, NODE, N, __VA_ARGS__)
+
+#define EVNCSM_syslog(LEVEL, FORMAT) \
+	DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]NW[%s][%ld]" FORMAT, \
+	       IO->ID, NODE, N)
+
+
 typedef enum _eNWCState {
 	eeGreating,
 	eAuth,
@@ -107,10 +133,7 @@ typedef struct _async_networker {
         AsyncIO IO;
 	DNSQueryParts HostLookup;
 	eNWCState State;
-	int fd;
 	long n;
-        FILE *TmpFile;
-        long bytes_received;
         StrBuf *SpoolFileName;
         StrBuf *tempFileName;
 	StrBuf *node;
@@ -118,11 +141,6 @@ typedef struct _async_networker {
 	StrBuf *port;
 	StrBuf *secret;
 	StrBuf		*Url;
-
-	long download_len;
-	long BlobReadSize;
-	long bytes_written;
-	long bytes_to_write;
 } AsyncNetworker;
 
 typedef eNextState(*NWClientHandler)(AsyncNetworker* NW);
@@ -131,30 +149,57 @@ eNextState nwc_get_one_host_ip(AsyncIO *IO);
 eNextState nwc_connect_ip(AsyncIO *IO);
 
 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);
+	FreeStrBuf(&NW->IO.ErrMsg);
+	FreeAsyncIOContents(&NW->IO);
+	if (NW->HostLookup.VParsedDNSReply != NULL) {
+		NW->HostLookup.DNSReplyFree(NW->HostLookup.VParsedDNSReply);
+		NW->HostLookup.VParsedDNSReply = NULL;
+	}
+	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 */
 	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));
-		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
 	}
@@ -163,6 +208,7 @@ eNextState NWC_ReadGreeting(AsyncNetworker *NW)
 
 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, 
@@ -173,6 +219,7 @@ eNextState NWC_SendAuth(AsyncNetworker *NW)
 
 eNextState NWC_ReadAuthReply(AsyncNetworker *NW)
 {
+	AsyncIO *IO = &NW->IO;
 	NWC_DBG_READ();
 	if (ChrPtr(NW->IO.IOBuf)[0] == '2')
 	{
@@ -180,10 +227,12 @@ eNextState NWC_ReadAuthReply(AsyncNetworker *NW)
 	}
 	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));
-		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;
@@ -192,21 +241,23 @@ eNextState NWC_ReadAuthReply(AsyncNetworker *NW)
 
 eNextState NWC_SendNDOP(AsyncNetworker *NW)
 {
+	AsyncIO *IO = &NW->IO;
 	NW->tempFileName = NewStrBuf();
 	NW->SpoolFileName = NewStrBuf();
-	StrBufPrintf(NW->tempFileName, 
+	StrBufPrintf(NW->SpoolFileName,
 		     "%s/%s.%lx%x",
 		     ctdl_netin_dir,
 		     ChrPtr(NW->node),
 		     time(NULL),// TODO: get time from libev
 		     rand());
-	StrBufPrintf(NW->SpoolFileName, 
+	StrBufStripSlashes(NW->SpoolFileName, 1);
+	StrBufPrintf(NW->tempFileName, 
 		     "%s/%s.%lx%x",
 		     ctdl_nettmp_dir,
 		     ChrPtr(NW->node),
 		     time(NULL),// TODO: get time from libev
 		     rand());
-
+	StrBufStripSlashes(NW->tempFileName, 1);
 	/* We're talking to the correct node.  Now identify ourselves. */
 	StrBufPlain(NW->IO.SendBuf.Buf, HKEY("NDOP\n"));
 	NWC_DBG_SEND();
@@ -215,13 +266,35 @@ eNextState NWC_SendNDOP(AsyncNetworker *NW)
 
 eNextState NWC_ReadNDOPReply(AsyncNetworker *NW)
 {
+	AsyncIO *IO = &NW->IO;
+	int TotalSendSize;
 	NWC_DBG_READ();
 	if (ChrPtr(NW->IO.IOBuf)[0] == '2')
 	{
-		NW->download_len = atol (ChrPtr(NW->IO.IOBuf) + 4);
-		syslog(LOG_DEBUG, "Expecting to transfer %ld bytes\n", NW->download_len);
-		if (NW->download_len <= 0)
+
+		NW->IO.IOB.TotalSentAlready = 0;
+		TotalSendSize = atol (ChrPtr(NW->IO.IOBuf) + 4);
+		EVN_syslog(LOG_DEBUG, "Expecting to transfer %ld bytes\n", NW->IO.IOB.TotalSendSize);
+		if (TotalSendSize <= 0) {
 			NW->State = eNUOP - 1;
+		}
+		else {
+			int fd;
+			fd = open(ChrPtr(NW->tempFileName), 
+				  O_EXCL|O_CREAT|O_NONBLOCK|O_WRONLY, 
+				  S_IRUSR|S_IWUSR);
+			if (fd < 0)
+			{
+				EVN_syslog(LOG_CRIT,
+				       "cannot open %s: %s\n", 
+				       ChrPtr(NW->tempFileName), 
+				       strerror(errno));
+
+				NW->State = eQUIT - 1;
+				return eAbort;
+			}
+			FDIOBufferInit(&NW->IO.IOB, &NW->IO.RecvBuf, fd, TotalSendSize);
+		}
 		return eSendReply;
 	}
 	else
@@ -232,7 +305,10 @@ eNextState NWC_ReadNDOPReply(AsyncNetworker *NW)
 
 eNextState NWC_SendREAD(AsyncNetworker *NW)
 {
-	if (NW->bytes_received < NW->download_len)
+	AsyncIO *IO = &NW->IO;
+	eNextState rc;
+
+	if (NW->IO.IOB.TotalSentAlready < NW->IO.IOB.TotalSendSize)
 	{
 		/*
 		 * If shutting down we can exit here and unlink the temp file.
@@ -240,51 +316,58 @@ eNextState NWC_SendREAD(AsyncNetworker *NW)
 		 */
 		if (server_shutting_down)
 		{
-			fclose(NW->TmpFile);
+			FDIOBufferDelete(&NW->IO.IOB);
 			unlink(ChrPtr(NW->tempFileName));
 			return eAbort;
 		}
 		StrBufPrintf(NW->IO.SendBuf.Buf, "READ %ld|%ld\n",
-			     NW->bytes_received,
-			     ((NW->download_len - NW->bytes_received > IGNET_PACKET_SIZE)
+			     NW->IO.IOB.TotalSentAlready,
+			     NW->IO.IOB.TotalSendSize);
+/*
+			     ((NW->IO.IOB.TotalSendSize - NW->IO.IOB.TotalSentAlready > IGNET_PACKET_SIZE)
 			      ? IGNET_PACKET_SIZE : 
-			      (NW->download_len - NW->bytes_received))
+			      (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->BlobReadSize = atol(ChrPtr(NW->IO.IOBuf)+4);
-/// TODO		StrBufReadjustIOBuffer(NW->IO.RecvBuf, NW->BlobReadSize);
-		return eReadPayload;
+		NW->IO.IOB.ChunkSendRemain = 
+			NW->IO.IOB.ChunkSize = atol(ChrPtr(NW->IO.IOBuf)+4);
+		return eReadFile;
 	}
 	return eAbort;
 }
+eNextState NWC_ReadREADBlobDone(AsyncNetworker *NW);
 eNextState NWC_ReadREADBlob(AsyncNetworker *NW)
 {
-	fwrite(ChrPtr(NW->IO.RecvBuf.Buf), NW->BlobReadSize, 1, NW->TmpFile);
-	NW->bytes_received += NW->BlobReadSize;
-	/// FlushIOBuffer(NW->IO.RecvBuf); /// TODO
-	if (NW->bytes_received < NW->download_len)
-	{
-		return eSendReply;/* now fetch next chunk*/
-	}
-	else 
+	eNextState rc;
+	AsyncIO *IO = &NW->IO;
+	NWC_DBG_READ();
+	if (NW->IO.IOB.TotalSendSize == NW->IO.IOB.TotalSentAlready)
 	{
-		fclose(NW->TmpFile);
-		
+		NW->State ++;
+
+		FDIOBufferDelete(&NW->IO.IOB);
+
 		if (link(ChrPtr(NW->tempFileName), ChrPtr(NW->SpoolFileName)) != 0) {
-			syslog(LOG_ALERT, 
+			EVN_syslog(LOG_ALERT, 
 			       "Could not link %s to %s: %s\n",
 			       ChrPtr(NW->tempFileName), 
 			       ChrPtr(NW->SpoolFileName), 
@@ -292,133 +375,205 @@ eNextState NWC_ReadREADBlob(AsyncNetworker *NW)
 		}
 	
 		unlink(ChrPtr(NW->tempFileName));
-		return eSendReply; //// TODO: step forward.
+		rc = NWC_DispatchWriteDone(&NW->IO);
+		NW->State --;
+		return rc;
+	}
+	else {
+		NW->State --;
+		NW->IO.IOB.ChunkSendRemain = NW->IO.IOB.ChunkSize;
+		return eSendReply; //NWC_DispatchWriteDone(&NW->IO);
 	}
 }
 
+eNextState NWC_ReadREADBlobDone(AsyncNetworker *NW)
+{
+	eNextState rc;
+	AsyncIO *IO = &NW->IO;
+/* we don't have any data to debug print here. */
+	if (NW->IO.IOB.TotalSendSize == NW->IO.IOB.TotalSentAlready)
+	{
+		NW->State ++;
 
+		FDIOBufferDelete(&NW->IO.IOB);
+
+		if (link(ChrPtr(NW->tempFileName), ChrPtr(NW->SpoolFileName)) != 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));
+		rc = NWC_DispatchWriteDone(&NW->IO);
+		NW->State --;
+		return rc;
+	}
+	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
-	return eTerminateConnection;
+	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;
 
-	StrBufPrintf(NW->tempFileName,
+	StrBufPrintf(NW->SpoolFileName,
 		     "%s/%s",
 		     ctdl_netout_dir,
 		     ChrPtr(NW->node));
-	NW->fd = open(ChrPtr(NW->tempFileName), O_RDONLY);
-	if (NW->fd < 0) {
+	StrBufStripSlashes(NW->SpoolFileName, 1);
+
+	fd = open(ChrPtr(NW->SpoolFileName), O_RDONLY);
+	if (fd < 0) {
 		if (errno != ENOENT) {
-			syslog(LOG_CRIT,
+			EVN_syslog(LOG_CRIT,
 			       "cannot open %s: %s\n", 
-			       ChrPtr(NW->tempFileName), 
+			       ChrPtr(NW->SpoolFileName), 
 			       strerror(errno));
 		}
 		NW->State = eQUIT;
-		return NWC_SendQUIT(NW);
+		rc = NWC_SendQUIT(NW);
+		NWC_DBG_SEND();
+		return rc;
 	}
 
-	if (fstat(NW->fd, &statbuf) == -1) {
-		syslog(9, "FSTAT FAILED %s [%s]--\n", 
-		       ChrPtr(NW->tempFileName), 
-		       strerror(errno));
-		if (NW->fd > 0) close(NW->fd);
+	if (fstat(fd, &statbuf) == -1) {
+		EVN_syslog(LOG_CRIT, "FSTAT FAILED %s [%s]--\n", 
+			   ChrPtr(NW->SpoolFileName), 
+			   strerror(errno));
+		if (fd > 0) close(fd);
 		return eAbort;
 	}
-	
-	NW->download_len = statbuf.st_size;
-	if (NW->download_len == 0) {
-		syslog(LOG_DEBUG,
+	TotalSendSize = statbuf.st_size;
+	if (TotalSendSize == 0) {
+		EVNM_syslog(LOG_DEBUG,
 		       "Nothing to send.\n");
 		NW->State = eQUIT;
-		return NWC_SendQUIT(NW);
+		rc = NWC_SendQUIT(NW);
+		NWC_DBG_SEND();
+		return rc;
 	}
-
-	NW->bytes_written = 0;
+	FDIOBufferInit(&NW->IO.IOB, &NW->IO.SendBuf, fd, TotalSendSize);
 
 	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');;;; //// todo
-	return eReadMessage;
+	if (ChrPtr(NW->IO.IOBuf)[0] != '2')
+		return eAbort;
+	return eSendReply;
 }
 
 eNextState NWC_SendWRIT(AsyncNetworker *NW)
 {
-	StrBufPrintf(NW->IO.SendBuf.Buf, "WRIT %ld\n", NW->bytes_to_write);
-
+	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')
 	{
 		return eAbort;
 	}
 
-	NW->BlobReadSize = atol(ChrPtr(NW->IO.IOBuf)+4);
-	return eSendMore;
+	NW->IO.IOB.ChunkSendRemain = 
+		NW->IO.IOB.ChunkSize = atol(ChrPtr(NW->IO.IOBuf)+4);
+	return eSendFile;
 }
 
-eNextState NWC_SendBlob(AsyncNetworker *NW)
+eNextState NWC_SendBlobDone(AsyncNetworker *NW)
 {
+	AsyncIO *IO = &NW->IO;
+	eNextState rc;
+	if (IO->IOB.TotalSendSize == NW->IO.IOB.TotalSentAlready)
+	{
+		NW->State ++;
 
-	///			bytes_to_write -= thisblock;
-	///			bytes_written += thisblock;
-
-	return eReadMessage;
+		FDIOBufferDelete(&IO->IOB);
+		rc =  NWC_DispatchWriteDone(IO);
+		NW->State --;
+		return rc;
+	}
+	else {
+		NW->State --;
+		IO->IOB.ChunkSendRemain = IO->IOB.ChunkSize;
+		rc = NWC_DispatchWriteDone(IO);
+		NW->State --;
+		return rc;
+	}
 }
 
 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->bytes_written, 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->SpoolFileName));
+		unlink(ChrPtr(NW->SpoolFileName));
 	}
 	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;
 }
 
 
@@ -431,10 +586,11 @@ NWClientHandler NWC_ReadHandlers[] = {
 	NWC_ReadCLOSReply,
 	NWC_ReadNUOPReply,
 	NWC_ReadWRITReply,
-	NULL,
+	NWC_SendBlobDone,
 	NWC_ReadUCLS,
-	NWC_ReadQUIT
-};
+	NWC_ReadQUIT};
+
+long NWC_ConnTimeout = 100;
 
 const long NWC_SendTimeouts[] = {
 	100,
@@ -462,11 +618,11 @@ NWClientHandler NWC_SendHandlers[] = {
 	NWC_SendAuth,
 	NWC_SendNDOP,
 	NWC_SendREAD,
-	NULL,
+	NWC_ReadREADBlobDone,
 	NWC_SendCLOS,
 	NWC_SendNUOP,
 	NWC_SendWRIT,
-	NWC_SendBlob,
+	NWC_SendBlobDone,
 	NWC_SendUCLS,
 	NWC_SendQUIT
 };
@@ -529,22 +685,17 @@ eNextState nwc_get_one_host_ip(AsyncIO *IO)
 {
 	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, 
@@ -559,6 +710,7 @@ eNextState nwc_get_one_host_ip(AsyncIO *IO)
  */
 eReadState NWC_ReadServerStatus(AsyncIO *IO)
 {
+//	AsyncNetworker *NW = IO->Data;
 	eReadState Finished = eBufferNotEmpty; 
 
 	switch (IO->NextState) {
@@ -576,6 +728,8 @@ eReadState NWC_ReadServerStatus(AsyncIO *IO)
 	case eReadMessage: 
 		Finished = StrBufChunkSipLine(IO->IOBuf, &IO->RecvBuf);
 		break;
+	case eReadFile:
+	case eSendFile:
 	case eReadPayload:
 		break;
 	}
@@ -586,30 +740,70 @@ eReadState NWC_ReadServerStatus(AsyncIO *IO)
 
 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 - %d\n", __FUNCTION__, NextTCPState);
+
+	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;
+	}
+	if (Timeout > 0) {
+		EVN_syslog(LOG_DEBUG, 
+			   "%s - %d %f\n",
+			   __FUNCTION__,
+			   NextTCPState,
+			   Timeout);
+		SetNextTimeout(&NW->IO, Timeout*100);
+	}
 }
 
 
 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;
 }
 
@@ -618,35 +812,55 @@ eNextState NWC_DispatchWriteDone(AsyncIO *IO)
 /*****************************************************************************/
 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_TerminateDB(AsyncIO *IO)
+{
+	EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+	FinalizeNetworker(IO);
 	return eAbort;
 }
 
 eNextState NWC_Timeout(AsyncIO *IO)
 {
-//	AsyncNetworker *NW = IO->Data;
+	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
+	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__);
+	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;
+
+	EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
+	if (NW->IO.ErrMsg == NULL)
+		NW->IO.ErrMsg = NewStrBuf();
+	StrBufPrintf(NW->IO.ErrMsg, "failed to look up %s \r\n", ChrPtr(NW->host));
 
-	syslog(LOG_DEBUG, "NW: %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__);
-////	pop3aggr *pMsg = IO->Data;
+	EVN_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
 
-	////pMsg->MyQEntry->Status = 3;
-	///StrBufPlain(pMsg->MyQEntry->StatusMessage, HKEY("server shutdown during message retrieval."));
-///	FinalizePOP3AggrRun(IO); todo
+	FinalizeNetworker(IO);
 	return eAbort;
 }
 
@@ -655,47 +869,42 @@ eNextState nwc_connect_ip(AsyncIO *IO)
 {
 	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;
-
+	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.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_TerminateDB,
+		     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,
@@ -717,6 +926,7 @@ void network_poll_other_citadel_nodes(int full_poll, char *working_ignetcfg)
 	AsyncNetworker *NW;
 	StrBuf *CfgData;
 	StrBuf *Line;
+	StrBuf *SpoolFileName;
 	const char *lptr;
 	const char *CfgPtr;
 	int Done;
@@ -727,7 +937,10 @@ void network_poll_other_citadel_nodes(int full_poll, char *working_ignetcfg)
 		syslog(LOG_DEBUG, "network: no neighbor nodes are configured - not polling.\n");
 		return;
 	}
+	become_session(&networker_client_CC);
+
 	CfgData = NewStrBufPlain(working_ignetcfg, -1);
+	SpoolFileName = NewStrBufPlain(ctdl_netout_dir, -1);
 	Line = NewStrBufPlain(NULL, StrLength(CfgData));
 	Done = 0;
 	CfgPtr = NULL;
@@ -762,30 +975,36 @@ void network_poll_other_citadel_nodes(int full_poll, char *working_ignetcfg)
 				poll = full_poll;
 				if (poll == 0)
 				{
-					NW->SpoolFileName = NewStrBufPlain(ctdl_netout_dir, -1);
-					StrBufAppendBufPlain(NW->SpoolFileName, HKEY("/"), 0);
-					StrBufAppendBuf(NW->SpoolFileName, NW->node, 0);
-					if (access(ChrPtr(NW->SpoolFileName), R_OK) == 0) {
+					StrBufAppendBufPlain(SpoolFileName, HKEY("/"), 0);
+					StrBufAppendBuf(SpoolFileName, NW->node, 0);
+					StrBufStripSlashes(SpoolFileName, 1);
+
+					if (access(ChrPtr(SpoolFileName), R_OK) == 0) {
 						poll = 1;
 					}
 				}
 			}
-			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(&SpoolFileName);
+	FreeStrBuf(&CfgData);
+	FreeStrBuf(&Line);
 
 }
 
@@ -818,8 +1037,10 @@ void network_do_clientqueue(void)
 		free(working_ignetcfg);
 }
 
-
-
+void LogDebugEnableNetworkClient(const int n)
+{
+	NetworkClientDebugEnabled = n;
+}
 /*
  * Module entry point
  */
@@ -830,6 +1051,8 @@ CTDL_MODULE_INIT(network_client)
 		CtdlFillSystemContext(&networker_client_CC, "CitNetworker");
 		
 		CtdlRegisterSessionHook(network_do_clientqueue, EVT_TIMER);
+		CtdlRegisterDebugFlagHook(HKEY("networkclient"), LogDebugEnableNetworkClient, &NetworkClientDebugEnabled);
+
 	}
-	return "network_client";
+	return "networkclient";
 }