X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=253586e1f7ee4f90867a157757a34a227458047a;hp=796a7e6baf76fe15041386041e21d403b4c58cf0;hb=refs%2Fheads%2Fmaint;hpb=a731a7c6e78fb137268b42062d9fb08b4e49a2c8 diff --git a/dccp_recv.c b/dccp_recv.c index 796a7e6b..639c93fc 100644 --- a/dccp_recv.c +++ b/dccp_recv.c @@ -1,8 +1,4 @@ -/* - * Copyright (C) 2006-2014 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 */ @@ -18,20 +14,19 @@ #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 "dccp_recv.cmdline.h" - static void dccp_recv_close(struct receiver_node *rn) { if (rn->fd > 0) @@ -39,25 +34,56 @@ static void dccp_recv_close(struct receiver_node *rn) btr_pool_free(rn->btrp); } +/* 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); + + 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 dccp_recv_args_info *conf = rn->conf; + 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; /* Copy CCID preference list (u8 array required) */ - if (conf->ccid_given) { - ccids = para_malloc(conf->ccid_given); - fo = flowopt_new(); - - for (i = 0; i < conf->ccid_given; i++) - ccids[i] = conf->ccid_arg[i]; - + 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, conf->host_arg, conf->port_arg, fo); + fd = makesock(IPPROTO_DCCP, 0, host, port, fo); flowopt_cleanup(fo); free(ccids); if (fd < 0) @@ -83,61 +109,24 @@ err: return ret; } -/** - * Check whether the host supports the requested 'ccid' arguments. - * \param conf DCCP receiver arguments. - * \return True if all CCIDs requested in \a conf are supported. - */ -static bool dccp_recv_ccid_support_check(struct dccp_recv_args_info *conf) +static void dccp_recv_pre_select(struct sched *s, void *context) { - uint8_t *ccids; - int i, j, nccids; - - nccids = dccp_available_ccids(&ccids); - if (nccids <= 0) - return false; + struct receiver_node *rn = context; - for (i = 0; i < conf->ccid_given; i++) { - for (j = 0; j < nccids && ccids[j] != conf->ccid_arg[i]; j++) - ; - if (j == nccids) { - PARA_ERROR_LOG("'CCID-%d' not supported on this host.\n", - conf->ccid_arg[i]); - return false; - } - } - return true; -} - -static void *dccp_recv_parse_config(int argc, char **argv) -{ - struct dccp_recv_args_info *tmp = para_calloc(sizeof(*tmp)); - - dccp_recv_cmdline_parser(argc, argv, tmp); - if (!dccp_recv_ccid_support_check(tmp)) - exit(EXIT_FAILURE); - return tmp; -} - -static void dccp_recv_pre_select(struct sched *s, struct task *t) -{ - struct receiver_node *rn = container_of(t, struct receiver_node, task); - - t->error = 0; - if (generic_recv_pre_select(s, t) <= 0) + 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 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 receiver_node *rn = context; struct btr_node *btrn = rn->btrn; struct iovec iov[2]; int ret, iovcnt; size_t num_bytes; - ret = task_get_notification(t); + ret = task_get_notification(rn->task); if (ret < 0) goto out; ret = btr_node_status(btrn, 0, BTR_NT_ROOT); @@ -162,30 +151,9 @@ out: return ret; } -static void dccp_recv_free_config(void *conf) -{ - dccp_recv_cmdline_parser_free(conf); - free(conf); -} - -/** - * 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)DEFINE_GGO_HELP(dccp_recv); - 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, +};