X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Ftcp.c;h=cbd51422a8c8616eea2fc4b7aa9892a721cf094e;hb=634d9d8b398982647b3d7160641198744901d8d8;hp=ac4e4b09db1df30f2e6938ffa8b8a6a4250bd43f;hpb=a8475bbdb64e638bd8161df9647876fd23f8a29a;p=ffmpeg diff --git a/libavformat/tcp.c b/libavformat/tcp.c index ac4e4b09db1..cbd51422a8c 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -2,31 +2,31 @@ * TCP protocol * Copyright (c) 2002 Fabrice Bellard * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" -#include +#include "libavutil/parseutils.h" #include "internal.h" #include "network.h" #include "os_support.h" +#include "url.h" #if HAVE_POLL_H #include #endif -#include typedef struct TCPContext { int fd; @@ -35,26 +35,47 @@ typedef struct TCPContext { /* return non zero if error */ static int tcp_open(URLContext *h, const char *uri, int flags) { - struct addrinfo hints, *ai, *cur_ai; + struct addrinfo hints = { 0 }, *ai, *cur_ai; int port, fd = -1; - TCPContext *s = NULL; + TCPContext *s = h->priv_data; + int listen_socket = 0; + const char *p; + char buf[256]; int ret; - socklen_t optlen; + int timeout = 100, listen_timeout = -1; char hostname[1024],proto[1024],path[1024]; char portstr[10]; av_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), uri); - if (strcmp(proto,"tcp") || port <= 0 || port >= 65536) + if (strcmp(proto, "tcp")) return AVERROR(EINVAL); - - memset(&hints, 0, sizeof(hints)); + if (port <= 0 || port >= 65536) { + av_log(h, AV_LOG_ERROR, "Port missing in uri\n"); + return AVERROR(EINVAL); + } + p = strchr(uri, '?'); + if (p) { + if (av_find_info_tag(buf, sizeof(buf), "listen", p)) + listen_socket = 1; + if (av_find_info_tag(buf, sizeof(buf), "timeout", p)) { + timeout = strtol(buf, NULL, 10); + } + if (av_find_info_tag(buf, sizeof(buf), "listen_timeout", p)) { + listen_timeout = strtol(buf, NULL, 10); + } + } hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; snprintf(portstr, sizeof(portstr), "%d", port); - ret = getaddrinfo(hostname, portstr, &hints, &ai); + if (listen_socket) + hints.ai_flags |= AI_PASSIVE; + if (!hostname[0]) + ret = getaddrinfo(NULL, portstr, &hints, &ai); + else + ret = getaddrinfo(hostname, portstr, &hints, &ai); if (ret) { - av_log(NULL, AV_LOG_ERROR, + av_log(h, AV_LOG_ERROR, "Failed to resolve hostname %s: %s\n", hostname, gai_strerror(ret)); return AVERROR(EIO); @@ -63,51 +84,31 @@ static int tcp_open(URLContext *h, const char *uri, int flags) cur_ai = ai; restart: - fd = socket(cur_ai->ai_family, cur_ai->ai_socktype, cur_ai->ai_protocol); - if (fd < 0) + fd = ff_socket(cur_ai->ai_family, + cur_ai->ai_socktype, + cur_ai->ai_protocol); + if (fd < 0) { + ret = ff_neterrno(); goto fail; - ff_socket_nonblock(fd, 1); - - redo: - ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen); - if (ret < 0) { - struct pollfd p = {fd, POLLOUT, 0}; - if (ff_neterrno() == FF_NETERROR(EINTR)) { - if (url_interrupt_cb()) - goto fail1; - goto redo; - } - if (ff_neterrno() != FF_NETERROR(EINPROGRESS) && - ff_neterrno() != FF_NETERROR(EAGAIN)) - goto fail; - - /* wait until we are connected or until abort */ - for(;;) { - if (url_interrupt_cb()) { - ret = AVERROR(EINTR); - goto fail1; - } - ret = poll(&p, 1, 100); - if (ret > 0) - break; + } + + if (listen_socket) { + if ((fd = ff_listen_bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen, + listen_timeout, h)) < 0) { + ret = fd; + goto fail1; } + } else { + if ((ret = ff_listen_connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen, + timeout * 100, h, !!cur_ai->ai_next)) < 0) { - /* test error */ - optlen = sizeof(ret); - getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen); - if (ret != 0) { - av_log(NULL, AV_LOG_ERROR, - "TCP connection to %s:%d failed: %s\n", - hostname, port, strerror(ret)); - goto fail; + if (ret == AVERROR_EXIT) + goto fail1; + else + goto fail; } } - s = av_malloc(sizeof(TCPContext)); - if (!s) { - freeaddrinfo(ai); - return AVERROR(ENOMEM); - } - h->priv_data = s; + h->is_streamed = 1; s->fd = fd; freeaddrinfo(ai); @@ -119,9 +120,9 @@ static int tcp_open(URLContext *h, const char *uri, int flags) cur_ai = cur_ai->ai_next; if (fd >= 0) closesocket(fd); + ret = 0; goto restart; } - ret = AVERROR(EIO); fail1: if (fd >= 0) closesocket(fd); @@ -132,63 +133,51 @@ static int tcp_open(URLContext *h, const char *uri, int flags) static int tcp_read(URLContext *h, uint8_t *buf, int size) { TCPContext *s = h->priv_data; - struct pollfd p = {s->fd, POLLIN, 0}; - int len, ret; - - for (;;) { - if (url_interrupt_cb()) - return AVERROR(EINTR); - ret = poll(&p, 1, 100); - if (ret == 1 && p.revents & POLLIN) { - len = recv(s->fd, buf, size, 0); - if (len < 0) { - if (ff_neterrno() != FF_NETERROR(EINTR) && - ff_neterrno() != FF_NETERROR(EAGAIN)) - return ff_neterrno(); - } else return len; - } else if (ret < 0) { - if (ff_neterrno() == FF_NETERROR(EINTR)) - continue; - return -1; - } + int ret; + + if (!(h->flags & AVIO_FLAG_NONBLOCK)) { + ret = ff_network_wait_fd(s->fd, 0); + if (ret < 0) + return ret; } + ret = recv(s->fd, buf, size, 0); + return ret < 0 ? ff_neterrno() : ret; } static int tcp_write(URLContext *h, const uint8_t *buf, int size) { TCPContext *s = h->priv_data; - int ret, size1, len; - struct pollfd p = {s->fd, POLLOUT, 0}; - - size1 = size; - while (size > 0) { - if (url_interrupt_cb()) - return AVERROR(EINTR); - ret = poll(&p, 1, 100); - if (ret == 1 && p.revents & POLLOUT) { - len = send(s->fd, buf, size, 0); - if (len < 0) { - if (ff_neterrno() != FF_NETERROR(EINTR) && - ff_neterrno() != FF_NETERROR(EAGAIN)) - return ff_neterrno(); - continue; - } - size -= len; - buf += len; - } else if (ret < 0) { - if (ff_neterrno() == FF_NETERROR(EINTR)) - continue; - return -1; - } + int ret; + + if (!(h->flags & AVIO_FLAG_NONBLOCK)) { + ret = ff_network_wait_fd(s->fd, 1); + if (ret < 0) + return ret; } - return size1 - size; + ret = send(s->fd, buf, size, 0); + return ret < 0 ? ff_neterrno() : ret; +} + +static int tcp_shutdown(URLContext *h, int flags) +{ + TCPContext *s = h->priv_data; + int how; + + if (flags & AVIO_FLAG_WRITE && flags & AVIO_FLAG_READ) { + how = SHUT_RDWR; + } else if (flags & AVIO_FLAG_WRITE) { + how = SHUT_WR; + } else { + how = SHUT_RD; + } + + return shutdown(s->fd, how); } static int tcp_close(URLContext *h) { TCPContext *s = h->priv_data; closesocket(s->fd); - av_free(s); return 0; } @@ -199,11 +188,13 @@ static int tcp_get_file_handle(URLContext *h) } URLProtocol ff_tcp_protocol = { - "tcp", - tcp_open, - tcp_read, - tcp_write, - NULL, /* seek */ - tcp_close, + .name = "tcp", + .url_open = tcp_open, + .url_read = tcp_read, + .url_write = tcp_write, + .url_close = tcp_close, .url_get_file_handle = tcp_get_file_handle, + .url_shutdown = tcp_shutdown, + .priv_data_size = sizeof(TCPContext), + .flags = URL_PROTOCOL_FLAG_NETWORK, };