X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=1ea8de25ed4f63ab622ec12cc6d6f54093bf7401;hp=08930ad1852321f877fac474b839ea71bc5ee5d8;hb=c9381f1e1f60439f0edd8d67100cc13ad8f4c0bf;hpb=6570e0e4433a5e5d7987697716a1f993c96eb1bb diff --git a/dccp_send.c b/dccp_send.c index 08930ad1..1ea8de25 100644 --- a/dccp_send.c +++ b/dccp_send.c @@ -1,19 +1,7 @@ /* - * Copyright (C) 2006 Andre Noll + * Copyright (C) 2006-2007 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file dccp_send.c paraslash's dccp sender */ @@ -23,16 +11,23 @@ * (C) 2005 Ian McDonald */ +#include +#include + +#include "para.h" +#include "error.h" +#include "string.h" +#include "afh.h" +#include "afs.h" #include "server.h" #include "net.h" #include "list.h" -#include "afs.h" +#include "vss.h" #include "send.h" #include "dccp.h" -#include "error.h" -#include "string.h" #include "fd.h" #include "close_on_fork.h" +#include "chunk_queue.h" #include "server.cmdline.h" /** the list of connected clients **/ @@ -40,6 +35,9 @@ static struct list_head clients; static int listen_fd = -1; static struct sender *self; +/** Maximal number of bytes in a chunk queue. */ +#define DCCP_MAX_PENDING_BYTES 40000 + /** describes one connected client */ struct dccp_client { /** the dccp socket */ @@ -50,6 +48,8 @@ struct dccp_client { struct list_head node; /** non-zero if audio file header has been sent */ int header_sent; + /** The list of pending chunks for this client. */ + struct chunk_queue *cq; }; static void dccp_pre_select( int *max_fileno, fd_set *rfds, @@ -71,14 +71,15 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds) dc = para_calloc(sizeof(struct dccp_client)); ret = para_accept(listen_fd, &dc->addr, sizeof(struct sockaddr_in)); if (ret < 0) { - PARA_ERROR_LOG("%s", PARA_STRERROR(-ret)); + PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); return; } PARA_NOTICE_LOG("connection from %s\n", inet_ntoa(dc->addr.sin_addr)); dc->fd = ret; - list_add(&dc->node, &clients); + para_list_add(&dc->node, &clients); add_close_on_fork_list(dc->fd); mark_fd_nonblock(dc->fd); + dc->cq = cq_new(DCCP_MAX_PENDING_BYTES); } static int dccp_open(void) @@ -91,7 +92,7 @@ static int dccp_open(void) return ret; listen_fd = ret; - bzero(&servaddr, sizeof(servaddr)); + memset(&servaddr, 0, sizeof(servaddr)); servaddr.sin_family = AF_INET; servaddr.sin_addr.s_addr = htonl(INADDR_ANY); servaddr.sin_port = htons(conf.dccp_port_arg); @@ -102,8 +103,10 @@ static int dccp_open(void) if (ret < 0) return ret; ret = listen(listen_fd, 0); - if (ret < 0) + if (ret < 0) { + PARA_ERROR_LOG("%s\n", strerror(errno)); return -E_DCCP_LISTEN; + } PARA_DEBUG_LOG("listening on fd %d\n", listen_fd); add_close_on_fork_list(listen_fd); mark_fd_nonblock(listen_fd); @@ -116,73 +119,103 @@ static void dccp_shutdown_client(struct dccp_client *dc) dc->fd); close(dc->fd); del_close_on_fork_list(dc->fd); + cq_destroy(dc->cq); list_del(&dc->node); free(dc); } +/* + * ret: Negative on errors, zero if nothing was written and write returned + * EAGAIN, number of bytes written else. + */ static int dccp_write(int fd, const char *buf, size_t len) { - size_t send, written = 0; - int ret; -again: - send = PARA_MIN(1024, len - written); - ret = write(fd, buf + written, send); - if (ret < 0) - goto err_out; - written += ret; - if (written >= len) - return written; - ret = write_ok(fd); - if (ret > 0) - goto again; -err_out: - return -E_DCCP_WRITE; + size_t written = 0; + int ret = 0; + + 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. + */ + if (ret < 0 && errno == EAGAIN) + return written; + if (ret < 0) { + PARA_ERROR_LOG("%s\n", strerror(errno)); + return -E_DCCP_WRITE; + } + written += ret; + } + return written; +} + +static int queue_chunk_or_shutdown(struct dccp_client *dc, long unsigned chunk_num, + size_t sent) +{ + int ret = cq_enqueue(dc->cq, chunk_num, sent); + if (ret < 0) { + PARA_NOTICE_LOG("enqueue error\n"); + dccp_shutdown_client(dc); + } + return ret; +} + +static int send_queued_chunks(struct dccp_client *dc) +{ + struct queued_chunk *qc; + while ((qc = cq_peek(dc->cq))) { + char *buf; + size_t len; + int ret; + cq_get(qc, &buf, &len); + ret = dccp_write(dc->fd, buf, len); + if (ret < 0) + return ret; + cq_update(dc->cq, ret); + if (ret != len) + return 1; + cq_dequeue(dc->cq); + } + return 1; } static void dccp_send(long unsigned current_chunk, __a_unused long unsigned chunks_sent, const char *buf, size_t len) { struct dccp_client *dc, *tmp; - int ret, header_len; + int ret; char *header_buf; + size_t header_len; if (listen_fd < 0 || !len) return; list_for_each_entry_safe(dc, tmp, &clients, node) { - ret = write_ok(dc->fd); - if (ret < 0) { - dccp_shutdown_client(dc); - continue; - } - if (!ret) - continue; if (!dc->header_sent && current_chunk) { - header_buf = afs_get_header(&header_len); + header_buf = vss_get_header(&header_len); if (header_buf && header_len > 0) { - ret = dccp_write(dc->fd, header_buf, header_len); - if (ret != header_len) { - int err = errno; - PARA_ERROR_LOG("header write: %d/%d (%s)\n", - ret, header_len, ret < 0? - strerror(err) : ""); - dccp_shutdown_client(dc); - continue; - } - dc->header_sent = 1; - ret = write_ok(dc->fd); - if (ret < 0) { - dccp_shutdown_client(dc); - continue; - } - if (!ret) + if (queue_chunk_or_shutdown(dc, -1U, 0) < 0) continue; } + dc->header_sent = 1; + } + ret = send_queued_chunks(dc); + if (ret < 0) { + dccp_shutdown_client(dc); + continue; } // PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd); ret = dccp_write(dc->fd, buf, len); - if (ret != len) + if (ret < 0) { + PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-ret)); dccp_shutdown_client(dc); + continue; + } + if (ret != len) + queue_chunk_or_shutdown(dc, current_chunk, ret); } }