X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=253586e1f7ee4f90867a157757a34a227458047a;hp=0fddcfac1d9e69d4e82701c4cede61569b244498;hb=refs%2Fheads%2Fmaint;hpb=a118b7220a705ad1f7831270018ee357d40242db diff --git a/dccp_recv.c b/dccp_recv.c index 0fddcfac..639c93fc 100644 --- a/dccp_recv.c +++ b/dccp_recv.c @@ -1,8 +1,4 @@ -/* - * Copyright (C) 2006-2009 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2006 Andre Noll , see file COPYING. */ /** \file dccp_recv.c paraslash's dccp receiver */ @@ -11,58 +7,87 @@ * (C) 2005 Ian McDonald */ +#include +#include #include #include -#include +#include +#include +#include +#include +#include "recv_cmd.lsg.h" #include "para.h" #include "error.h" #include "list.h" #include "sched.h" -#include "ggo.h" +#include "buffer_tree.h" #include "recv.h" #include "string.h" #include "net.h" #include "fd.h" -#include "buffer_tree.h" - -#include "dccp_recv.cmdline.h" - -/** - * data specific to the dccp receiver - * - * \sa receiver receiver_node - */ -struct private_dccp_recv_data { - /** the file descriptor for the dccp socket */ - int fd; - struct btr_pool *btrp; -}; - static void dccp_recv_close(struct receiver_node *rn) { + if (rn->fd > 0) + close(rn->fd); + btr_pool_free(rn->btrp); +} - struct private_dccp_recv_data *pdd = rn->private_data; +/* Check whether the host supports the requested 'ccid' arguments. */ +static int dccp_recv_ccid_support_check(const struct lls_parse_result *lpr) +{ + uint8_t *ccids; + int i, j, ret, nccids; + unsigned given = RECV_CMD_OPT_GIVEN(DCCP, CCID, lpr); - if (pdd && pdd->fd > 0) - close(pdd->fd); - btr_pool_free(pdd->btrp); - free(rn->private_data); - rn->private_data = NULL; + ret = dccp_available_ccids(&ccids); + if (ret < 0) + return ret; + nccids = ret; + for (i = 0; i < given; i++) { + uint32_t val = lls_uint32_val(i, + RECV_CMD_OPT_RESULT(DCCP, CCID, lpr)); + for (j = 0; j < nccids && ccids[j] != val; j++) + ; + if (j == nccids) { + PARA_ERROR_LOG("'CCID-%u' not supported on this host\n", + val); + return -ERRNO_TO_PARA_ERROR(EINVAL); + } + } + return 1; } - static int dccp_recv_open(struct receiver_node *rn) { - struct private_dccp_recv_data *pdd; - struct dccp_recv_args_info *conf = rn->conf; - int fd, ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg, - conf->port_arg); - + struct lls_parse_result *lpr = rn->lpr; + struct flowopts *fo = NULL; + uint8_t *ccids = NULL; + int fd, ret, i; + const struct lls_opt_result *r_c = RECV_CMD_OPT_RESULT(DCCP, CCID, lpr); + const char *host = RECV_CMD_OPT_STRING_VAL(DCCP, HOST, lpr); + uint32_t port = RECV_CMD_OPT_UINT32_VAL(DCCP, PORT, lpr); + unsigned given; + + ret = dccp_recv_ccid_support_check(lpr); if (ret < 0) return ret; - fd = ret; + /* Copy CCID preference list (u8 array required) */ + given = lls_opt_given(r_c); + if (given) { + ccids = para_malloc(given); + fo = flowopt_new(); + for (i = 0; i < given; i++) + ccids[i] = lls_int32_val(i, r_c); + OPT_ADD(fo, SOL_DCCP, DCCP_SOCKOPT_CCID, ccids, i); + } + + fd = makesock(IPPROTO_DCCP, 0, host, port, fo); + flowopt_cleanup(fo); + free(ccids); + if (fd < 0) + return fd; /* * Disable unused CCIDs: the receiver does not send any application * data to the server. By shutting down this unused path we reduce @@ -76,95 +101,59 @@ static int dccp_recv_open(struct receiver_node *rn) ret = mark_fd_nonblocking(fd); if (ret < 0) goto err; - rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data)); - pdd->btrp = btr_pool_new("dccp_recv", 320 * 1024); - pdd->fd = fd; + rn->btrp = btr_pool_new("dccp_recv", 320 * 1024); + rn->fd = fd; return 1; err: close(fd); return ret; } -static void *dccp_recv_parse_config(int argc, char **argv) -{ - struct dccp_recv_args_info *tmp = para_calloc(sizeof(struct dccp_recv_args_info)); - - if (!dccp_recv_cmdline_parser(argc, argv, tmp)) - return tmp; - free(tmp); - return NULL; -} - -static void dccp_recv_pre_select(struct sched *s, struct task *t) +static void dccp_recv_pre_select(struct sched *s, void *context) { - struct receiver_node *rn = container_of(t, struct receiver_node, task); - struct private_dccp_recv_data *pdd = rn->private_data; + struct receiver_node *rn = context; - t->error = 0; - if (generic_recv_pre_select(s, t) <= 0) + if (generic_recv_pre_select(s, rn) <= 0) return; - para_fd_set(pdd->fd, &s->rfds, &s->max_fileno); + para_fd_set(rn->fd, &s->rfds, &s->max_fileno); } -static void dccp_recv_post_select(struct sched *s, struct task *t) +static int dccp_recv_post_select(struct sched *s, void *context) { - struct receiver_node *rn = container_of(t, struct receiver_node, task); - struct private_dccp_recv_data *pdd = rn->private_data; + struct receiver_node *rn = context; struct btr_node *btrn = rn->btrn; - int ret; - char *buf; - size_t sz; + struct iovec iov[2]; + int ret, iovcnt; + size_t num_bytes; - ret = btr_node_status(btrn, 0, BTR_NT_ROOT); + ret = task_get_notification(rn->task); if (ret < 0) - goto err; - if (ret == 0) - return; - if (!FD_ISSET(pdd->fd, &s->rfds)) - return; /* nothing to do */ + goto out; + ret = btr_node_status(btrn, 0, BTR_NT_ROOT); + if (ret <= 0) + goto out; + iovcnt = btr_pool_get_buffers(rn->btrp, iov); ret = -E_DCCP_OVERRUN; - sz = btr_pool_get_buffer(pdd->btrp, &buf); - if (sz == 0) - goto err; - ret = recv_bin_buffer(pdd->fd, buf, sz); - if (ret == 0) - ret = -E_RECV_EOF; + if (iovcnt == 0) + goto out; + ret = readv_nonblock(rn->fd, iov, iovcnt, &s->rfds, &num_bytes); + if (num_bytes == 0) + goto out; + if (num_bytes <= iov[0].iov_len) /* only the first buffer was filled */ + btr_add_output_pool(rn->btrp, num_bytes, btrn); + else { /* both buffers contain data */ + btr_add_output_pool(rn->btrp, iov[0].iov_len, btrn); + btr_add_output_pool(rn->btrp, num_bytes - iov[0].iov_len, btrn); + } +out: if (ret < 0) - goto err; - btr_add_output_pool(pdd->btrp, ret, btrn); - return; -err: - btr_remove_node(rn->btrn); - t->error = ret; -} - -static void dccp_recv_free_config(void *conf) -{ - dccp_recv_cmdline_parser_free(conf); - free(conf); + btr_remove_node(&rn->btrn); + return ret; } -/** - * The init function of the dccp receiver. - * - * \param r Pointer to the receiver struct to initialize. - * - * 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->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->free_config = dccp_recv_free_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); -} +const struct receiver lsg_recv_cmd_com_dccp_user_data = { + .open = dccp_recv_open, + .close = dccp_recv_close, + .pre_select = dccp_recv_pre_select, + .post_select = dccp_recv_post_select, +};