X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_recv.c;h=7bbd4b0c575a351055170bab1df3f186769c6783;hp=66dc36b904822437851b538499f9fe43203ed3a2;hb=aef566e9c8680629bac1ea84893b8b3ccd13da77;hpb=9692b4241bc316665bd5b6810ea8af83057a0a89 diff --git a/udp_recv.c b/udp_recv.c index 66dc36b9..7bbd4b0c 100644 --- a/udp_recv.c +++ b/udp_recv.c @@ -5,17 +5,19 @@ */ /** \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" @@ -23,24 +25,12 @@ /** 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; }; @@ -58,6 +48,17 @@ static int enough_space(size_t nbytes, size_t loaded) return nbytes + loaded < UDP_RECV_CHUNK_SIZE; } +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; +} + 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); @@ -65,7 +66,6 @@ static void udp_recv_post_select(__a_unused struct sched *s, struct task *t) int ret; char tmpbuf[UDP_RECV_CHUNK_SIZE]; size_t packet_size; - uint8_t stream_type, packet_type; if (rn->output_error && *rn->output_error < 0) { t->error = *rn->output_error; @@ -84,71 +84,14 @@ static void udp_recv_post_select(__a_unused struct sched *s, struct task *t) if (!ret) return; packet_size = ret; - t->error = -E_UDP_SHORT_PACKET; - if (packet_size < UDP_AUDIO_HEADER_LEN) - return; - t->error = -E_UDP_NO_MAGIC; - if (udp_check_magic(tmpbuf, packet_size) < 0) - 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; - payload_len = packet_size - UDP_AUDIO_HEADER_LEN; - if (!payload_len) - goto success; - t->error = -E_OVERRUN; - if (!enough_space(payload_len, rn->loaded)) - return; - memcpy(rn->buf + rn->loaded, tmpbuf + UDP_AUDIO_HEADER_LEN, - payload_len); - rn->loaded += payload_len; - goto success; - case UDP_HEADER_PACKET: - header_len = udp_read_header_len(tmpbuf); - if (header_len + UDP_AUDIO_HEADER_LEN > packet_size) { - t->error = -E_INVALID_HEADER; + if (packet_size >= FEC_EOF_PACKET_LEN) + if (!memcmp(tmpbuf, FEC_EOF_PACKET, FEC_EOF_PACKET_LEN)) return; - } -// PARA_DEBUG_LOG("header packet (%zu bytes), header len: %d\n", -// packet_size, header_len); - if (!purd->have_header) { - t->error = -E_OVERRUN; - if (!enough_space(header_len, rn->loaded)) - return; - purd->have_header = 1; - rn->loaded = header_len; - memcpy(rn->buf, tmpbuf + UDP_AUDIO_HEADER_LEN, - rn->loaded); - goto success; - } - payload_len = packet_size - UDP_AUDIO_HEADER_LEN - header_len; - if (!payload_len) - goto success; - t->error = -E_OVERRUN; - if (!enough_space(payload_len, rn->loaded)) - return; - memcpy(rn->buf + rn->loaded, tmpbuf + UDP_AUDIO_HEADER_LEN + - header_len, payload_len); - rn->loaded += payload_len; - } + t->error = add_rn_output(rn, tmpbuf, packet_size); + if (t->error < 0) + return; success: - t->error = 0; + t->error = 1; } static void udp_shutdown(void) @@ -179,25 +122,99 @@ 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 = mcast_receiver_setup(purd->fd, iface); + if (ret < 0) { + close(purd->fd); + return ret; + } + ret = mark_fd_nonblocking(purd->fd); if (ret < 0) - return ret; + goto err; PARA_NOTICE_LOG("receiving from %s:%d, fd=%d\n", c->host_arg, c->port_arg, purd->fd); return purd->fd; +err: + free(rn->private_data); + free(rn->buf); + return ret; } /**