X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=58c969a255335461d0481e8864ec79fb41269dac;hp=f56f58cbb2932ca95c0056f96df30ec5150b7519;hb=43e0a7f669d782e73513119b7140dc4e56bcc3d7;hpb=c9f109a9e7f2d6116b7906a852afc339c858c275 diff --git a/dccp_recv.c b/dccp_recv.c index f56f58cb..58c969a2 100644 --- a/dccp_recv.c +++ b/dccp_recv.c @@ -1,19 +1,34 @@ +/* + * Copyright (C) 2006-2009 Andre Noll + * + * Licensed under the GPL v2. For licencing details see COPYING. + */ + +/** \file dccp_recv.c paraslash's dccp receiver */ + +/* + * based on client.c of dccp-cs-0.01.tar.bz2, + * (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" +#include "fd.h" #include "dccp_recv.cmdline.h" -/* needed by getaddrinfo */ -#include -#include -#include - - -#define DCCP_BUFSIZE 4096 +/** the size of the output buffer */ +#define DCCP_BUFSIZE 40960 /** * data specific to the dccp receiver @@ -43,36 +58,32 @@ static void dccp_recv_close(struct receiver_node *rn) static int dccp_recv_open(struct receiver_node *rn) { struct private_dccp_recv_data *pdd; - struct gengetopt_args_info *conf = rn->conf; - int ret; - struct addrinfo *ai; - char *tmp; + struct dccp_recv_args_info *conf = rn->conf; + 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 = -E_DCCP_CONNECT; - if (connect(pdd->fd, ai->ai_addr, ai->ai_addrlen) < 0) - goto err_out; + 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; } @@ -83,7 +94,7 @@ static void dccp_shutdown(void) static void *dccp_recv_parse_config(int argc, char **argv) { - struct gengetopt_args_info *tmp = para_calloc(sizeof(struct gengetopt_args_info)); + struct dccp_recv_args_info *tmp = para_calloc(sizeof(struct dccp_recv_args_info)); if (!dccp_recv_cmdline_parser(argc, argv, tmp)) return tmp; @@ -91,47 +102,61 @@ static void *dccp_recv_parse_config(int argc, char **argv) return NULL; } -static int dccp_recv_pre_select(struct receiver_node *rn, fd_set *rfds, - __unused fd_set *wfds, __unused struct timeval *timeout) +static void dccp_recv_pre_select(struct sched *s, struct task *t) { + struct receiver_node *rn = container_of(t, struct receiver_node, task); struct private_dccp_recv_data *pdd = rn->private_data; - if (pdd) - FD_SET(pdd->fd, rfds); - return pdd->fd; + t->error = 0; + para_fd_set(pdd->fd, &s->rfds, &s->max_fileno); } -static int dccp_recv_post_select(struct receiver_node *rn, int select_ret, - fd_set *rfds, __unused fd_set *wfds) +static void dccp_recv_post_select(struct sched *s, struct task *t) { - int ret; + struct receiver_node *rn = container_of(t, struct receiver_node, task); struct private_dccp_recv_data *pdd = rn->private_data; - if (!select_ret || !pdd || !FD_ISSET(pdd->fd, rfds)) - return 1; /* nothing to do */ - if (rn->loaded >= DCCP_BUFSIZE) - return -E_DCCP_OVERRUN; - 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 (ret <= 0) - return ret; - rn->loaded += ret; - return 1; + if (t->error > 0) { + rn->loaded += t->error; + return; + } + 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); }