dccp_send.c: Fix a header sending bug.

[paraslash.git] / dccp_send.c

diff --git a/dccp_send.c b/dccp_send.c
index c9a03b94738848b94911cf7d7becea1227bd42b6..55454aaa30c807bcec4f26ad8be6cd01a3bc2085 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)
@@ -138,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;
@@ -190,13 +188,10 @@ static void dccp_send(long unsigned current_chunk,
        struct dccp_client *dc, *tmp;
        int ret;
        char *header_buf;
-       size_t header_len;
-
-       if (listen_fd < 0 || !len)
-               return;
 
        list_for_each_entry_safe(dc, tmp, &clients, node) {
                if (!dc->header_sent && current_chunk) {
+                       size_t header_len;
                        header_buf = vss_get_header(&header_len);
                        if (header_buf && header_len > 0) {
                                if (queue_chunk_or_shutdown(dc, -1U, 0) < 0)
@@ -209,6 +204,8 @@ static void dccp_send(long unsigned current_chunk,
                        dccp_shutdown_client(dc);
                        continue;
                }
+               if (!len)
+                       continue;
 //             PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd);
                ret = dccp_write(dc->fd, buf, len);
                if (ret < 0) {