EVENT-Client: don't call the timeout function directly

[citadel.git] / citadel / event_client.c

diff --git a/citadel/event_client.c b/citadel/event_client.c
index c4016dc1c6e2a3b4c53e3f39d5d4f58604ccd7af..bd0b8a105be45f9cda7a142a32860a8331b36052 100644 (file)
--- a/citadel/event_client.c
+++ b/citadel/event_client.c
@@ -495,8 +495,8 @@ IO_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
                                StrBufPlain(IO->ErrMsg, errmsg, -1);
                        break;
                default:
-                       rc = StrBuf_write_one_chunk_callback(watcher->fd,
-                                                            0/*TODO*/,
+                       rc = StrBuf_write_one_chunk_callback(IO->SendBuf.fd,
+                                                            0,
                                                             &IO->SendBuf);
                }
 
@@ -585,7 +585,14 @@ IO_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
        }
        else if (rc < 0) {
                if (errno != EAGAIN) {
-                       IO_Timeout_callback(loop, &IO->rw_timeout, revents);
+                       StopClientWatchers(IO);
+                       EV_syslog(LOG_DEBUG,
+                                 "EVENT: Socket Invalid! [%d] [%s] [%d]\n",
+                                 errno, strerror(errno), IO->SendBuf.fd);
+                       StrBufPrintf(IO->ErrMsg,
+                                    "Socket Invalid! [%s]",
+                                    strerror(errno));
+                       SetNextTimeout(IO, 0.0);
                }
        }
        /* else : must write more. */
@@ -770,8 +777,8 @@ IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
                }
                break;
        default:
-               nbytes = StrBuf_read_one_chunk_callback(watcher->fd,
-                                                       0 /*TODO */,
+               nbytes = StrBuf_read_one_chunk_callback(IO->RecvBuf.fd,
+                                                       0,
                                                        &IO->RecvBuf);
                break;
        }
@@ -805,16 +812,19 @@ IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
        if (nbytes > 0) {
                HandleInbound(IO);
        } else if (nbytes == 0) {
-               IO_Timeout_callback(loop, &IO->rw_timeout, revents);
+               SetNextTimeout(IO, 0.0);
                return;
        } else if (nbytes == -1) {
                if (errno != EAGAIN) {
                        // FD is gone. kick it. 
                        StopClientWatchers(IO);
                        EV_syslog(LOG_DEBUG,
-                                 "EVENT: Socket Invalid! %s \n",
-                                 strerror(errno));
-                       ShutDownCLient(IO);
+                                 "EVENT: Socket Invalid! [%d] [%s] [%d]\n",
+                                 errno, strerror(errno), IO->SendBuf.fd);
+                       StrBufPrintf(IO->ErrMsg,
+                                    "Socket Invalid! [%s]",
+                                    strerror(errno));
+                       SetNextTimeout(IO, 0.0);
                }
                return;
        }