EVENT: when handling errors EAGAIN isn't fatal.

[citadel.git] / citadel / event_client.c

diff --git a/citadel/event_client.c b/citadel/event_client.c
index 7b409fcf4a49404e85607402f5947faa046d642f..c4016dc1c6e2a3b4c53e3f39d5d4f58604ccd7af 100644 (file)
--- a/citadel/event_client.c
+++ b/citadel/event_client.c
@@ -584,13 +584,18 @@ IO_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
                }
        }
        else if (rc < 0) {
-               IO_Timeout_callback(loop, &IO->rw_timeout, revents);
+               if (errno != EAGAIN) {
+                       IO_Timeout_callback(loop, &IO->rw_timeout, revents);
+               }
        }
        /* else : must write more. */
 }
 static void
 set_start_callback(struct ev_loop *loop, AsyncIO *IO, int revents)
 {
+       ev_timer_stop(event_base, &IO->conn_fail);
+       ev_timer_start(event_base, &IO->rw_timeout);
+
        switch(IO->NextState) {
        case eReadMore:
        case eReadMessage:
@@ -705,15 +710,38 @@ IO_connfailimmediate_callback(struct ev_loop *loop,
 static void
 IO_connestd_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 {
-       AsyncIO *IO = watcher->data;
-
-       IO->Now = ev_now(event_base);
-       EVM_syslog(LOG_DEBUG, "connect() succeeded.\n");
-
-       ev_io_stop(loop, &IO->conn_event);
-       ev_timer_stop (event_base, &IO->conn_fail);
-       set_start_callback(loop, IO, revents);
+        AsyncIO *IO = watcher->data;
+        int             so_err = 0;
+        socklen_t       lon = sizeof(so_err);
+        int             err;
+
+        IO->Now = ev_now(event_base);
+        EVM_syslog(LOG_DEBUG, "connect() succeeded.\n");
+
+        ev_io_stop(loop, &IO->conn_event);
+        ev_timer_stop(event_base, &IO->conn_fail);
+
+        err = getsockopt(IO->SendBuf.fd,
+                         SOL_SOCKET,
+                         SO_ERROR,
+                         (void*)&so_err,
+                         &lon);
+
+        if ((err == 0) && (so_err != 0))
+        {
+                EV_syslog(LOG_DEBUG, "connect() failed [%d][%s]\n",
+                          so_err,
+                          strerror(so_err));
+                IO_connfail_callback(loop, &IO->conn_fail, revents);
+
+        }
+        else
+        {
+                EVM_syslog(LOG_DEBUG, "connect() succeeded\n");
+                set_start_callback(loop, IO, revents);
+        }
 }
+
 static void
 IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
 {
@@ -780,12 +808,14 @@ IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
                IO_Timeout_callback(loop, &IO->rw_timeout, revents);
                return;
        } else if (nbytes == -1) {
-               // FD is gone. kick it. 
-               StopClientWatchers(IO);
-               EV_syslog(LOG_DEBUG,
-                         "EVENT: Socket Invalid! %s \n",
-                         strerror(errno));
-               ShutDownCLient(IO);
+               if (errno != EAGAIN) {
+                       // FD is gone. kick it. 
+                       StopClientWatchers(IO);
+                       EV_syslog(LOG_DEBUG,
+                                 "EVENT: Socket Invalid! %s \n",
+                                 strerror(errno));
+                       ShutDownCLient(IO);
+               }
                return;
        }
 }
@@ -925,7 +955,6 @@ eNextState EvConnectSock(AsyncIO *IO,
        if (rc >= 0){
                EVM_syslog(LOG_DEBUG, "connect() immediate success.\n");
                set_start_callback(event_base, IO, 0);
-               ev_timer_start(event_base, &IO->rw_timeout);
                return IO->NextState;
        }
        else if (errno == EINPROGRESS) {