X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=58c969a255335461d0481e8864ec79fb41269dac;hp=6580fe9b734e518a0e1e9f164dca7e466b30bc65;hb=0f7851078e5eb89565f9b3194ee100ac20bbb7f1;hpb=a8066a827c4521d5b9a46aadace5fcd87c81540f diff --git a/dccp_recv.c b/dccp_recv.c index 6580fe9b..58c969a2 100644 --- a/dccp_recv.c +++ b/dccp_recv.c @@ -1,19 +1,7 @@ /* - * Copyright (C) 2006-2007 Andre Noll + * Copyright (C) 2006-2009 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_recv.c paraslash's dccp receiver */ @@ -23,11 +11,15 @@ * (C) 2005 Ian McDonald */ +#include +#include +#include + #include "para.h" #include "error.h" -#include "dccp.h" #include "list.h" #include "sched.h" +#include "ggo.h" #include "recv.h" #include "string.h" #include "net.h" @@ -35,11 +27,6 @@ #include "dccp_recv.cmdline.h" -/* needed by getaddrinfo */ -#include -#include -#include - /** the size of the output buffer */ #define DCCP_BUFSIZE 40960 @@ -72,39 +59,31 @@ static int dccp_recv_open(struct receiver_node *rn) { struct private_dccp_recv_data *pdd; struct dccp_recv_args_info *conf = rn->conf; - int ret; - struct addrinfo *ai; - char *tmp; + int fd, ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg, + conf->port_arg); - rn->buf = para_calloc(DCCP_BUFSIZE); - rn->private_data = para_calloc(sizeof(struct private_dccp_recv_data)); - pdd = rn->private_data; - ret = dccp_get_socket(); if (ret < 0) - goto err_out; - pdd->fd = ret; - - tmp = make_message("%d", conf->port_arg); - ret = getaddrinfo(conf->host_arg, tmp, NULL, &ai); - free(tmp); - if (ret) { - ret = -E_ADDR_INFO; - goto err_out; + return ret; + fd = ret; + /* + * Disable unused CCIDs: the receiver does not send any application + * data to the server. By shutting down this unused path we reduce + * internal processing costs, as the unused CCIDs (in the kernel) are + * then bypassed. + */ + if (shutdown(fd, SHUT_WR) < 0) { + ret = -ERRNO_TO_PARA_ERROR(errno); + goto err; } - ret = dccp_set_socket(pdd->fd); + ret = mark_fd_nonblocking(fd); if (ret < 0) - goto err_out; - PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg, conf->port_arg); - ret = connect(pdd->fd, ai->ai_addr, ai->ai_addrlen); - freeaddrinfo(ai); - if (ret < 0) { - ret = -E_DCCP_CONNECT; - goto err_out; - } - mark_fd_nonblock(pdd->fd); + goto err; + rn->buf = para_calloc(DCCP_BUFSIZE); + rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data)); + pdd->fd = fd; return 1; -err_out: - dccp_recv_close(rn); +err: + close(fd); return ret; } @@ -125,54 +104,59 @@ static void *dccp_recv_parse_config(int argc, char **argv) static void dccp_recv_pre_select(struct sched *s, struct task *t) { - struct receiver_node *rn = t->private_data; + struct receiver_node *rn = container_of(t, struct receiver_node, task); struct private_dccp_recv_data *pdd = rn->private_data; - t->ret = 1; + t->error = 0; para_fd_set(pdd->fd, &s->rfds, &s->max_fileno); } static void dccp_recv_post_select(struct sched *s, struct task *t) { - struct receiver_node *rn = t->private_data; + struct receiver_node *rn = container_of(t, struct receiver_node, task); struct private_dccp_recv_data *pdd = rn->private_data; - t->ret = -E_DCCP_RECV_EOF; - if (rn->output_eof && *rn->output_eof) - goto out; - t->ret = 1; - if (!s->select_ret || !FD_ISSET(pdd->fd, &s->rfds)) - goto out; /* nothing to do */ - t->ret = -E_DCCP_OVERRUN; - if (rn->loaded >= DCCP_BUFSIZE) - goto out; - t->ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded, + if (rn->output_error && *rn->output_error < 0) { + t->error = *rn->output_error; + return; + } + if (!FD_ISSET(pdd->fd, &s->rfds)) + return; /* nothing to do */ + if (rn->loaded >= DCCP_BUFSIZE) { + t->error = -E_DCCP_OVERRUN; + return; + } + t->error = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded, DCCP_BUFSIZE - rn->loaded); - if (t->ret <= 0) { - if (!t->ret) - t->ret = -E_DCCP_RECV_EOF; - goto out; + if (t->error > 0) { + rn->loaded += t->error; + return; } - rn->loaded += t->ret; - return; -out: - if (t->ret < 0) - rn->eof = 1; + if (!t->error) + t->error = -E_RECV_EOF; } /** - * the init function of the dccp receiver + * The init function of the dccp receiver. * - * \param r pointer to the receiver struct to initialize + * \param r Pointer to the receiver struct to initialize. * - * Initialize all function pointers of \a r + * Initialize all function pointers of \a r. */ void dccp_recv_init(struct receiver *r) { + struct dccp_recv_args_info dummy; + + dccp_recv_cmdline_parser_init(&dummy); r->shutdown = dccp_shutdown; r->open = dccp_recv_open; r->close = dccp_recv_close; r->pre_select = dccp_recv_pre_select; r->post_select = dccp_recv_post_select; r->parse_config = dccp_recv_parse_config; + r->help = (struct ggo_help) { + .short_help = dccp_recv_args_info_help, + .detailed_help = dccp_recv_args_info_detailed_help + }; + dccp_recv_cmdline_parser_free(&dummy); }