X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=bdc7681e1de02469daaa0bc10698514eac563583;hp=55548620c7a67996b74aac62f2c3cb862ee575b4;hb=28ca8e57ce76f5496f0d1ba143ec2c1c725bc90a;hpb=e0e5a7c1a04c6a2ee4a475e823657e06e6df2f99 diff --git a/dccp_send.c b/dccp_send.c index 55548620..bdc7681e 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 */ @@ -26,13 +14,15 @@ #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 "server.cmdline.h" -extern struct gengetopt_args_info conf; + /** the list of connected clients **/ static struct list_head clients; static int listen_fd = -1; @@ -50,17 +40,16 @@ struct dccp_client { int header_sent; }; -static void dccp_pre_select(__a_unused struct audio_format *af, 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) return; FD_SET(listen_fd, rfds); - *max_fileno = MAX(*max_fileno, listen_fd); + *max_fileno = PARA_MAX(*max_fileno, listen_fd); } -static void dccp_post_select(__a_unused struct audio_format *af, fd_set *rfds, - __a_unused fd_set *wfds) +static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds) { struct dccp_client *dc; int ret; @@ -75,7 +64,9 @@ static void dccp_post_select(__a_unused struct audio_format *af, fd_set *rfds, } 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); } static int dccp_open(void) @@ -88,7 +79,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,6 +93,8 @@ static int dccp_open(void) if (ret < 0) 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); return 1; } @@ -110,36 +103,40 @@ static void dccp_shutdown_client(struct dccp_client *dc) PARA_DEBUG_LOG("shutting down %s (fd %d)\n", inet_ntoa(dc->addr.sin_addr), dc->fd); close(dc->fd); + del_close_on_fork_list(dc->fd); list_del(&dc->node); free(dc); } static int dccp_write(int fd, const char *buf, size_t len) { - size_t send, written = 0; - int ret; -again: - send = 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. Keep polling until an entry becomes free. + */ + if (ret < 0 && errno == EAGAIN) + continue; + if (ret < 0) + return -E_DCCP_WRITE; + written += ret; + } + return written; } -static void dccp_send(__a_unused struct audio_format *af, - long unsigned current_chunk, +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; + unsigned header_len; if (listen_fd < 0 || !len) return; @@ -152,27 +149,27 @@ static void dccp_send(__a_unused struct audio_format *af, } if (!ret) continue; - if (!dc->header_sent && af->get_header_info && current_chunk) { - header_buf = af->get_header_info(&header_len); - if (!header_buf || header_len <= 0) - continue; /* header not yet available */ - 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; + if (!dc->header_sent && current_chunk) { + 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/%u (%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) + continue; } - dc->header_sent = 1; - ret = write_ok(dc->fd); - if (ret < 0) { - dccp_shutdown_client(dc); - continue; - } - if (!ret) - continue; } // PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd); ret = dccp_write(dc->fd, buf, len); @@ -234,8 +231,9 @@ void dccp_send_init(struct sender *s) s->client_cmds[SENDER_DELETE] = NULL; self = s; ret = dccp_open(); - if (ret < 0) + if (ret < 0) { PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); - else + s->status = SENDER_OFF; + } else s->status = SENDER_ON; }