EVENT-Q: the IO eventqueue also needs to check the reply of the attach function for...

diff --git a/citadel/modules/eventclient/serv_eventclient.c b/citadel/modules/eventclient/serv_eventclient.c
index d54d72947ee99fd26fef456cad530c537e351aa7..01492e56c437900bed34673196dc484f2908a2a2 100644 (file)
--- a/citadel/modules/eventclient/serv_eventclient.c
+++ b/citadel/modules/eventclient/serv_eventclient.c
@@ -593,6 +593,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;
@@ -634,7 +635,25 @@ static void QueueEventAddCallback(EV_P_ ev_async *w, int revents)
                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);