X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_recv.c;h=67846b141926e80baba083edda9177fa8b3b6acf;hp=bdc25411ef7a5c17cdde8509ab9e6e8de01db10c;hb=7f08e8b0eb9570f1eb787dbb4e10d56585b36bbf;hpb=01556501c32d5ec155cc7e2cd78307ec1f177a07 diff --git a/udp_recv.c b/udp_recv.c index bdc25411..67846b14 100644 --- a/udp_recv.c +++ b/udp_recv.c @@ -1,268 +1,195 @@ -/* - * Copyright (C) 2005-2009 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2005 Andre Noll , see file COPYING. */ /** \file udp_recv.c Paraslash's udp receiver */ -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "recv_cmd.lsg.h" #include "para.h" #include "error.h" #include "portable_io.h" -#include "udp_header.h" #include "list.h" #include "sched.h" -#include "ggo.h" +#include "buffer_tree.h" #include "recv.h" -#include "udp_recv.cmdline.h" -#include "audiod.h" #include "string.h" #include "net.h" #include "fd.h" -/** The size of the receiver node buffer. */ -#define UDP_RECV_CHUNK_SIZE (128 * 1024) - -/** - * Data specific to the udp receiver. - * - * \sa \ref receiver, \ref receiver_node. - */ -struct private_udp_recv_data { - /** - * Whether a header was received. - * - * A flag indicating whether this receiver already received a packet - * which contains the audio file header. - * - * This flag has no effect if the audio stream indicates that no extra - * headers will be sent (mp3, aac). Otherwise, all data packets are - * dropped until the header is received. - */ - int have_header; - /** The socket file descriptor. */ - int fd; - /** Non-zero on short reads. */ - uint16_t need_more; - /** Copied from the first audio header received. */ - uint16_t stream_type; -}; - -static void udp_recv_pre_select(struct sched *s, struct task *t) +static void udp_recv_pre_select(struct sched *s, void *context) { - struct receiver_node *rn = container_of(t, struct receiver_node, task); - struct private_udp_recv_data *purd = rn->private_data; + struct receiver_node *rn = context; - para_fd_set(purd->fd, &s->rfds, &s->max_fileno); -} - -static int enough_space(size_t nbytes, size_t loaded) -{ - return nbytes + loaded < UDP_RECV_CHUNK_SIZE; + if (generic_recv_pre_select(s, rn) <= 0) + return; + para_fd_set(rn->fd, &s->rfds, &s->max_fileno); } -/* - * Perform some sanity checks on an udp audio file header. - * - * return: negative on error, 0: discard data, 1: use data - */ -static int examine_audio_header(struct private_udp_recv_data *purd, - struct udp_audio_header *uah, size_t packet_size) +static int udp_check_eof(size_t sz, struct iovec iov[2]) { - /* payload_len includes header */ - if (uah->payload_len < uah->header_len) - return -E_UDP_BAD_HEADER; - switch (uah->packet_type) { - case UDP_EOF_PACKET: + if (sz < FEC_EOF_PACKET_LEN) + return 0; + if (iov[0].iov_len >= FEC_EOF_PACKET_LEN) { + if (memcmp(iov[0].iov_base, FEC_EOF_PACKET, + FEC_EOF_PACKET_LEN) != 0) + return 0; return -E_RECV_EOF; - case UDP_BOF_PACKET: - purd->have_header = 1; - /* fall through */ - case UDP_DATA_PACKET: - if (uah->header_len) /* header in no-header packet */ - return -E_UDP_BAD_HEADER; - break; - case UDP_HEADER_PACKET: - if (!uah->header_len) /** no header in header packet */ - return -E_UDP_BAD_HEADER; - break; - default: /* bad packet type */ - return -E_UDP_BAD_HEADER; } - /* check stream type */ - if (uah->stream_type != UDP_PLAIN_STREAM && - uah->stream_type != UDP_HEADER_STREAM) - return -E_UDP_BAD_STREAM_TYPE; - if (purd->stream_type == UDP_UNKNOWN_STREAM) - purd->stream_type = uah->stream_type; - /* stream type must not change */ - if (uah->stream_type != purd->stream_type) - return -E_UDP_BAD_STREAM_TYPE; - if (!purd->have_header && uah->stream_type == UDP_HEADER_STREAM) - /* can't use the data, wait for header packet */ + if (memcmp(iov[0].iov_base, FEC_EOF_PACKET, iov[0].iov_len) != 0) return 0; - if (packet_size < uah->payload_len + UDP_AUDIO_HEADER_LEN) - /* we read only a part of the package */ - purd->need_more = uah->payload_len - + UDP_AUDIO_HEADER_LEN - packet_size; - return 1; -} - -static int add_rn_output(struct receiver_node *rn, char *buf, size_t len) -{ - if (!len) - return 1; - if (!enough_space(len, rn->loaded)) - return -E_UDP_OVERRUN; - memcpy(rn->buf + rn->loaded, buf, len); - rn->loaded += len; - return 1; + 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, void *context) { - struct receiver_node *rn = container_of(t, struct receiver_node, task); - struct private_udp_recv_data *purd = rn->private_data; - int ret; - char tmpbuf[UDP_RECV_CHUNK_SIZE]; - uint16_t data_len; - char *data_buf; - size_t packet_size; - struct udp_audio_header uah; + struct receiver_node *rn = context; + struct btr_node *btrn = rn->btrn; + size_t num_bytes; + struct iovec iov[2]; + int ret, readv_ret, iovcnt; - if (rn->output_error && *rn->output_error < 0) { - t->error = *rn->output_error; - return; + ret = task_get_notification(rn->task); + if (ret < 0) + 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_UDP_OVERRUN; + if (iovcnt == 0) + goto out; + ret = readv_nonblock(rn->fd, iov, iovcnt, &s->rfds, &num_bytes); + if (num_bytes == 0) + goto out; + readv_ret = ret; + ret = udp_check_eof(num_bytes, iov); + if (ret < 0) + goto out; + if (iov[0].iov_len >= num_bytes) + 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); } - if (!FD_ISSET(purd->fd, &s->rfds)) - return; - ret = recv_bin_buffer(purd->fd, tmpbuf, UDP_RECV_CHUNK_SIZE); + ret = readv_ret; +out: if (ret < 0) { - if (is_errno(ret, EINTR) || is_errno(ret, EAGAIN)) - goto success; - t->error = ret; - return; - } - t->error = -E_RECV_EOF; - if (!ret) - return; - packet_size = ret; - for (;;) { - uint16_t num; - - if (!purd->need_more) { - ret = read_udp_audio_header(tmpbuf, packet_size, &uah); - if (ret >= 0) - break; - goto success; /* drop data */ - } - num = PARA_MIN(purd->need_more, (uint16_t)packet_size); - assert(num > 0); - t->error = add_rn_output(rn, tmpbuf, num); - if (t->error < 0) - return; - purd->need_more -= num; - if (packet_size <= num) - goto success; - packet_size -= num; - memmove(tmpbuf, tmpbuf + num, packet_size); - } - assert(!purd->need_more); - t->error = examine_audio_header(purd, &uah, packet_size); - if (t->error <= 0) - return; - data_len = uah.payload_len; - data_buf = tmpbuf + UDP_AUDIO_HEADER_LEN; - if (uah.packet_type == UDP_HEADER_PACKET) { - if (purd->have_header) { /* skip header */ - data_buf += uah.header_len; - data_len -= uah.header_len; - } else { /* only use the header */ - purd->have_header = 1; - data_len = uah.header_len; - } + btr_remove_node(&rn->btrn); + close(rn->fd); + rn->fd = -1; } - t->error = add_rn_output(rn, data_buf, data_len); - return; -success: - t->error = 1; + return ret; } -static void udp_shutdown(void) +static void udp_recv_close(struct receiver_node *rn) { - return; + if (rn->fd >= 0) + close(rn->fd); + btr_pool_free(rn->btrp); } -static void udp_recv_close(struct receiver_node *rn) +/* + * Perform AF-independent joining of multicast receive addresses. + * + * \param fd Bound socket descriptor. + * \param iface The receiving multicast interface, or NULL for the default. + * + * \return Zero if okay, negative on error. + */ +static int mcast_receiver_setup(int fd, const char *iface) { - struct private_udp_recv_data *purd = rn->private_data; + struct sockaddr_storage ss; + socklen_t sslen = sizeof(ss); + int id = iface == NULL ? 0 : if_nametoindex(iface); - if (purd->fd >= 0) - close(purd->fd); - free(rn->private_data); - free(rn->buf); -} + if (getsockname(fd, (struct sockaddr *)&ss, &sslen) < 0) + goto err; + assert(ss.ss_family == AF_INET || ss.ss_family == AF_INET6); -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)); + if (iface != NULL && id == 0) + PARA_WARNING_LOG("could not resolve interface %s, using default\n", + iface); + + switch (ss.ss_family) { + case AF_INET: + if (IN_MULTICAST(htonl(((struct sockaddr_in *)&ss)->sin_addr.s_addr))) { +#ifdef HAVE_IP_MREQN + struct ip_mreqn m4; + + m4.imr_address.s_addr = INADDR_ANY; + m4.imr_ifindex = id; +#else + struct ip_mreq m4; + + m4.imr_interface.s_addr = INADDR_ANY; + if (id != 0) + PARA_ERROR_LOG("Setting IPv4 receiver mcast interface not supported\n"); + +#endif + m4.imr_multiaddr = ((struct sockaddr_in *)&ss)->sin_addr; - ret = udp_recv_cmdline_parser(argc, argv, tmp)? -E_UDP_SYNTAX : 1; - if (ret >= 0) - return tmp; - free(tmp); - return NULL; + if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, + &m4, sizeof(m4)) < 0) + break; + } + return 0; + case AF_INET6: + if (IN6_IS_ADDR_MULTICAST(&((struct sockaddr_in6 *)&ss)->sin6_addr)) { + struct ipv6_mreq m6; + + memset(&m6, 0, sizeof(m6)); + memcpy(&m6.ipv6mr_multiaddr, &((struct sockaddr_in6 *)&ss)->sin6_addr, 16); + m6.ipv6mr_interface = id; + if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &m6, sizeof(m6)) < 0) + break; + } + return 0; + } +err: + return -ERRNO_TO_PARA_ERROR(errno); } static int udp_recv_open(struct receiver_node *rn) { - struct private_udp_recv_data *purd; - struct udp_recv_args_info *c = rn->conf; + struct lls_parse_result *lpr = rn->lpr; + const char *iface = RECV_CMD_OPT_STRING_VAL(UDP, IFACE, lpr); + const char *host = RECV_CMD_OPT_STRING_VAL(UDP, HOST, lpr); + uint32_t port = RECV_CMD_OPT_UINT32_VAL(UDP, PORT, lpr); int ret; - rn->buf = para_calloc(UDP_RECV_CHUNK_SIZE); - rn->private_data = para_calloc(sizeof(struct private_udp_recv_data)); - purd = rn->private_data; - ret = create_udp_recv_socket(c->host_arg, c->port_arg); + ret = makesock(IPPROTO_UDP, 1, host, port, NULL); + if (ret < 0) + return ret; + rn->fd = ret; + ret = mcast_receiver_setup(rn->fd, iface); if (ret < 0) goto err; - purd->fd = ret; - ret = mark_fd_nonblocking(purd->fd); + ret = mark_fd_nonblocking(rn->fd); if (ret < 0) goto err; - purd->stream_type = UDP_UNKNOWN_STREAM; - PARA_NOTICE_LOG("receiving from %s:%d, fd=%d\n", c->host_arg, - c->port_arg, purd->fd); - return purd->fd; + PARA_INFO_LOG("receiving from %s:%u, fd=%d\n", host, port, rn->fd); + rn->btrp = btr_pool_new("udp_recv", 320 * 1024); + return rn->fd; err: - free(rn->private_data); - free(rn->buf); + close(rn->fd); return ret; } -/** - * The init function of the udp receiver. - * - * \param r Pointer to the receiver struct to initialize. - * - * Initialize all function pointers of \a r. - */ -void udp_recv_init(struct receiver *r) -{ - struct udp_recv_args_info dummy; - - udp_recv_cmdline_parser_init(&dummy); - r->shutdown = udp_shutdown; - r->open = udp_recv_open; - r->close = udp_recv_close; - r->pre_select = udp_recv_pre_select; - r->post_select = udp_recv_post_select; - r->parse_config = udp_recv_parse_config; - r->help = (struct ggo_help) { - .short_help = udp_recv_args_info_help, - .detailed_help = udp_recv_args_info_detailed_help - }; -} +/** See \ref recv_init(). */ +const struct receiver lsg_recv_cmd_com_udp_user_data = { + .open = udp_recv_open, + .close = udp_recv_close, + .pre_select = udp_recv_pre_select, + .post_select = udp_recv_post_select, +};