fix loop / handling error when connecting fails immediately

[citadel.git] / citadel / event_client.c

diff --git a/citadel/event_client.c b/citadel/event_client.c
index 11aabf96388ca72d464f219e59e4b8882eb5e590..37a943a45e90cd909b40e5099291c7ac1770a3a2 100644 (file)
--- a/citadel/event_client.c
+++ b/citadel/event_client.c
@@ -123,12 +123,8 @@ void FreeAsyncIOContents(AsyncIO *IO)
 }
 
 
-void ShutDownCLient(AsyncIO *IO)
+void StopClientWatchers(AsyncIO *IO)
 {
-       CtdlLogPrintf(CTDL_DEBUG, "EVENT x %d\n", IO->SendBuf.fd);
-
-       ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
-
        ev_timer_stop(event_base, &IO->conn_fail);
        ev_io_stop(event_base, &IO->conn_event);
        ev_idle_stop(event_base, &IO->unwind_stack);
@@ -142,6 +138,15 @@ void ShutDownCLient(AsyncIO *IO)
                IO->SendBuf.fd = 0;
                IO->RecvBuf.fd = 0;
        }
+}
+
+void ShutDownCLient(AsyncIO *IO)
+{
+       CtdlLogPrintf(CTDL_DEBUG, "EVENT x %d\n", IO->SendBuf.fd);
+       ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
+
+       StopClientWatchers(IO);
+
        if (IO->DNSChannel != NULL) {
                ares_destroy(IO->DNSChannel);
                ev_io_stop(event_base, &IO->dns_recv_event);
@@ -269,6 +274,9 @@ IO_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
                        }
 
                        break;
+               case eSendDNSQuery:
+               case eReadDNSReply:
+               case eConnect:
                case eTerminateConnection:
                case eAbort:
                        break;
@@ -293,6 +301,9 @@ set_start_callback(struct ev_loop *loop, AsyncIO *IO, int revents)
                become_session(IO->CitContext);
                IO_send_callback(loop, &IO->send_event, revents);
                break;
+       case eSendDNSQuery:
+       case eReadDNSReply:
+       case eConnect:
        case eTerminateConnection:
        case eAbort:
                /// TODO: WHUT?
@@ -301,13 +312,22 @@ set_start_callback(struct ev_loop *loop, AsyncIO *IO, int revents)
 }
 
 static void
-IO_Timout_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
+IO_Timeout_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
 {
        AsyncIO *IO = watcher->data;
 
        ev_timer_stop (event_base, &IO->rw_timeout);
        become_session(IO->CitContext);
 
+       if (IO->SendBuf.fd != 0)
+       {
+               ev_io_stop(event_base, &IO->send_event);
+               ev_io_stop(event_base, &IO->recv_event);
+               ev_timer_stop (event_base, &IO->rw_timeout);
+               close(IO->SendBuf.fd);
+               IO->SendBuf.fd = IO->RecvBuf.fd = 0;
+       }
+
        assert(IO->Timeout);
         switch (IO->Timeout(IO))
        {
@@ -317,13 +337,23 @@ IO_Timout_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
                break;
        }
 }
+
 static void
 IO_connfail_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
 {
        AsyncIO *IO = watcher->data;
 
        ev_timer_stop (event_base, &IO->conn_fail);
-       ev_io_stop(loop, &IO->conn_event);
+
+       if (IO->SendBuf.fd != 0)
+       {
+               ev_io_stop(loop, &IO->conn_event);
+               ev_io_stop(event_base, &IO->send_event);
+               ev_io_stop(event_base, &IO->recv_event);
+               ev_timer_stop (event_base, &IO->rw_timeout);
+               close(IO->SendBuf.fd);
+               IO->SendBuf.fd = IO->RecvBuf.fd = 0;
+       }
        become_session(IO->CitContext);
 
        assert(IO->ConnFail);
@@ -336,6 +366,32 @@ IO_connfail_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
 
        }
 }
+
+static void
+IO_connfailimmediate_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
+{
+       AsyncIO *IO = watcher->data;
+
+       ev_idle_stop (event_base, &IO->conn_fail_immediate);
+
+       if (IO->SendBuf.fd != 0)
+       {
+               close(IO->SendBuf.fd);
+               IO->SendBuf.fd = IO->RecvBuf.fd = 0;
+       }
+       become_session(IO->CitContext);
+
+       assert(IO->ConnFail);
+        switch (IO->ConnFail(IO))
+       {
+       case eAbort:
+               ShutDownCLient(IO);
+       default:
+               break;
+
+       }
+}
+
 static void
 IO_connestd_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 {
@@ -378,7 +434,13 @@ IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
        CtdlLogPrintf(CTDL_DEBUG, "event: %s\n", __FUNCTION__);
        become_session(IO->CitContext);
 
-       IO->DNSQuery->PostDNS(IO);
+       switch (IO->DNSQuery->PostDNS(IO))
+       {
+       case eAbort:
+           ShutDownCLient(IO);
+       default:
+           break;
+       }
 }
 
 eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_rw_timeout)
@@ -426,7 +488,7 @@ eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_r
 
        ev_timer_init(&IO->conn_fail, IO_connfail_callback, conn_timeout, 0);
        IO->conn_fail.data = IO;
-       ev_timer_init(&IO->rw_timeout, IO_Timout_callback, first_rw_timeout, 0);
+       ev_timer_init(&IO->rw_timeout, IO_Timeout_callback, first_rw_timeout, 0);
        IO->rw_timeout.data = IO;
 
        if (IO->ConnectMe->IPv6)
@@ -435,12 +497,14 @@ eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_r
                rc = connect(IO->SendBuf.fd, (struct sockaddr_in *)&IO->ConnectMe->Addr, sizeof(struct sockaddr_in));
 
        if (rc >= 0){
+               CtdlLogPrintf(CTDL_DEBUG, "connect() immediate success.\n");
 ////           freeaddrinfo(res);
                set_start_callback(event_base, IO, 0);
                ev_timer_start(event_base, &IO->rw_timeout);
                return IO->NextState;
        }
        else if (errno == EINPROGRESS) {
+               CtdlLogPrintf(CTDL_DEBUG, "connect() have to wait now.\n");
 
                ev_io_init(&IO->conn_event, IO_connestd_callback, IO->SendBuf.fd, EV_READ|EV_WRITE);
                IO->conn_event.data = IO;
@@ -450,11 +514,14 @@ eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_r
                return IO->NextState;
        }
        else {
+               ev_idle_init(&IO->conn_fail_immediate,
+                            IO_connfailimmediate_callback);
+               IO->conn_fail_immediate.data = IO;
+               ev_idle_start(event_base, &IO->conn_fail_immediate);
+               
                CtdlLogPrintf(CTDL_ERR, "connect() failed: %s\n", strerror(errno));
                StrBufPrintf(IO->ErrMsg, "Failed to connect: %s", strerror(errno));
-               assert(IO->ConnFail);
-               IO->ConnFail(IO);
-               return eAbort;
+               return IO->NextState;
        }
        return IO->NextState;
 }