dccp_senc.c: Kill E_DCCP_WRITE.

[paraslash.git] / dccp_send.c

diff --git a/dccp_send.c b/dccp_send.c
index 0410c8bca99838a199fe30d92280d7fe333ef15f..5449a6a9664f070b0115d3bdb2a6f9471718f796 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -51,7 +51,7 @@ struct dccp_client {
        struct chunk_queue *cq;
 };
 
-static void dccp_pre_select( int *max_fileno, fd_set *rfds,
+static void dccp_pre_select(int *max_fileno, fd_set *rfds,
                __a_unused fd_set *wfds)
 {
        if (listen_fd < 0)
@@ -63,7 +63,7 @@ static void dccp_pre_select( int *max_fileno, fd_set *rfds,
 static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 {
        struct dccp_client *dc;
-       int ret;
+       int ret, fd;
 
        if (listen_fd < 0 || !FD_ISSET(listen_fd, rfds))
                return;
@@ -72,23 +72,31 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
                return;
        }
+       fd = ret;
        /*
         * Bypass unused CCID paths: the sender does not receive application data
         * from the client; by shutting down this unused communication path we can
         * reduce processing costs a bit. See analogous comment in dccp_recv.c.
         */
-       if (shutdown(ret, SHUT_RD) < 0) {
+       if (shutdown(fd, SHUT_RD) < 0) {
                PARA_ERROR_LOG("shutdown(SHUT_RD): %s\n", strerror(errno));
-               return;
+               goto err;
+       }
+       ret = mark_fd_nonblocking(fd);
+       if (ret < 0) {
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+               goto err;
        }
        dc = para_calloc(sizeof(struct dccp_client));
-       dc->fd = ret;
+       dc->fd = fd;
        dc->name = make_message("%s", remote_name(dc->fd));
        PARA_NOTICE_LOG("connection from %s\n", dc->name);
        para_list_add(&dc->node, &clients);
        add_close_on_fork_list(dc->fd);
-       mark_fd_nonblocking(dc->fd);
        dc->cq = cq_new(DCCP_MAX_PENDING_BYTES);
+       return;
+err:
+       close(fd);
 }
 
 static int dccp_open(void)
@@ -98,8 +106,12 @@ static int dccp_open(void)
        if (ret < 0)
                return ret;
        listen_fd = ret;
+       ret = mark_fd_nonblocking(listen_fd);
+       if (ret < 0) {
+               PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+               exit(EXIT_FAILURE);
+       }
        add_close_on_fork_list(listen_fd);
-       mark_fd_nonblocking(listen_fd);
        return 1;
 }
 
@@ -126,17 +138,15 @@ static int dccp_write(int fd, const char *buf, size_t len)
        while (written < len) {
                ret = write(fd, buf + written, PARA_MIN(1024, len - written));
                /*
-                * Error handling: CCID3 has a sending wait queue which fills up and is
-                * emptied asynchronously. The EAGAIN case means that there is currently
-                * no space in the wait queue, but this can change at any moment and is
-                * thus not an error condition.
+                * Error handling: CCID3 has a sending wait queue which fills
+                * up and is emptied asynchronously. The EAGAIN case means that
+                * there is currently no space in the wait queue, but this can
+                * change at any moment and is thus not an error condition.
                 */
                if (ret < 0 && errno == EAGAIN)
                        return written;
-               if (ret < 0) {
-                       PARA_ERROR_LOG("%s\n", strerror(errno));
-                       return -E_DCCP_WRITE;
-               }
+               if (ret < 0)
+                       return -ERRNO_TO_PARA_ERROR(errno);
                written += ret;
        }
        return written;