X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_recv.c;h=d899e43933eddc9c72de93354ada14c3a607012a;hp=b2563726943b99c77489e3141b929e7f83fad93d;hb=e9e826f4fb415c4225ff5934fe42572ffa3b5ebc;hpb=141b0fd36edcad22ee07c65b101e90064d8567b6 diff --git a/udp_recv.c b/udp_recv.c index b2563726..d899e439 100644 --- a/udp_recv.c +++ b/udp_recv.c @@ -1,28 +1,27 @@ /* - * Copyright (C) 2005-2008 Andre Noll + * Copyright (C) 2005-2009 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 "para.h" +#include "error.h" #include "portable_io.h" -#include "udp_header.h" #include "list.h" #include "sched.h" #include "ggo.h" #include "recv.h" #include "udp_recv.cmdline.h" -#include "error.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) +#include "buffer_tree.h" /** * Data specific to the udp receiver. @@ -30,19 +29,9 @@ * \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; + struct btr_pool *btrp; }; static void udp_recv_pre_select(struct sched *s, struct task *t) @@ -50,110 +39,52 @@ 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); } -static int enough_space(size_t packet_size, size_t loaded) -{ - return packet_size + loaded < UDP_RECV_CHUNK_SIZE + UDP_AUDIO_HEADER_LEN; -} - static void 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; int ret; - char tmpbuf[UDP_RECV_CHUNK_SIZE]; - size_t packet_size; - uint8_t stream_type, packet_type; + char *buf = NULL; + size_t packet_size, bufsize; - if (rn->output_error && *rn->output_error < 0) { - t->error = *rn->output_error; + t->error = 0; + ret = btr_node_status(btrn, 0, BTR_NT_ROOT); + if (ret < 0) + goto err; + if (ret == 0) return; - } if (!FD_ISSET(purd->fd, &s->rfds)) return; - ret = recv_bin_buffer(purd->fd, tmpbuf, UDP_RECV_CHUNK_SIZE); - if (ret < 0) { - t->error = 0; - if (errno != EINTR && errno != EAGAIN) - t->error = -ERRNO_TO_PARA_ERROR(errno); - return; - } + bufsize = btr_pool_get_buffer(purd->btrp, &buf); + ret = -E_UDP_OVERRUN; + if (bufsize == 0) + goto err; + ret = recv_bin_buffer(purd->fd, buf, bufsize); + if (ret == 0) + ret = -E_RECV_EOF; + if (ret < 0) + goto err; packet_size = ret; - if (packet_size < UDP_AUDIO_HEADER_LEN) { - t->error = -E_UDP_SHORT_PACKET; /* FIXME: We shouldn't fail here */ - return; - } - if (udp_check_magic(tmpbuf, packet_size) < 0) { - t->error = -E_UDP_NO_MAGIC; - return; - } - stream_type = udp_read_stream_type(tmpbuf); - packet_type = udp_read_packet_type(tmpbuf); -// PARA_INFO_LOG("packet type: %d, stream type: %d," -// " loaded: %u\n", packet_type, -// (unsigned) stream_type, rn->loaded); - switch (packet_type) { - uint16_t header_len, payload_len; - case UDP_EOF_PACKET: - t->error = -E_RECV_EOF; - return; - case UDP_BOF_PACKET: - PARA_INFO_LOG("bof (%zu)\n", packet_size); - purd->have_header = 1; - /* fall through */ - case UDP_DATA_PACKET: - if (!purd->have_header && stream_type == UDP_HEADER_STREAM) - /* can't use the data, wait for header */ - goto success; - if (!enough_space(packet_size, rn->loaded)) { - t->error = -E_OVERRUN; - return; - } - if (packet_size > UDP_AUDIO_HEADER_LEN) { - memcpy(rn->buf + rn->loaded, tmpbuf + UDP_AUDIO_HEADER_LEN, - packet_size - UDP_AUDIO_HEADER_LEN); - rn->loaded += packet_size - UDP_AUDIO_HEADER_LEN; - } - goto success; - case UDP_HEADER_PACKET: - if (!enough_space(packet_size, rn->loaded)) { - t->error = -E_OVERRUN; - return; - } - header_len = udp_read_header_len(tmpbuf); - if (header_len + UDP_AUDIO_HEADER_LEN > packet_size) { - t->error = -E_INVALID_HEADER; - return; - } -// PARA_DEBUG_LOG("header packet (%zu bytes), header len: %d\n", -// packet_size, header_len); - if (!purd->have_header) { - purd->have_header = 1; - rn->loaded = header_len; - memcpy(rn->buf, tmpbuf + UDP_AUDIO_HEADER_LEN, - rn->loaded); -// sleep(1); - goto success; - } - payload_len = packet_size - UDP_AUDIO_HEADER_LEN - header_len; - if (rn->loaded + payload_len > UDP_RECV_CHUNK_SIZE) { - t->error = -E_OVERRUN; - return; + if (packet_size >= FEC_EOF_PACKET_LEN) { + if (!memcmp(buf, FEC_EOF_PACKET, FEC_EOF_PACKET_LEN)) { + PARA_INFO_LOG("received eof packet\n"); + ret = -E_RECV_EOF; + goto err; } - if (payload_len) - memcpy(rn->buf + rn->loaded, tmpbuf - + (packet_size - payload_len), payload_len); - rn->loaded += payload_len; } -success: - t->error = 0; -} - -static void udp_shutdown(void) -{ + btr_add_output_pool(purd->btrp, packet_size, btrn); return; +err: + btr_remove_node(btrn); + t->error = ret; + close(purd->fd); + purd->fd = -1; } static void udp_recv_close(struct receiver_node *rn) @@ -162,8 +93,8 @@ static void udp_recv_close(struct receiver_node *rn) if (purd->fd >= 0) close(purd->fd); + btr_pool_free(purd->btrp); free(rn->private_data); - free(rn->buf); } static void *udp_recv_parse_config(int argc, char **argv) @@ -179,25 +110,106 @@ static void *udp_recv_parse_config(int argc, char **argv) return NULL; } +/* + * 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 sockaddr_storage ss; + socklen_t sslen = sizeof(ss); + int id = iface == NULL ? 0 : if_nametoindex(iface); + + if (getsockname(fd, (struct sockaddr *)&ss, &sslen) < 0) + goto err; + + if (iface != NULL && id == 0) + PARA_WARNING_LOG("could not resolve interface %s, using default", 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."); + +#endif + m4.imr_multiaddr = ((struct sockaddr_in *)&ss)->sin_addr; + + 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; + default: + PARA_ERROR_LOG("address family %d not supported", ss.ss_family); + return -E_ADDRESS_LOOKUP; + } +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; + char *iface = c->iface_given ? c->iface_arg : NULL; 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(AF_UNSPEC, IPPROTO_UDP, 1, c->host_arg, c->port_arg); if (ret < 0) - return ret; + goto err; purd->fd = ret; - ret = mark_fd_nonblocking(purd->fd); - if (ret < 0) + + ret = mcast_receiver_setup(purd->fd, iface); + if (ret < 0) { + close(purd->fd); return ret; - PARA_NOTICE_LOG("receiving from %s:%d, fd=%d\n", c->host_arg, + } + + ret = mark_fd_nonblocking(purd->fd); + if (ret < 0) { + close(purd->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; +err: + free(rn->private_data); + return ret; +} + +static void udp_recv_free_config(void *conf) +{ + udp_recv_cmdline_parser_free(conf); + free(conf); } /** @@ -212,14 +224,15 @@ 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->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 }; + udp_recv_cmdline_parser_free(&dummy); }