X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-sys%2Fevtloop.c;h=1991646aeedc165c1559c296fa8b84ae70873108;hp=1b5d72309cef952a833b2043f31670f8b729a1be;hb=469f8c99bd1c9ebc670365a099df35b9f71fe6c7;hpb=66572f4a9c4574c9f2a2c3ef59526ac66b807b0b

diff --git a/lib-sys/evtloop.c b/lib-sys/evtloop.c
index 1b5d723..1991646 100644
--- a/lib-sys/evtloop.c
+++ b/lib-sys/evtloop.c
@@ -32,6 +32,43 @@
 
 static int epollfd = -1;
 
+static int el_job_setemode(job_t *w, el_mode emode)
+{
+    static int const evtmode_to_epoll[] = {
+        [EL_NEW]     = EPOLLRDHUP,
+        [EL_READING] = EPOLLIN,
+        [EL_WRITING] = EPOLLOUT,
+        [EL_RDWR]    = EPOLLIN | EPOLLOUT,
+        [EL_IDLE]    = EPOLLRDHUP,
+    };
+
+    assert (w->mode == emode || emode == EL_WRITING || emode == EL_READING);
+
+    if (emode != w->emode) {
+        struct epoll_event event = {
+            .data.ptr = w,
+            .events   = evtmode_to_epoll[emode],
+        };
+        int action = w->emode == EL_NEW ? EPOLL_CTL_ADD : EPOLL_CTL_MOD;
+        if (epoll_ctl(epollfd, action, w->fd, &event) < 0) {
+            return el_job_release(w, true);
+        }
+    }
+    w->emode = emode;
+    return 0;
+}
+
+int el_job_setmode(job_t *w, el_mode mode)
+{
+    if (w->mode == w->emode) {
+        w->mode = mode;
+        return el_job_setemode(w, mode);
+    } else {
+        w->mode = mode;
+        return 0;
+    }
+}
+
 int el_job_release(job_t *w, el_status reason)
 {
     w->state = EL_LLP_FINI;
@@ -41,10 +78,96 @@ int el_job_release(job_t *w, el_status reason)
     if (w->fd >= 0) {
         close(w->fd);
     }
-    p_delete(&w);
+    job_delete(&w);
     return -1;
 }
 
+static int el_job_connecting(job_t *w)
+{
+    int err = 0;
+    socklen_t len = sizeof(err);
+
+    if (getsockopt(w->fd, SOL_SOCKET, SO_ERROR, (void *)&err, &len) || err)
+        return el_job_release(w, EL_ERROR);
+
+    w->state = EL_LLP_READY;
+    return w->m->on_event(w, EL_EVT_RUNNING);
+}
+
+int el_job_connect(job_t *w, struct sockaddr *addr, socklen_t len,
+                   int type, int proto)
+{
+    int res, sock = socket(addr->sa_family, type, proto);
+
+    if (sock < 0)
+        goto error;
+
+    res = fcntl(sock, F_GETFL);
+    if (res < 0)
+        goto error;
+    if (fcntl(sock, F_SETFL, res | O_NONBLOCK) < 0)
+        goto error;
+    if (connect(sock, addr, len) < 0)
+        goto error;
+
+    w->fd  = sock;
+    w->llp = &el_job_connecting;
+    return el_job_setmode(w, EL_WRITING);
+
+  error:
+    close(sock);
+    return el_job_release(w, EL_ERROR);
+}
+
+ssize_t el_job_read(job_t *w, buffer_t *buf)
+{
+    ssize_t nr;
+
+    buffer_ensure(buf, BUFSIZ);
+
+    if (w->session) {
+        nr = gnutls_record_recv(w->session, buf->data + buf->len, BUFSIZ);
+        if (nr < 0 && !gnutls_error_is_fatal(nr)) {
+            int wr = gnutls_record_get_direction(w->session);
+            return el_job_setemode(w, wr ? EL_WRITING : EL_READING);
+        }
+        EL_JOB_CHECK(el_job_setemode(w, w->mode));
+    } else {
+        nr = read(w->fd, buf->data + buf->len, BUFSIZ);
+        if (nr < 0 && (errno == EINTR || errno == EAGAIN))
+            return 0;
+    }
+    if (nr <= 0)
+        return el_job_release(w, EL_RDHUP);
+    buffer_extend(buf, nr);
+    return nr;
+}
+
+ssize_t el_job_write(job_t *w, buffer_t *buf)
+{
+    ssize_t nr;
+
+    if (buf->len == 0)
+        return 0;
+
+    if (w->session) {
+        nr = gnutls_record_send(w->session, buf->data, buf->len);
+        if (nr < 0 && !gnutls_error_is_fatal(nr)) {
+            int wr = gnutls_record_get_direction(w->session);
+            return el_job_setemode(w, wr ? EL_WRITING : EL_READING);
+        }
+        EL_JOB_CHECK(el_job_setemode(w, w->mode));
+    } else {
+        nr = write(w->fd, buf->data, buf->len);
+        if (nr < 0 && (errno == EINTR || errno == EAGAIN))
+            return 0;
+    }
+    if (nr <= 0)
+        return el_job_release(w, EL_RDHUP);
+    buffer_splice(buf, 0, nr, NULL, 0);
+    return nr;
+}
+
 int el_dispatch(int timeout)
 {
     struct epoll_event events[FD_SETSIZE];
@@ -71,13 +194,13 @@ int el_dispatch(int timeout)
             if (event & EPOLLRDHUP) {
                 IGNORE(el_job_release(w, EL_RDHUP));
             } else if (w->mode != w->emode) {
-                    w->m->on_event(w, EL_EVT_INOUT ^ w->emode);
+                IGNORE(w->m->on_event(w, EL_EVT_INOUT ^ w->emode));
             } else {
                 if (event & EPOLLIN)
                     evt |= EL_EVT_IN;
                 if (event & EPOLLOUT)
                     evt |= EL_EVT_OUT;
-                w->m->on_event(w, evt);
+                IGNORE(w->m->on_event(w, evt));
             }
             break;