X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=253586e1f7ee4f90867a157757a34a227458047a;hp=95d2ba8a8a2447a2cfaa1dc8a003b081538628f5;hb=refs%2Fheads%2Fmaint;hpb=abbddde3ee707103d5d8b088c8fa6fc53f09ebff diff --git a/dccp_recv.c b/dccp_recv.c index 95d2ba8a..639c93fc 100644 --- a/dccp_recv.c +++ b/dccp_recv.c @@ -1,160 +1,159 @@ -/* - * Copyright (C) 2006 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. - */ +/* Copyright (C) 2006 Andre Noll , see file 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 +#include +#include +#include +#include + +#include "recv_cmd.lsg.h" #include "para.h" #include "error.h" -#include "dccp.h" +#include "list.h" +#include "sched.h" +#include "buffer_tree.h" #include "recv.h" #include "string.h" #include "net.h" - -#include "dccp_recv.cmdline.h" - -/* needed by getaddrinfo */ -#include -#include -#include - - -#define DCCP_BUFSIZE 4096 - -/** - * data specific to the dccp receiver - * - * \sa receiver receiver_node - */ -struct private_dccp_recv_data { - /** the file descriptor for the dccp socket */ - int fd; -}; - +#include "fd.h" 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); - free(rn->buf); - rn->buf = NULL; - 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 gengetopt_args_info *conf = rn->conf; - int ret; - struct addrinfo *ai; - char *tmp; - - 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(); + 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) - goto err_out; - pdd->fd = ret; + return 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); + } - 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; + 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 + * 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->btrp = btr_pool_new("dccp_recv", 320 * 1024); + rn->fd = fd; return 1; -err_out: - dccp_recv_close(rn); +err: + close(fd); return ret; } -static void dccp_shutdown(void) -{ - ; /* nothing to do */ -} - -static void *dccp_recv_parse_config(int argc, char **argv) -{ - struct gengetopt_args_info *tmp = para_calloc(sizeof(struct gengetopt_args_info)); - - if (!dccp_recv_cmdline_parser(argc, argv, tmp)) - return tmp; - free(tmp); - 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, void *context) { - struct private_dccp_recv_data *pdd = rn->private_data; + struct receiver_node *rn = context; - if (pdd) - FD_SET(pdd->fd, rfds); - return pdd->fd; + if (generic_recv_pre_select(s, rn) <= 0) + return; + para_fd_set(rn->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 int dccp_recv_post_select(struct sched *s, void *context) { - int ret; - struct private_dccp_recv_data *pdd = rn->private_data; + struct receiver_node *rn = context; + struct btr_node *btrn = rn->btrn; + struct iovec iov[2]; + int ret, iovcnt; + size_t num_bytes; - 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, - DCCP_BUFSIZE - rn->loaded); + ret = task_get_notification(rn->task); + if (ret < 0) + goto out; + ret = btr_node_status(btrn, 0, BTR_NT_ROOT); if (ret <= 0) - return ret; - rn->loaded += ret; - return 1; + goto out; + iovcnt = btr_pool_get_buffers(rn->btrp, iov); + ret = -E_DCCP_OVERRUN; + 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) + 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) -{ - 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; -} +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, +};