X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fudp.c;h=dc896a43f1cd83469643cdc54c734caf1b87bfb0;hb=b7dc88fc68759ddd79caf291d75e715930362aac;hp=17301307300dbd1a62c32d8719b7c3da7a701f5d;hpb=e6c13819825aab796965a96ffb451cd008eab647;p=ffmpeg diff --git a/libavformat/udp.c b/libavformat/udp.c index 17301307300..dc896a43f1c 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -1,6 +1,6 @@ /* * UDP prototype streaming system - * Copyright (c) 2000, 2001, 2002 Fabrice Bellard. + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard * * This file is part of FFmpeg. * @@ -20,14 +20,20 @@ */ /** - * @file udp.c + * @file libavformat/udp.c * UDP protocol */ +#define _BSD_SOURCE /* Needed for using struct ip_mreq with recent glibc */ #include "avformat.h" #include +#include "internal.h" #include "network.h" #include "os_support.h" +#if HAVE_SYS_SELECT_H +#include +#endif +#include #ifndef IPV6_ADD_MEMBERSHIP #define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP @@ -43,21 +49,20 @@ typedef struct { int udp_fd; int ttl; + int buffer_size; int is_multicast; int local_port; int reuse_socket; -#ifndef CONFIG_IPV6 - struct sockaddr_in dest_addr; -#else struct sockaddr_storage dest_addr; -#endif int dest_addr_len; } UDPContext; #define UDP_TX_BUF_SIZE 32768 #define UDP_MAX_PKT_SIZE 65536 -static int udp_set_multicast_ttl(int sockfd, int mcastTTL, struct sockaddr *addr) { +static int udp_set_multicast_ttl(int sockfd, int mcastTTL, + struct sockaddr *addr) +{ #ifdef IP_MULTICAST_TTL if (addr->sa_family == AF_INET) { if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &mcastTTL, sizeof(mcastTTL)) < 0) { @@ -66,7 +71,7 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, struct sockaddr *addr } } #endif -#ifdef CONFIG_IPV6 +#if defined(IPPROTO_IPV6) && defined(IPV6_MULTICAST_HOPS) if (addr->sa_family == AF_INET6) { if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &mcastTTL, sizeof(mcastTTL)) < 0) { av_log(NULL, AV_LOG_ERROR, "setsockopt(IPV6_MULTICAST_HOPS): %s\n", strerror(errno)); @@ -77,7 +82,8 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, struct sockaddr *addr return 0; } -static int udp_join_multicast_group(int sockfd, struct sockaddr *addr) { +static int udp_join_multicast_group(int sockfd, struct sockaddr *addr) +{ #ifdef IP_ADD_MEMBERSHIP if (addr->sa_family == AF_INET) { struct ip_mreq mreq; @@ -90,7 +96,7 @@ static int udp_join_multicast_group(int sockfd, struct sockaddr *addr) { } } #endif -#ifdef CONFIG_IPV6 +#if HAVE_STRUCT_IPV6_MREQ if (addr->sa_family == AF_INET6) { struct ipv6_mreq mreq6; @@ -105,7 +111,8 @@ static int udp_join_multicast_group(int sockfd, struct sockaddr *addr) { return 0; } -static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr) { +static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr) +{ #ifdef IP_DROP_MEMBERSHIP if (addr->sa_family == AF_INET) { struct ip_mreq mreq; @@ -118,7 +125,7 @@ static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr) { } } #endif -#ifdef CONFIG_IPV6 +#if HAVE_STRUCT_IPV6_MREQ if (addr->sa_family == AF_INET6) { struct ipv6_mreq mreq6; @@ -133,8 +140,9 @@ static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr) { return 0; } -#ifdef CONFIG_IPV6 -static struct addrinfo* udp_ipv6_resolve_host(const char *hostname, int port, int type, int family, int flags) { +static struct addrinfo* udp_resolve_host(const char *hostname, int port, + int type, int family, int flags) +{ struct addrinfo hints, *res = 0; int error; char sport[16]; @@ -152,17 +160,20 @@ static struct addrinfo* udp_ipv6_resolve_host(const char *hostname, int port, in hints.ai_family = family; hints.ai_flags = flags; if ((error = getaddrinfo(node, service, &hints, &res))) { - av_log(NULL, AV_LOG_ERROR, "udp_ipv6_resolve_host: %s\n", gai_strerror(error)); + res = NULL; + av_log(NULL, AV_LOG_ERROR, "udp_resolve_host: %s\n", gai_strerror(error)); } return res; } -static int udp_set_url(struct sockaddr_storage *addr, const char *hostname, int port) { +static int udp_set_url(struct sockaddr_storage *addr, + const char *hostname, int port) +{ struct addrinfo *res0; int addr_len; - res0 = udp_ipv6_resolve_host(hostname, port, SOCK_DGRAM, AF_UNSPEC, 0); + res0 = udp_resolve_host(hostname, port, SOCK_DGRAM, AF_UNSPEC, 0); if (res0 == 0) return AVERROR(EIO); memcpy(addr, res0->ai_addr, res0->ai_addrlen); addr_len = res0->ai_addrlen; @@ -176,14 +187,17 @@ static int is_multicast_address(struct sockaddr_storage *addr) if (addr->ss_family == AF_INET) { return IN_MULTICAST(ntohl(((struct sockaddr_in *)addr)->sin_addr.s_addr)); } +#if HAVE_STRUCT_SOCKADDR_IN6 if (addr->ss_family == AF_INET6) { return IN6_IS_ADDR_MULTICAST(&((struct sockaddr_in6 *)addr)->sin6_addr); } +#endif return 0; } -static int udp_socket_create(UDPContext *s, struct sockaddr_storage *addr, int *addr_len) +static int udp_socket_create(UDPContext *s, + struct sockaddr_storage *addr, int *addr_len) { int udp_fd = -1; struct addrinfo *res0 = NULL, *res = NULL; @@ -191,7 +205,7 @@ static int udp_socket_create(UDPContext *s, struct sockaddr_storage *addr, int * if (((struct sockaddr *) &s->dest_addr)->sa_family) family = ((struct sockaddr *) &s->dest_addr)->sa_family; - res0 = udp_ipv6_resolve_host(0, s->local_port, SOCK_DGRAM, family, AI_PASSIVE); + res0 = udp_resolve_host(0, s->local_port, SOCK_DGRAM, family, AI_PASSIVE); if (res0 == 0) goto fail; for (res = res0; res; res=res->ai_next) { @@ -230,46 +244,6 @@ static int udp_port(struct sockaddr_storage *addr, int addr_len) return strtol(sbuf, NULL, 10); } -#else - -static int udp_set_url(struct sockaddr_in *addr, const char *hostname, int port) -{ - /* set the destination address */ - if (resolve_host(&addr->sin_addr, hostname) < 0) - return AVERROR(EIO); - addr->sin_family = AF_INET; - addr->sin_port = htons(port); - - return sizeof(struct sockaddr_in); -} - -static int is_multicast_address(struct sockaddr_in *addr) -{ - return IN_MULTICAST(ntohl(addr->sin_addr.s_addr)); -} - -static int udp_socket_create(UDPContext *s, struct sockaddr_in *addr, int *addr_len) -{ - int fd; - - fd = socket(AF_INET, SOCK_DGRAM, 0); - if (fd < 0) - return -1; - - addr->sin_family = AF_INET; - addr->sin_addr.s_addr = htonl (INADDR_ANY); - addr->sin_port = htons(s->local_port); - *addr_len = sizeof(struct sockaddr_in); - - return fd; -} - -static int udp_port(struct sockaddr_in *addr, int len) -{ - return ntohs(addr->sin_port); -} -#endif /* CONFIG_IPV6 */ - /** * If no filename is given to av_open_input_file because you want to @@ -292,7 +266,7 @@ int udp_set_remote_url(URLContext *h, const char *uri) char hostname[256]; int port; - url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri); + ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri); /* set the destination address */ s->dest_addr_len = udp_set_url(&s->dest_addr, hostname, port); @@ -320,6 +294,9 @@ int udp_get_local_port(URLContext *h) * streams at the same time. * @param h media file context */ +#if (LIBAVFORMAT_VERSION_MAJOR >= 53) +static +#endif int udp_get_file_handle(URLContext *h) { UDPContext *s = h->priv_data; @@ -331,16 +308,12 @@ int udp_get_file_handle(URLContext *h) static int udp_open(URLContext *h, const char *uri, int flags) { char hostname[1024]; - int port, udp_fd = -1, tmp; + int port, udp_fd = -1, tmp, bind_ret = -1; UDPContext *s = NULL; int is_output; const char *p; char buf[256]; -#ifndef CONFIG_IPV6 - struct sockaddr_in my_addr; -#else struct sockaddr_storage my_addr; -#endif int len; h->is_streamed = 1; @@ -348,15 +321,14 @@ static int udp_open(URLContext *h, const char *uri, int flags) is_output = (flags & URL_WRONLY); - if(!ff_network_init()) - return AVERROR(EIO); - s = av_mallocz(sizeof(UDPContext)); if (!s) return AVERROR(ENOMEM); h->priv_data = s; s->ttl = 16; + s->buffer_size = is_output ? UDP_TX_BUF_SIZE : UDP_MAX_PKT_SIZE; + p = strchr(uri, '?'); if (p) { s->reuse_socket = find_info_tag(buf, sizeof(buf), "reuse", p); @@ -369,12 +341,15 @@ static int udp_open(URLContext *h, const char *uri, int flags) if (find_info_tag(buf, sizeof(buf), "pkt_size", p)) { h->max_packet_size = strtol(buf, NULL, 10); } + if (find_info_tag(buf, sizeof(buf), "buffer_size", p)) { + s->buffer_size = strtol(buf, NULL, 10); + } } /* fill the dest addr */ - url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri); + ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri); - /* XXX: fix url_split */ + /* XXX: fix ff_url_split */ if (hostname[0] == '\0' || hostname[0] == '?') { /* only accepts null hostname if input */ if (flags & URL_WRONLY) @@ -394,7 +369,13 @@ static int udp_open(URLContext *h, const char *uri, int flags) goto fail; /* the bind is needed to give a port to the socket now */ - if (bind(udp_fd,(struct sockaddr *)&my_addr, len) < 0) + /* if multicast, try the multicast address bind first */ + if (s->is_multicast && !(h->flags & URL_WRONLY)) { + bind_ret = bind(udp_fd,(struct sockaddr *)&s->dest_addr, len); + } + /* bind to the local address if not multicast or if the multicast + * bind failed */ + if (bind_ret < 0 && bind(udp_fd,(struct sockaddr *)&my_addr, len) < 0) goto fail; len = sizeof(my_addr); @@ -415,7 +396,7 @@ static int udp_open(URLContext *h, const char *uri, int flags) if (is_output) { /* limit the tx buf size to limit latency */ - tmp = UDP_TX_BUF_SIZE; + tmp = s->buffer_size; if (setsockopt(udp_fd, SOL_SOCKET, SO_SNDBUF, &tmp, sizeof(tmp)) < 0) { av_log(NULL, AV_LOG_ERROR, "setsockopt(SO_SNDBUF): %s\n", strerror(errno)); goto fail; @@ -423,8 +404,12 @@ static int udp_open(URLContext *h, const char *uri, int flags) } else { /* set udp recv buffer size to the largest possible udp packet size to * avoid losing data on OSes that set this too low by default. */ - tmp = UDP_MAX_PKT_SIZE; - setsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, sizeof(tmp)); + tmp = s->buffer_size; + if (setsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, sizeof(tmp)) < 0) { + av_log(NULL, AV_LOG_WARNING, "setsockopt(SO_RECVBUF): %s\n", strerror(errno)); + } + /* make the socket non-blocking */ + ff_socket_nonblock(udp_fd, 1); } s->udp_fd = udp_fd; @@ -440,8 +425,22 @@ static int udp_read(URLContext *h, uint8_t *buf, int size) { UDPContext *s = h->priv_data; int len; + fd_set rfds; + int ret; + struct timeval tv; for(;;) { + if (url_interrupt_cb()) + return AVERROR(EINTR); + FD_ZERO(&rfds); + FD_SET(s->udp_fd, &rfds); + tv.tv_sec = 0; + tv.tv_usec = 100 * 1000; + ret = select(s->udp_fd + 1, &rfds, NULL, NULL, &tv); + if (ret < 0) + return AVERROR(EIO); + if (!(ret > 0 && FD_ISSET(s->udp_fd, &rfds))) + continue; len = recv(s->udp_fd, buf, size, 0); if (len < 0) { if (ff_neterrno() != FF_NETERROR(EAGAIN) && @@ -481,7 +480,6 @@ static int udp_close(URLContext *h) if (s->is_multicast && !(h->flags & URL_WRONLY)) udp_leave_multicast_group(s->udp_fd, (struct sockaddr *)&s->dest_addr); closesocket(s->udp_fd); - ff_network_close(); av_free(s); return 0; } @@ -493,4 +491,5 @@ URLProtocol udp_protocol = { udp_write, NULL, /* seek */ udp_close, + .url_get_file_handle = udp_get_file_handle, };