/*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file udp_recv.c Paraslash's udp receiver */
+#include <regex.h>
#include <dirent.h>
+#include <sys/socket.h>
+#include <net/if.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 "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)
+#include "buffer_tree.h"
/**
* 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;
+ 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);
}
-static int enough_space(size_t nbytes, size_t loaded)
-{
- return nbytes + loaded < UDP_RECV_CHUNK_SIZE;
-}
-
-/*
- * 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)
{
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;
+ struct btr_node *btrn = rn->btrn;
size_t packet_size;
- struct udp_audio_header uah;
+ struct iovec iov[2];
+ int ret, iovcnt;
- 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) {
- if (is_errno(ret, EINTR) || is_errno(ret, EAGAIN))
- goto success;
- t->error = ret;
- return;
- }
- t->error = -E_RECV_EOF;
- if (!ret)
+ iovcnt = btr_pool_get_buffers(purd->btrp, iov);
+ ret = -E_UDP_OVERRUN;
+ if (iovcnt == 0)
+ goto err;
+ ret = para_readv(purd->fd, iov, iovcnt);
+ /* EAGAIN is possible even if FD_ISSET */
+ if (ret < 0 && is_errno(-ret, EAGAIN))
return;
+ if (ret == 0)
+ ret = -E_RECV_EOF;
+ if (ret < 0)
+ goto err;
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;
- }
+ ret = udp_check_eof(packet_size, iov);
+ if (ret < 0)
+ goto err;
+ if (iov[0].iov_len >= packet_size)
+ btr_add_output_pool(purd->btrp, packet_size, btrn);
+ else { /* both buffers contain data */
+ btr_add_output_pool(purd->btrp, iov[0].iov_len, btrn);
+ btr_add_output_pool(purd->btrp, packet_size - iov[0].iov_len,
+ btrn);
}
- t->error = add_rn_output(rn, data_buf, data_len);
- return;
-success:
- t->error = 1;
-}
-
-static void udp_shutdown(void)
-{
return;
+err:
+ btr_remove_node(btrn);
+ t->error = ret;
+ close(purd->fd);
+ purd->fd = -1;
}
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)
* 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)
+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;
- memset(&m4, 0, sizeof(m4));
- m4.imr_multiaddr = ((struct sockaddr_in *)&ss)->sin_addr;
+ 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;
}
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;
}
{
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 = makesock(AF_UNSPEC, IPPROTO_UDP, 1, c->host_arg, c->port_arg);
+ ret = makesock(IPPROTO_UDP, 1, c->host_arg, c->port_arg, NULL);
if (ret < 0)
goto err;
purd->fd = ret;
- ret = mcast_receiver_setup(purd->fd);
+ ret = mcast_receiver_setup(purd->fd, iface);
if (ret < 0) {
close(purd->fd);
- return ret;
+ goto err;
}
ret = mark_fd_nonblocking(purd->fd);
- if (ret < 0)
+ if (ret < 0) {
+ close(purd->fd);
goto err;
- purd->stream_type = UDP_UNKNOWN_STREAM;
- PARA_NOTICE_LOG("receiving from %s:%d, fd=%d\n", c->host_arg,
+ }
+ 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);
- free(rn->buf);
return ret;
}
+static void udp_recv_free_config(void *conf)
+{
+ udp_recv_cmdline_parser_free(conf);
+ free(conf);
+}
+
/**
* The init function of the udp receiver.
*
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);
}
projects / paraslash.git / blobdiff