X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frtpproto.c;h=6582e4ad7660beaf28109c10b1722240a158741b;hb=90bc423212396e96a02edc1118982ab7f7766a63;hp=024c69ba595f98fce647e6162d0e9a09f549dcc6;hpb=54e03ff6af8a070f1055edd26028f3f7b2e2ca8e;p=ffmpeg diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index 024c69ba595..6582e4ad766 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -26,9 +26,11 @@ #include "libavutil/parseutils.h" #include "libavutil/avstring.h" +#include "libavutil/opt.h" #include "avformat.h" #include "avio_internal.h" -#include "rtpdec.h" +#include "rtp.h" +#include "rtpproto.h" #include "url.h" #include @@ -41,11 +43,46 @@ #endif typedef struct RTPContext { + const AVClass *class; URLContext *rtp_hd, *rtcp_hd; int rtp_fd, rtcp_fd, nb_ssm_include_addrs, nb_ssm_exclude_addrs; struct sockaddr_storage **ssm_include_addrs, **ssm_exclude_addrs; + int write_to_source; + struct sockaddr_storage last_rtp_source, last_rtcp_source; + socklen_t last_rtp_source_len, last_rtcp_source_len; + int ttl; + int buffer_size; + int rtcp_port, local_rtpport, local_rtcpport; + int connect; + int pkt_size; + char *sources; + char *block; } RTPContext; +#define OFFSET(x) offsetof(RTPContext, x) +#define D AV_OPT_FLAG_DECODING_PARAM +#define E AV_OPT_FLAG_ENCODING_PARAM +static const AVOption options[] = { + { "ttl", "Time to live (in milliseconds, multicast only)", OFFSET(ttl), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, + { "buffer_size", "Send/Receive buffer size (in bytes)", OFFSET(buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, + { "rtcp_port", "Custom rtcp port", OFFSET(rtcp_port), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, + { "local_rtpport", "Local rtp port", OFFSET(local_rtpport), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, + { "local_rtcpport", "Local rtcp port", OFFSET(local_rtcpport), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, + { "connect", "Connect socket", OFFSET(connect), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = D|E }, + { "write_to_source", "Send packets to the source address of the latest received packet", OFFSET(write_to_source), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = D|E }, + { "pkt_size", "Maximum packet size", OFFSET(pkt_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, + { "sources", "Source list", OFFSET(sources), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = D|E }, + { "block", "Block list", OFFSET(block), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = D|E }, + { NULL } +}; + +static const AVClass rtp_class = { + .class_name = "rtp", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + /** * If no filename is given to av_open_input_file because you want to * get the local port first, then you must call this function to set @@ -60,18 +97,27 @@ int ff_rtp_set_remote_url(URLContext *h, const char *uri) { RTPContext *s = h->priv_data; char hostname[256]; - int port; + int port, rtcp_port; + const char *p; char buf[1024]; char path[1024]; av_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), uri); + rtcp_port = port + 1; + + p = strchr(uri, '?'); + if (p) { + if (av_find_info_tag(buf, sizeof(buf), "rtcpport", p)) { + rtcp_port = strtol(buf, NULL, 10); + } + } ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port, "%s", path); ff_udp_set_remote_url(s->rtp_hd, buf); - ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port + 1, "%s", path); + ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, rtcp_port, "%s", path); ff_udp_set_remote_url(s->rtcp_hd, buf); return 0; } @@ -105,7 +151,7 @@ static int compare_addr(const struct sockaddr_storage *a, ((const struct sockaddr_in *)b)->sin_addr.s_addr); } -#if defined(IPPROTO_IPV6) +#if HAVE_STRUCT_SOCKADDR_IN6 if (a->ss_family == AF_INET6) { const uint8_t *s6_addr_a = ((const struct sockaddr_in6 *)a)->sin6_addr.s6_addr; const uint8_t *s6_addr_b = ((const struct sockaddr_in6 *)b)->sin6_addr.s6_addr; @@ -115,6 +161,27 @@ static int compare_addr(const struct sockaddr_storage *a, return 1; } +static int get_port(const struct sockaddr_storage *ss) +{ + if (ss->ss_family == AF_INET) + return ntohs(((const struct sockaddr_in *)ss)->sin_port); +#if HAVE_STRUCT_SOCKADDR_IN6 + if (ss->ss_family == AF_INET6) + return ntohs(((const struct sockaddr_in6 *)ss)->sin6_port); +#endif + return 0; +} + +static void set_port(struct sockaddr_storage *ss, int port) +{ + if (ss->ss_family == AF_INET) + ((struct sockaddr_in *)ss)->sin_port = htons(port); +#if HAVE_STRUCT_SOCKADDR_IN6 + else if (ss->ss_family == AF_INET6) + ((struct sockaddr_in6 *)ss)->sin6_port = htons(port); +#endif +} + static int rtp_check_source_lists(RTPContext *s, struct sockaddr_storage *source_addr_ptr) { int i; @@ -154,21 +221,23 @@ static av_printf_format(3, 4) void url_add_option(char *buf, int buf_size, const va_end(ap); } -static void build_udp_url(char *buf, int buf_size, - const char *hostname, int port, - int local_port, int ttl, - int max_packet_size, int connect, +static void build_udp_url(RTPContext *s, + char *buf, int buf_size, + const char *hostname, + int port, int local_port, const char *include_sources, const char *exclude_sources) { ff_url_join(buf, buf_size, "udp", NULL, hostname, port, NULL); if (local_port >= 0) url_add_option(buf, buf_size, "localport=%d", local_port); - if (ttl >= 0) - url_add_option(buf, buf_size, "ttl=%d", ttl); - if (max_packet_size >=0) - url_add_option(buf, buf_size, "pkt_size=%d", max_packet_size); - if (connect) + if (s->ttl >= 0) + url_add_option(buf, buf_size, "ttl=%d", s->ttl); + if (s->buffer_size >= 0) + url_add_option(buf, buf_size, "buffer_size=%d", s->buffer_size); + if (s->pkt_size >= 0) + url_add_option(buf, buf_size, "pkt_size=%d", s->pkt_size); + if (s->connect) url_add_option(buf, buf_size, "connect=1"); if (include_sources && include_sources[0]) url_add_option(buf, buf_size, "sources=%s", include_sources); @@ -197,8 +266,10 @@ static void rtp_parse_addr_list(URLContext *h, char *buf, ai = rtp_resolve_host(p, 0, SOCK_DGRAM, AF_UNSPEC, 0); if (ai) { source_addr = av_mallocz(sizeof(struct sockaddr_storage)); - if (!source_addr) + if (!source_addr) { + freeaddrinfo(ai); break; + } memcpy(source_addr, ai->ai_addr, ai->ai_addrlen); freeaddrinfo(ai); @@ -224,9 +295,11 @@ static void rtp_parse_addr_list(URLContext *h, char *buf, * 'localrtcpport=n' : set the local rtcp port to n * 'pkt_size=n' : set max packet size * 'connect=0/1' : do a connect() on the UDP socket + * 'sources=ip[,ip]' : list allowed source IP addresses + * 'block=ip[,ip]' : list disallowed source IP addresses + * 'write_to_source=0/1' : send packets to the source address of the latest received packet * deprecated option: * 'localport=n' : set the local port to n - * 'sources=ip[,ip]' : list allowed source IP addresses * * if rtcpport isn't set the rtcp port will be the rtp port + 1 * if local rtp port isn't set any available port will be used for the local @@ -237,10 +310,9 @@ static void rtp_parse_addr_list(URLContext *h, char *buf, static int rtp_open(URLContext *h, const char *uri, int flags) { RTPContext *s = h->priv_data; - int rtp_port, rtcp_port, - ttl, connect, - local_rtp_port, local_rtcp_port, max_packet_size; + int rtp_port; char hostname[256], include_sources[1024] = "", exclude_sources[1024] = ""; + char *sources = include_sources, *block = exclude_sources; char buf[1024]; char path[1024]; const char *p; @@ -248,58 +320,64 @@ static int rtp_open(URLContext *h, const char *uri, int flags) av_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &rtp_port, path, sizeof(path), uri); /* extract parameters */ - ttl = -1; - rtcp_port = rtp_port+1; - local_rtp_port = -1; - local_rtcp_port = -1; - max_packet_size = -1; - connect = 0; + if (s->rtcp_port < 0) + s->rtcp_port = rtp_port + 1; p = strchr(uri, '?'); if (p) { if (av_find_info_tag(buf, sizeof(buf), "ttl", p)) { - ttl = strtol(buf, NULL, 10); + s->ttl = strtol(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "rtcpport", p)) { - rtcp_port = strtol(buf, NULL, 10); + s->rtcp_port = strtol(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "localport", p)) { - local_rtp_port = strtol(buf, NULL, 10); + s->local_rtpport = strtol(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "localrtpport", p)) { - local_rtp_port = strtol(buf, NULL, 10); + s->local_rtpport = strtol(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "localrtcpport", p)) { - local_rtcp_port = strtol(buf, NULL, 10); + s->local_rtcpport = strtol(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "pkt_size", p)) { - max_packet_size = strtol(buf, NULL, 10); + s->pkt_size = strtol(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "connect", p)) { - connect = strtol(buf, NULL, 10); + s->connect = strtol(buf, NULL, 10); + } + if (av_find_info_tag(buf, sizeof(buf), "write_to_source", p)) { + s->write_to_source = strtol(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "sources", p)) { av_strlcpy(include_sources, buf, sizeof(include_sources)); + rtp_parse_addr_list(h, buf, &s->ssm_include_addrs, &s->nb_ssm_include_addrs); + } else { + rtp_parse_addr_list(h, s->sources, &s->ssm_include_addrs, &s->nb_ssm_include_addrs); + sources = s->sources; } if (av_find_info_tag(buf, sizeof(buf), "block", p)) { av_strlcpy(exclude_sources, buf, sizeof(exclude_sources)); rtp_parse_addr_list(h, buf, &s->ssm_exclude_addrs, &s->nb_ssm_exclude_addrs); + } else { + rtp_parse_addr_list(h, s->block, &s->ssm_exclude_addrs, &s->nb_ssm_exclude_addrs); + block = s->block; } } - build_udp_url(buf, sizeof(buf), - hostname, rtp_port, local_rtp_port, ttl, max_packet_size, - connect, include_sources, exclude_sources); - if (ffurl_open(&s->rtp_hd, buf, flags, &h->interrupt_callback, NULL) < 0) + build_udp_url(s, buf, sizeof(buf), + hostname, rtp_port, s->local_rtpport, sources, block); + if (ffurl_open(&s->rtp_hd, buf, flags, &h->interrupt_callback, NULL, + h->protocols, h) < 0) goto fail; - if (local_rtp_port>=0 && local_rtcp_port<0) - local_rtcp_port = ff_udp_get_local_port(s->rtp_hd) + 1; + if (s->local_rtpport >= 0 && s->local_rtcpport < 0) + s->local_rtcpport = ff_udp_get_local_port(s->rtp_hd) + 1; - build_udp_url(buf, sizeof(buf), - hostname, rtcp_port, local_rtcp_port, ttl, max_packet_size, - connect, include_sources, exclude_sources); - if (ffurl_open(&s->rtcp_hd, buf, flags, &h->interrupt_callback, NULL) < 0) + build_udp_url(s, buf, sizeof(buf), + hostname, s->rtcp_port, s->local_rtcpport, sources, block); + if (ffurl_open(&s->rtcp_hd, buf, flags, &h->interrupt_callback, NULL, + h->protocols, h) < 0) goto fail; /* just to ease handle access. XXX: need to suppress direct handle @@ -322,47 +400,33 @@ static int rtp_open(URLContext *h, const char *uri, int flags) static int rtp_read(URLContext *h, uint8_t *buf, int size) { RTPContext *s = h->priv_data; - struct sockaddr_storage from; - socklen_t from_len; - int len, n; + int len, n, i; struct pollfd p[2] = {{s->rtp_fd, POLLIN, 0}, {s->rtcp_fd, POLLIN, 0}}; int poll_delay = h->flags & AVIO_FLAG_NONBLOCK ? 0 : 100; + struct sockaddr_storage *addrs[2] = { &s->last_rtp_source, &s->last_rtcp_source }; + socklen_t *addr_lens[2] = { &s->last_rtp_source_len, &s->last_rtcp_source_len }; for(;;) { if (ff_check_interrupt(&h->interrupt_callback)) return AVERROR_EXIT; - /* build fdset to listen to RTP and RTCP packets */ n = poll(p, 2, poll_delay); if (n > 0) { - /* first try RTCP */ - if (p[1].revents & POLLIN) { - from_len = sizeof(from); - len = recvfrom (s->rtcp_fd, buf, size, 0, - (struct sockaddr *)&from, &from_len); - if (len < 0) { - if (ff_neterrno() == AVERROR(EAGAIN) || - ff_neterrno() == AVERROR(EINTR)) - continue; - return AVERROR(EIO); - } - if (rtp_check_source_lists(s, &from)) + /* first try RTCP, then RTP */ + for (i = 1; i >= 0; i--) { + if (!(p[i].revents & POLLIN)) continue; - break; - } - /* then RTP */ - if (p[0].revents & POLLIN) { - from_len = sizeof(from); - len = recvfrom (s->rtp_fd, buf, size, 0, - (struct sockaddr *)&from, &from_len); + *addr_lens[i] = sizeof(*addrs[i]); + len = recvfrom(p[i].fd, buf, size, 0, + (struct sockaddr *)addrs[i], addr_lens[i]); if (len < 0) { if (ff_neterrno() == AVERROR(EAGAIN) || ff_neterrno() == AVERROR(EINTR)) continue; return AVERROR(EIO); } - if (rtp_check_source_lists(s, &from)) + if (rtp_check_source_lists(s, addrs[i])) continue; - break; + return len; } } else if (n < 0) { if (ff_neterrno() == AVERROR(EINTR)) @@ -381,6 +445,64 @@ static int rtp_write(URLContext *h, const uint8_t *buf, int size) int ret; URLContext *hd; + if (size < 2) + return AVERROR(EINVAL); + + if ((buf[0] & 0xc0) != (RTP_VERSION << 6)) + av_log(h, AV_LOG_WARNING, "Data doesn't look like RTP packets, " + "make sure the RTP muxer is used\n"); + + if (s->write_to_source) { + int fd; + struct sockaddr_storage *source, temp_source; + socklen_t *source_len, temp_len; + if (!s->last_rtp_source.ss_family && !s->last_rtcp_source.ss_family) { + av_log(h, AV_LOG_ERROR, + "Unable to send packet to source, no packets received yet\n"); + // Intentionally not returning an error here + return size; + } + + if (RTP_PT_IS_RTCP(buf[1])) { + fd = s->rtcp_fd; + source = &s->last_rtcp_source; + source_len = &s->last_rtcp_source_len; + } else { + fd = s->rtp_fd; + source = &s->last_rtp_source; + source_len = &s->last_rtp_source_len; + } + if (!source->ss_family) { + source = &temp_source; + source_len = &temp_len; + if (RTP_PT_IS_RTCP(buf[1])) { + temp_source = s->last_rtp_source; + temp_len = s->last_rtp_source_len; + set_port(source, get_port(source) + 1); + av_log(h, AV_LOG_INFO, + "Not received any RTCP packets yet, inferring peer port " + "from the RTP port\n"); + } else { + temp_source = s->last_rtcp_source; + temp_len = s->last_rtcp_source_len; + set_port(source, get_port(source) - 1); + av_log(h, AV_LOG_INFO, + "Not received any RTP packets yet, inferring peer port " + "from the RTCP port\n"); + } + } + + if (!(h->flags & AVIO_FLAG_NONBLOCK)) { + ret = ff_network_wait_fd(fd, 1); + if (ret < 0) + return ret; + } + ret = sendto(fd, buf, size, 0, (struct sockaddr *) source, + *source_len); + + return ret < 0 ? ff_neterrno() : ret; + } + if (RTP_PT_IS_RTCP(buf[1])) { /* RTCP payload type */ hd = s->rtcp_hd; @@ -453,7 +575,7 @@ static int rtp_get_multi_file_handle(URLContext *h, int **handles, return 0; } -URLProtocol ff_rtp_protocol = { +const URLProtocol ff_rtp_protocol = { .name = "rtp", .url_open = rtp_open, .url_read = rtp_read, @@ -463,4 +585,5 @@ URLProtocol ff_rtp_protocol = { .url_get_multi_file_handle = rtp_get_multi_file_handle, .priv_data_size = sizeof(RTPContext), .flags = URL_PROTOCOL_FLAG_NETWORK, + .priv_data_class = &rtp_class, };