X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_recv.c;h=96b6c73123acba4da30e34e9d50850cfa7b554ac;hp=e276343ea1aae1b2a750389c4c691170b9c3aa6e;hb=6a79f16de242c0c70ef56bbd96a748055df65917;hpb=92f089b820b45a5dbdc5b4f69d596105d5acba68 diff --git a/udp_recv.c b/udp_recv.c index e276343e..96b6c731 100644 --- a/udp_recv.c +++ b/udp_recv.c @@ -1,14 +1,18 @@ /* - * Copyright (C) 2005-2011 Andre Noll + * Copyright (C) 2005-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file udp_recv.c Paraslash's udp receiver */ +#include #include -#include #include #include +#include +#include +#include +#include #include "para.h" #include "error.h" @@ -16,32 +20,20 @@ #include "list.h" #include "sched.h" #include "ggo.h" +#include "buffer_tree.h" #include "recv.h" #include "udp_recv.cmdline.h" #include "string.h" #include "net.h" #include "fd.h" -#include "buffer_tree.h" - -/** - * Data specific to the udp receiver. - * - * \sa \ref receiver, \ref receiver_node. - */ -struct private_udp_recv_data { - /** The socket file descriptor. */ - int fd; - struct btr_pool *btrp; -}; static void udp_recv_pre_select(struct sched *s, struct task *t) { struct receiver_node *rn = container_of(t, struct receiver_node, task); - struct private_udp_recv_data *purd = rn->private_data; if (generic_recv_pre_select(s, t) <= 0) return; - para_fd_set(purd->fd, &s->rfds, &s->max_fileno); + para_fd_set(rn->fd, &s->rfds, &s->max_fileno); } static int udp_check_eof(size_t sz, struct iovec iov[2]) @@ -56,30 +48,31 @@ static int udp_check_eof(size_t sz, struct iovec iov[2]) } if (memcmp(iov[0].iov_base, FEC_EOF_PACKET, iov[0].iov_len) != 0) return 0; - if (memcmp(iov[1].iov_base, FEC_EOF_PACKET + iov[0].iov_len, + if (memcmp(iov[1].iov_base, &FEC_EOF_PACKET[iov[0].iov_len], FEC_EOF_PACKET_LEN - iov[0].iov_len) != 0) return 0; return -E_RECV_EOF; } -static void udp_recv_post_select(__a_unused struct sched *s, struct task *t) +static int udp_recv_post_select(__a_unused struct sched *s, struct task *t) { struct receiver_node *rn = container_of(t, struct receiver_node, task); - struct private_udp_recv_data *purd = rn->private_data; struct btr_node *btrn = rn->btrn; size_t num_bytes; struct iovec iov[2]; int ret, readv_ret, iovcnt; - t->error = 0; + ret = task_get_notification(t); + if (ret < 0) + goto out; ret = btr_node_status(btrn, 0, BTR_NT_ROOT); if (ret <= 0) goto out; - iovcnt = btr_pool_get_buffers(purd->btrp, iov); + iovcnt = btr_pool_get_buffers(rn->btrp, iov); ret = -E_UDP_OVERRUN; if (iovcnt == 0) goto out; - ret = readv_nonblock(purd->fd, iov, iovcnt, &s->rfds, &num_bytes); + ret = readv_nonblock(rn->fd, iov, iovcnt, &s->rfds, &num_bytes); if (num_bytes == 0) goto out; readv_ret = ret; @@ -87,43 +80,34 @@ static void udp_recv_post_select(__a_unused struct sched *s, struct task *t) if (ret < 0) goto out; if (iov[0].iov_len >= num_bytes) - btr_add_output_pool(purd->btrp, num_bytes, btrn); + btr_add_output_pool(rn->btrp, num_bytes, btrn); else { /* both buffers contain data */ - btr_add_output_pool(purd->btrp, iov[0].iov_len, btrn); - btr_add_output_pool(purd->btrp, num_bytes - iov[0].iov_len, + btr_add_output_pool(rn->btrp, iov[0].iov_len, btrn); + btr_add_output_pool(rn->btrp, num_bytes - iov[0].iov_len, btrn); } ret = readv_ret; out: - if (ret >= 0) - return; - btr_remove_node(btrn); - t->error = ret; - close(purd->fd); - purd->fd = -1; + if (ret < 0) { + btr_remove_node(&rn->btrn); + close(rn->fd); + rn->fd = -1; + } + return ret; } static void udp_recv_close(struct receiver_node *rn) { - struct private_udp_recv_data *purd = rn->private_data; - - if (purd->fd >= 0) - close(purd->fd); - btr_pool_free(purd->btrp); - free(rn->private_data); + if (rn->fd >= 0) + close(rn->fd); + btr_pool_free(rn->btrp); } static void *udp_recv_parse_config(int argc, char **argv) { - int ret; - struct udp_recv_args_info *tmp = - para_calloc(sizeof(struct udp_recv_args_info)); - - ret = udp_recv_cmdline_parser(argc, argv, tmp)? -E_UDP_SYNTAX : 1; - if (ret >= 0) - return tmp; - free(tmp); - return NULL; + struct udp_recv_args_info *tmp = para_calloc(sizeof(*tmp)); + udp_recv_cmdline_parser(argc, argv, tmp); + return tmp; } /* @@ -189,36 +173,31 @@ err: static int udp_recv_open(struct receiver_node *rn) { - struct private_udp_recv_data *purd; struct udp_recv_args_info *c = rn->conf; char *iface = c->iface_given ? c->iface_arg : NULL; int ret; - rn->private_data = para_calloc(sizeof(struct private_udp_recv_data)); - purd = rn->private_data; - ret = makesock(IPPROTO_UDP, 1, c->host_arg, c->port_arg, NULL); if (ret < 0) goto err; - purd->fd = ret; + rn->fd = ret; - ret = mcast_receiver_setup(purd->fd, iface); + ret = mcast_receiver_setup(rn->fd, iface); if (ret < 0) { - close(purd->fd); + close(rn->fd); goto err; } - ret = mark_fd_nonblocking(purd->fd); + ret = mark_fd_nonblocking(rn->fd); if (ret < 0) { - close(purd->fd); + close(rn->fd); goto err; } PARA_INFO_LOG("receiving from %s:%d, fd=%d\n", c->host_arg, - c->port_arg, purd->fd); - purd->btrp = btr_pool_new("udp_recv", 320 * 1024); - return purd->fd; + c->port_arg, rn->fd); + rn->btrp = btr_pool_new("udp_recv", 320 * 1024); + return rn->fd; err: - free(rn->private_data); return ret; } @@ -246,9 +225,6 @@ void udp_recv_init(struct receiver *r) r->post_select = udp_recv_post_select; r->parse_config = udp_recv_parse_config; r->free_config = udp_recv_free_config; - r->help = (struct ggo_help) { - .short_help = udp_recv_args_info_help, - .detailed_help = udp_recv_args_info_detailed_help - }; + r->help = (struct ggo_help)DEFINE_GGO_HELP(udp_recv); udp_recv_cmdline_parser_free(&dummy); }