X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Feventclient%2Fserv_eventclient.c;h=75e1f785ae905ccecb2c34317ea887e7252ff4b3;hb=3228daa54e93fe68aeb0e08a428795fa6dcc0d28;hp=adf896972a0eb702a79dadd689179c3db5268774;hpb=96f09a277a33193bf175b81fbf79e676ab228615;p=citadel.git

diff --git a/citadel/modules/eventclient/serv_eventclient.c b/citadel/modules/eventclient/serv_eventclient.c
index adf896972..75e1f785a 100644
--- a/citadel/modules/eventclient/serv_eventclient.c
+++ b/citadel/modules/eventclient/serv_eventclient.c
@@ -147,6 +147,7 @@ gotstatus(int nnrun)
 					      IO);
 				continue;
 			}
+			SetEVState(IO, eCurlGotStatus);
 
 			EVCURLM_syslog(LOG_DEBUG, "request complete\n");
 
@@ -186,15 +187,12 @@ gotstatus(int nnrun)
 					      "%s\n",
 					      curl_multi_strerror(msta));
 
-		       ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
+			ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
 
 			IO->HttpReq.attached = 0;
 			switch(IO->SendDone(IO))
 			{
 			case eDBQuery:
-				curl_easy_cleanup(IO->HttpReq.chnd);
-				IO->HttpReq.chnd = NULL;
-				break;
 			case eSendDNSQuery:
 			case eReadDNSReply:
 			case eConnect:
@@ -205,8 +203,6 @@ gotstatus(int nnrun)
 			case eReadMore:
 			case eReadPayload:
 			case eReadFile:
-				curl_easy_cleanup(IO->HttpReq.chnd);
-				IO->HttpReq.chnd = NULL;
 				break;
 			case eTerminateConnection:
 			case eAbort:
@@ -272,9 +268,11 @@ got_out(struct ev_loop *loop, ev_io *ioev, int events)
 }
 
 static size_t
-gotdata(void *data, size_t size, size_t nmemb, void *cglobal) {
+gotdata(void *data, size_t size, size_t nmemb, void *cglobal)
+{
 	AsyncIO *IO = (AsyncIO*) cglobal;
 
+	SetEVState(IO, eCurlGotData);
 	if (IO->HttpReq.ReplyData == NULL)
 	{
 		IO->HttpReq.ReplyData = NewStrBufPlain(NULL, SIZ);
@@ -316,13 +314,14 @@ gotwatchsock(CURL *easy,
 	if (IO == NULL) {
 		sta = curl_easy_getinfo(easy, CURLINFO_PRIVATE, &f);
 		if (sta) {
-			EVCURL_syslog(LOG_ERR,
-				      "EVCURL: error asking curl for private "
-				      "cookie of curl handle: %s\n",
-				      curl_easy_strerror(sta));
+			CURL_syslog(LOG_ERR,
+				    "EVCURL: error asking curl for private "
+				    "cookie of curl handle: %s\n",
+				    curl_easy_strerror(sta));
 			return -1;
 		}
 		IO = (AsyncIO *) f;
+		SetEVState(IO, eCurlNewIO);
 		EVCURL_syslog(LOG_DEBUG,
 			      "EVCURL: got socket for URL: %s\n",
 			      IO->ConnectMe->PlainUrl);
@@ -338,6 +337,7 @@ gotwatchsock(CURL *easy,
 		curl_multi_assign(mhnd, fd, IO);
 	}
 
+	SetEVState(IO, eCurlGotIO);
 	IO->Now = ev_now(event_base);
 
 	Action = "";
@@ -495,6 +495,8 @@ static void IOcurl_abort_shutdown_callback(struct ev_loop *loop,
 
 	if (IO == NULL)
 		return;
+
+	SetEVState(IO, eCurlShutdown);
 	IO->Now = ev_now(event_base);
 	EVCURL_syslog(LOG_DEBUG, "EVENT Curl: %s\n", __FUNCTION__);
 
@@ -523,6 +525,7 @@ evcurl_handle_start(AsyncIO *IO)
 	CURLcode sta;
 	CURL *chnd;
 
+	SetEVState(IO, eCurlStart);
 	chnd = IO->HttpReq.chnd;
 	EVCURL_syslog(LOG_DEBUG,
 		  "EVCURL: Loading URL: %s\n", IO->ConnectMe->PlainUrl);
@@ -593,6 +596,7 @@ pthread_mutex_t EventExitQueueMutex; /* locks the access to the event queue poin
 HashList *QueueEvents = NULL;
 HashList *InboundEventQueue = NULL;
 HashList *InboundEventQueues[2] = { NULL, NULL };
+extern void ShutDownCLient(AsyncIO *IO);
 
 ev_async AddJob;
 ev_async ExitEventLoop;
@@ -630,11 +634,31 @@ static void QueueEventAddCallback(EV_P_ ev_async *w, int revents)
 		if (h->IO->StartIO == 0.0)
 			h->IO->StartIO = Now;
 
+		SetEVState(h->IO, eIOAttach);
+
 		Ctx = h->IO->CitContext;
 		become_session(Ctx);
 
 		h->IO->Now = Now;
-		h->EvAttch(h->IO);
+		switch (h->EvAttch(h->IO))
+		{
+		case eReadMore:
+		case eReadMessage:
+		case eReadFile:
+		case eSendReply:
+		case eSendMore:
+		case eReadPayload:
+		case eSendFile:
+		case eDBQuery:
+		case eSendDNSQuery:
+		case eReadDNSReply:
+		case eConnect:
+			break;
+		case eTerminateConnection:
+		case eAbort:
+			ShutDownCLient(h->IO);
+		break;
+		}
 	}
 	DeleteHashPos(&It);
 	DeleteHashContent(&q);
@@ -760,6 +784,7 @@ static void DBQueueEventAddCallback(EV_P_ ev_async *w, int revents)
 			h->IO->StartDB = Now;
 		h->IO->Now = Now;
 
+		SetEVState(h->IO, eDBAttach);
 		Ctx = h->IO->CitContext;
 		become_session(Ctx);
 		ev_cleanup_start(event_db, &h->IO->db_abort_by_shutdown);