X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fevent_client.c;h=4ab63a4a292bbd1edb08e490b195698d75decddf;hb=4c274aa94a53d8850ed363e64c5863970fe629a4;hp=d64e95bacc6da8b6ad648a931d3a9931c1fad697;hpb=1493fd8ff0de73d30336607b43b1c8113ffcffa2;p=citadel.git

diff --git a/citadel/event_client.c b/citadel/event_client.c
index d64e95bac..4ab63a4a2 100644
--- a/citadel/event_client.c
+++ b/citadel/event_client.c
@@ -26,6 +26,8 @@
 
 #include "ctdl_module.h"
 #include "event_client.h"
+#include "citserver.h"
+#include "config.h"
 
 ConstStr IOStates[] = {
 	{HKEY("DB Queue")},
@@ -68,7 +70,7 @@ void SetEVState(AsyncIO *IO, eIOState State)
 
 }
 
-
+eNextState QueueAnEventContext(AsyncIO *IO);
 static void IO_Timeout_callback(struct ev_loop *loop, ev_timer *watcher, int revents);
 static void IO_abort_shutdown_callback(struct ev_loop *loop,
 				       ev_cleanup *watcher,
@@ -86,7 +88,7 @@ extern struct ev_loop *event_db;
 extern ev_async DBAddJob;
 extern ev_async DBExitEventLoop;
 
-eNextState QueueDBOperation(AsyncIO *IO, IO_CallBack CB)
+eNextState QueueAnDBOperation(AsyncIO *IO)
 {
 	IOAddHandler *h;
 	int i;
@@ -94,7 +96,10 @@ eNextState QueueDBOperation(AsyncIO *IO, IO_CallBack CB)
 	SetEVState(IO, eDBQ);
 	h = (IOAddHandler*)malloc(sizeof(IOAddHandler));
 	h->IO = IO;
-	h->EvAttch = CB;
+
+	assert(IO->ReAttachCB != NULL);
+
+	h->EvAttch = IO->ReAttachCB;
 	ev_cleanup_init(&IO->db_abort_by_shutdown,
 			IO_abort_shutdown_callback);
 	IO->db_abort_by_shutdown.data = IO;
@@ -122,7 +127,7 @@ eNextState QueueDBOperation(AsyncIO *IO, IO_CallBack CB)
 	ev_async_send (event_db, &DBAddJob);
 	pthread_mutex_unlock(&DBEventExitQueueMutex);
 
-	EVM_syslog(LOG_DEBUG, "DBEVENT Q Done.\n");
+	EVQM_syslog(LOG_DEBUG, "DBEVENT Q Done.\n");
 	return eDBQuery;
 }
 
@@ -152,7 +157,7 @@ DB_PerformNext(struct ev_loop *loop, ev_idle *watcher, int revents)
 	AsyncIO *IO = watcher->data;
 
 	SetEVState(IO, eDBNext);
-	IO->Now = ev_now(event_db);
+	SET_EV_TIME(IO, event_db);
 	EV_syslog(LOG_DEBUG, "%s()", __FUNCTION__);
 	become_session(IO->CitContext);
 
@@ -161,12 +166,15 @@ DB_PerformNext(struct ev_loop *loop, ev_idle *watcher, int revents)
 	assert(IO->NextDBOperation);
 	switch (IO->NextDBOperation(IO))
 	{
+	case eSendReply:
+		ev_cleanup_stop(loop, &IO->db_abort_by_shutdown);
+		QueueAnEventContext(IO);
+		break;
 	case eDBQuery:
 		break;
 	case eSendDNSQuery:
 	case eReadDNSReply:
 	case eConnect:
-	case eSendReply:
 	case eSendMore:
 	case eSendFile:
 	case eReadMessage:
@@ -213,13 +221,13 @@ static void IO_abort_shutdown_callback(struct ev_loop *loop,
 
 	SetEVState(IO, eIOAbort);
 	EV_syslog(LOG_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
-	IO->Now = ev_now(event_base);
+	SET_EV_TIME(IO, event_base);
 	assert(IO->ShutdownAbort);
 	IO->ShutdownAbort(IO);
 }
 
 
-eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB)
+eNextState QueueAnEventContext(AsyncIO *IO)
 {
 	IOAddHandler *h;
 	int i;
@@ -227,7 +235,11 @@ eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB)
 	SetEVState(IO, eIOQ);
 	h = (IOAddHandler*)malloc(sizeof(IOAddHandler));
 	h->IO = IO;
-	h->EvAttch = CB;
+
+	assert(IO->ReAttachCB != NULL);
+
+	h->EvAttch = IO->ReAttachCB;
+
 	ev_cleanup_init(&IO->abort_by_shutdown,
 			IO_abort_shutdown_callback);
 	IO->abort_by_shutdown.data = IO;
@@ -257,15 +269,23 @@ eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB)
 	return eSendReply;
 }
 
-eNextState EventQueueDBOperation(AsyncIO *IO, IO_CallBack CB)
+eNextState EventQueueDBOperation(AsyncIO *IO, IO_CallBack CB, int CloseFDs)
 {
-	StopClientWatchers(IO, 0);
-	return QueueDBOperation(IO, CB);
+	StopClientWatchers(IO, CloseFDs);
+	IO->ReAttachCB = CB;
+	return eDBQuery;
 }
 eNextState DBQueueEventContext(AsyncIO *IO, IO_CallBack CB)
 {
 	StopDBWatchers(IO);
-	return QueueEventContext(IO, CB);
+	IO->ReAttachCB = CB;
+	return eSendReply;
+}
+
+eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB)
+{
+	IO->ReAttachCB = CB;
+	return QueueAnEventContext(IO);
 }
 
 extern eNextState evcurl_handle_start(AsyncIO *IO);
@@ -310,11 +330,11 @@ eNextState QueueCurlContext(AsyncIO *IO)
 eNextState CurlQueueDBOperation(AsyncIO *IO, IO_CallBack CB)
 {
 	StopCurlWatchers(IO);
-	return QueueDBOperation(IO, CB);
+	IO->ReAttachCB = CB;
+	return eDBQuery;
 }
 
 
-void DestructCAres(AsyncIO *IO);
 void FreeAsyncIOContents(AsyncIO *IO)
 {
 	CitContext *Ctx = IO->CitContext;
@@ -323,8 +343,6 @@ void FreeAsyncIOContents(AsyncIO *IO)
 	FreeStrBuf(&IO->SendBuf.Buf);
 	FreeStrBuf(&IO->RecvBuf.Buf);
 
-	DestructCAres(IO);
-
 	FreeURL(&IO->ConnectMe);
 	FreeStrBuf(&IO->HttpReq.ReplyData);
 
@@ -336,10 +354,13 @@ void FreeAsyncIOContents(AsyncIO *IO)
 }
 
 
+void DestructCAres(AsyncIO *IO);
 void StopClientWatchers(AsyncIO *IO, int CloseFD)
 {
 	EVM_syslog(LOG_DEBUG, "EVENT StopClientWatchers");
 	
+	DestructCAres(IO);
+
 	ev_timer_stop (event_base, &IO->rw_timeout);
 	ev_timer_stop(event_base, &IO->conn_fail);
 	ev_idle_stop(event_base, &IO->unwind_stack);
@@ -379,7 +400,7 @@ void StopCurlWatchers(AsyncIO *IO)
 	IO->RecvBuf.fd = 0;
 }
 
-void ShutDownCLient(AsyncIO *IO)
+eNextState ShutDownCLient(AsyncIO *IO)
 {
 	CitContext *Ctx =IO->CitContext;
 
@@ -399,11 +420,12 @@ void ShutDownCLient(AsyncIO *IO)
 		IO->DNS.Channel = NULL;
 	}
 	assert(IO->Terminate);
-	IO->Terminate(IO);
+	return IO->Terminate(IO);
 }
 
 void PostInbound(AsyncIO *IO)
 {
+
 	switch (IO->NextState) {
 	case eSendFile:
 		ev_io_start(event_base, &IO->send_event);
@@ -425,6 +447,7 @@ void PostInbound(AsyncIO *IO)
 			break;
 		case eDBQuery:
  			StopClientWatchers(IO, 0);
+			QueueAnDBOperation(IO);
 		default:
 			break;
 		}
@@ -435,17 +458,18 @@ void PostInbound(AsyncIO *IO)
 		ev_io_start(event_base, &IO->recv_event);
 		break;
 	case eTerminateConnection:
-		ShutDownCLient(IO);
-		break;
 	case eAbort:
-		ShutDownCLient(IO);
+		if (ShutDownCLient(IO) == eDBQuery) {
+			QueueAnDBOperation(IO);
+		}
 		break;
 	case eSendDNSQuery:
 	case eReadDNSReply:
-	case eDBQuery:
 	case eConnect:
 	case eReadMessage:
 		break;
+	case eDBQuery:
+		QueueAnDBOperation(IO);
 	}
 }
 eReadState HandleInbound(AsyncIO *IO)
@@ -493,10 +517,17 @@ eReadState HandleInbound(AsyncIO *IO)
 		}
 
 		if (Finished != eMustReadMore) {
-			assert(IO->ReadDone);
 			ev_io_stop(event_base, &IO->recv_event);
 			IO->NextState = IO->ReadDone(IO);
-			Finished = StrBufCheckBuffer(&IO->RecvBuf);
+			if  (IO->NextState == eDBQuery) {
+				if (QueueAnDBOperation(IO) == eAbort)
+					return eReadFail;
+				else
+					return eReadSuccess;
+			}
+			else {
+				Finished = StrBufCheckBuffer(&IO->RecvBuf);
+			}
 		}
 	}
 
@@ -513,7 +544,7 @@ IO_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 	AsyncIO *IO = watcher->data;
 	const char *errmsg = NULL;
 
-	IO->Now = ev_now(event_base);
+	SET_EV_TIME(IO, event_base);
 	become_session(IO->CitContext);
 #ifdef BIGBAD_IODBG
 	{
@@ -533,6 +564,11 @@ IO_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 			 IO->SendBuf.fd);
 
 		fd = fopen(fn, "a+");
+		if (fd == NULL) {
+			syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno));
+			cit_backtrace();
+			exit(1);
+		}
 		fprintf(fd, "Send: BufSize: %ld BufContent: [",
 			nbytes);
 		rv = fwrite(pchh, nbytes, 1, fd);
@@ -685,7 +721,7 @@ IO_Timeout_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
 	AsyncIO *IO = watcher->data;
 
 	SetEVState(IO, eIOTimeout);
-	IO->Now = ev_now(event_base);
+	SET_EV_TIME(IO, event_base);
 	ev_timer_stop (event_base, &IO->rw_timeout);
 	become_session(IO->CitContext);
 
@@ -714,7 +750,7 @@ IO_connfail_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
 	AsyncIO *IO = watcher->data;
 
 	SetEVState(IO, eIOConnfail);
-	IO->Now = ev_now(event_base);
+	SET_EV_TIME(IO, event_base);
 	ev_timer_stop (event_base, &IO->conn_fail);
 
 	if (IO->SendBuf.fd != 0)
@@ -747,7 +783,7 @@ IO_connfailimmediate_callback(struct ev_loop *loop,
 	AsyncIO *IO = watcher->data;
 
 	SetEVState(IO, eIOConnfailNow);
-	IO->Now = ev_now(event_base);
+	SET_EV_TIME(IO, event_base);
 	ev_idle_stop (event_base, &IO->conn_fail_immediate);
 
 	if (IO->SendBuf.fd != 0)
@@ -777,7 +813,7 @@ IO_connestd_callback(struct ev_loop *loop, ev_io *watcher, int revents)
         int             err;
 
 	SetEVState(IO, eIOConnNow);
-        IO->Now = ev_now(event_base);
+	SET_EV_TIME(IO, event_base);
         EVM_syslog(LOG_DEBUG, "connect() succeeded.\n");
 
         ev_io_stop(loop, &IO->conn_event);
@@ -811,7 +847,7 @@ IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 	ssize_t nbytes;
 	AsyncIO *IO = watcher->data;
 
-	IO->Now = ev_now(event_base);
+	SET_EV_TIME(IO, event_base);
 	switch (IO->NextState) {
 	case eReadFile:
 		nbytes = FileRecvChunked(&IO->IOB, &errmsg);
@@ -856,6 +892,11 @@ IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 			 IO->SendBuf.fd);
 
 		fd = fopen(fn, "a+");
+		if (fd == NULL) {
+			syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno));
+			cit_backtrace();
+			exit(1);
+		}
 		fprintf(fd, "Read: BufSize: %ld BufContent: [",
 			nbytes);
 		rv = fwrite(pchh, nbytes, 1, fd);
@@ -892,7 +933,7 @@ IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
 	AsyncIO *IO = watcher->data;
 
 	SetEVState(IO, eCaresFinished);
-	IO->Now = ev_now(event_base);
+	SET_EV_TIME(IO, event_base);
 	EV_syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
 	become_session(IO->CitContext);
 	assert(IO->DNS.Query->PostDNS);
@@ -904,9 +945,18 @@ IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
 		case eAbort:
 ////			StopClientWatchers(IO);
 			ShutDownCLient(IO);
+			break;
+		case eDBQuery:
+			StopClientWatchers(IO, 0);
+			QueueAnDBOperation(IO);
+			break;
 		default:
 			break;
 		}
+	case eDBQuery:
+		StopClientWatchers(IO, 0);
+		QueueAnDBOperation(IO);
+		break;
 	default:
 		break;
 	}
@@ -1010,8 +1060,8 @@ eNextState EvConnectSock(AsyncIO *IO,
 	
 		memset(&egress_sin, 0, sizeof(egress_sin));
 		egress_sin.sin_family = AF_INET;
-		if (!IsEmptyStr(config.c_ip_addr)) {
-			egress_sin.sin_addr.s_addr = inet_addr(config.c_ip_addr);
+		if (!IsEmptyStr(CtdlGetConfigStr("c_ip_addr"))) {
+			egress_sin.sin_addr.s_addr = inet_addr(CtdlGetConfigStr("c_ip_addr"));
 			if (egress_sin.sin_addr.s_addr == !INADDR_ANY) {
 				egress_sin.sin_addr.s_addr = INADDR_ANY;
 			}
@@ -1191,8 +1241,13 @@ eNextState KillOtherContextNow(AsyncIO *IO)
 
 	SetEVState(IO, eKill);
 
-	if (Ctx->OtherOne->ShutdownAbort != NULL)
-		Ctx->OtherOne->ShutdownAbort(Ctx->OtherOne);
+	if (Ctx->OtherOne->ShutdownAbort != NULL) {
+		Ctx->OtherOne->NextState = eAbort;
+		if (Ctx->OtherOne->ShutdownAbort(Ctx->OtherOne) == eDBQuery) {
+ 			StopClientWatchers(Ctx->OtherOne, 0);
+			QueueAnDBOperation(Ctx->OtherOne);
+		}
+	}
 	return eTerminateConnection;
 }
 
@@ -1231,10 +1286,12 @@ void KillAsyncIOContext(AsyncIO *IO)
 	case eReadMore:
 	case eReadPayload:
 	case eReadFile:
-		QueueEventContext(&Ctx->IO, KillOtherContextNow);
+		Ctx->IO.ReAttachCB = KillOtherContextNow;
+		QueueAnEventContext(&Ctx->IO);
 		break;
 	case eDBQuery:
-		QueueDBOperation(&Ctx->IO, KillOtherContextNow);
+		Ctx->IO.ReAttachCB = KillOtherContextNow;
+		QueueAnDBOperation(&Ctx->IO);
 		break;
 	case eTerminateConnection:
 	case eAbort: