Re-Sort Cleanup of event io on shutdown

[citadel.git] / citadel / event_client.c

diff --git a/citadel/event_client.c b/citadel/event_client.c
index d9e09b48b12448604c4d88a1ea97efaa0e06251e..1589e7303cd4c5c89d981ce56cf42476228e2ce6 100644 (file)
--- a/citadel/event_client.c
+++ b/citadel/event_client.c
@@ -357,7 +357,7 @@ eReadState HandleInbound(AsyncIO *IO)
                ev_io_start(event_base, &IO->recv_event);
                break;
        case eTerminateConnection:
-//////TODOxxxx
+               ShutDownCLient(IO);
                break;
        case eAbort:
                ShutDownCLient(IO);
@@ -708,11 +708,11 @@ IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
        AsyncIO *IO = watcher->data;
        EV_syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
        become_session(IO->CitContext);
-       assert(IO->DNS.Fail);
        assert(IO->DNS.Query->PostDNS);
        switch (IO->DNS.Query->PostDNS(IO))
        {
        case eAbort:
+               assert(IO->DNS.Fail);
                switch (IO->DNS.Fail(IO)) {
                case eAbort:
 ////                   StopClientWatchers(IO);