X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Ftcp.c;h=ced103876f85ac3e69e8c5e4fe39ee2428f7a5a4;hb=1550f45a8928f31c48f770b5ddf860c99a57687e;hp=52aab81e8299116ae5c5fc3d3929f4e618a1b911;hpb=763750242bdd1ff4e2be3d6654cb8fb748295d5e;p=ffmpeg diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 52aab81e829..ced103876f8 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -1,206 +1,183 @@ /* * TCP protocol - * Copyright (c) 2002 Fabrice Bellard. + * 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 "libavutil/parseutils.h" #include -#include -#include -#include -#include -#include +#include "internal.h" +#include "network.h" +#include "os_support.h" +#include "url.h" +#if HAVE_POLL_H +#include +#endif #include -#include typedef struct TCPContext { int fd; } TCPContext; -/* resolve host with also IP address parsing */ -int resolve_host(struct in_addr *sin_addr, const char *hostname) -{ - struct hostent *hp; - - if ((inet_aton(hostname, sin_addr)) == 0) { - hp = gethostbyname(hostname); - if (!hp) - return -1; - memcpy (sin_addr, hp->h_addr, sizeof(struct in_addr)); - } - return 0; -} - /* return non zero if error */ static int tcp_open(URLContext *h, const char *uri, int flags) { - struct sockaddr_in dest_addr; - char hostname[1024], *q; + struct addrinfo hints, *ai, *cur_ai; int port, fd = -1; TCPContext *s = NULL; - fd_set wfds; - int fd_max, ret; - struct timeval tv; + int listen_socket = 0; + const char *p; + char buf[256]; + int ret; socklen_t optlen; - char proto[1024],path[1024],tmp[1024]; // PETR: protocol and path strings - - url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), - &port, path, sizeof(path), uri); // PETR: use url_split - if (strcmp(proto,"tcp")) goto fail; // PETR: check protocol - if ((q = strchr(hostname,'@'))) { strcpy(tmp,q+1); strcpy(hostname,tmp); } // PETR: take only the part after '@' for tcp protocol - - s = av_malloc(sizeof(TCPContext)); - if (!s) - return -ENOMEM; - h->priv_data = s; - - if (port <= 0 || port >= 65536) - goto fail; + 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) + return AVERROR(EINVAL); + + p = strchr(uri, '?'); + if (p) { + if (av_find_info_tag(buf, sizeof(buf), "listen", p)) + listen_socket = 1; + } + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + snprintf(portstr, sizeof(portstr), "%d", port); + ret = getaddrinfo(hostname, portstr, &hints, &ai); + if (ret) { + av_log(h, AV_LOG_ERROR, + "Failed to resolve hostname %s: %s\n", + hostname, gai_strerror(ret)); + return AVERROR(EIO); + } - dest_addr.sin_family = AF_INET; - dest_addr.sin_port = htons(port); - if (resolve_host(&dest_addr.sin_addr, hostname) < 0) - goto fail; + cur_ai = ai; - fd = socket(PF_INET, SOCK_STREAM, 0); + restart: + fd = socket(cur_ai->ai_family, cur_ai->ai_socktype, cur_ai->ai_protocol); if (fd < 0) goto fail; - fcntl(fd, F_SETFL, O_NONBLOCK); + if (listen_socket) { + int fd1; + ret = bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen); + listen(fd, 1); + fd1 = accept(fd, NULL, NULL); + closesocket(fd); + fd = fd1; + } else { redo: - ret = connect(fd, (struct sockaddr *)&dest_addr, - sizeof(dest_addr)); + ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen); + } + + ff_socket_nonblock(fd, 1); + if (ret < 0) { - if (errno == EINTR) + struct pollfd p = {fd, POLLOUT, 0}; + if (ff_neterrno() == AVERROR(EINTR)) { + if (url_interrupt_cb()) { + ret = AVERROR_EXIT; + goto fail1; + } goto redo; - if (errno != EINPROGRESS) + } + if (ff_neterrno() != AVERROR(EINPROGRESS) && + ff_neterrno() != AVERROR(EAGAIN)) goto fail; /* wait until we are connected or until abort */ for(;;) { if (url_interrupt_cb()) { - ret = -EINTR; + ret = AVERROR_EXIT; goto fail1; } - fd_max = fd; - FD_ZERO(&wfds); - FD_SET(fd, &wfds); - tv.tv_sec = 0; - tv.tv_usec = 100 * 1000; - ret = select(fd_max + 1, NULL, &wfds, NULL, &tv); - if (ret > 0 && FD_ISSET(fd, &wfds)) + ret = poll(&p, 1, 100); + if (ret > 0) break; } /* test error */ optlen = sizeof(ret); getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen); - if (ret != 0) + if (ret != 0) { + av_log(h, AV_LOG_ERROR, + "TCP connection to %s:%d failed: %s\n", + hostname, port, strerror(ret)); 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); return 0; fail: - ret = AVERROR_IO; + if (cur_ai->ai_next) { + /* Retry with the next sockaddr */ + cur_ai = cur_ai->ai_next; + if (fd >= 0) + closesocket(fd); + goto restart; + } + ret = AVERROR(EIO); fail1: if (fd >= 0) closesocket(fd); - av_free(s); + freeaddrinfo(ai); return ret; } static int tcp_read(URLContext *h, uint8_t *buf, int size) { TCPContext *s = h->priv_data; - int len, fd_max, ret; - fd_set rfds; - struct timeval tv; - - for (;;) { - if (url_interrupt_cb()) - return -EINTR; - fd_max = s->fd; - FD_ZERO(&rfds); - FD_SET(s->fd, &rfds); - tv.tv_sec = 0; - tv.tv_usec = 100 * 1000; - ret = select(fd_max + 1, &rfds, NULL, NULL, &tv); - if (ret > 0 && FD_ISSET(s->fd, &rfds)) { -#ifdef __BEOS__ - len = recv(s->fd, buf, size, 0); -#else - len = read(s->fd, buf, size); -#endif - if (len < 0) { - if (errno != EINTR && errno != EAGAIN) -#ifdef __BEOS__ - return errno; -#else - return -errno; -#endif - } else return len; - } else if (ret < 0) { - 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, uint8_t *buf, int size) +static int tcp_write(URLContext *h, const uint8_t *buf, int size) { TCPContext *s = h->priv_data; - int ret, size1, fd_max, len; - fd_set wfds; - struct timeval tv; - - size1 = size; - while (size > 0) { - if (url_interrupt_cb()) - return -EINTR; - fd_max = s->fd; - FD_ZERO(&wfds); - FD_SET(s->fd, &wfds); - tv.tv_sec = 0; - tv.tv_usec = 100 * 1000; - ret = select(fd_max + 1, NULL, &wfds, NULL, &tv); - if (ret > 0 && FD_ISSET(s->fd, &wfds)) { -#ifdef __BEOS__ - len = send(s->fd, buf, size, 0); -#else - len = write(s->fd, buf, size); -#endif - if (len < 0) { - if (errno != EINTR && errno != EAGAIN) { -#ifdef __BEOS__ - return errno; -#else - return -errno; -#endif - } - continue; - } - size -= len; - buf += len; - } else if (ret < 0) { - 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_close(URLContext *h) @@ -211,11 +188,17 @@ static int tcp_close(URLContext *h) return 0; } -URLProtocol tcp_protocol = { - "tcp", - tcp_open, - tcp_read, - tcp_write, - NULL, /* seek */ - tcp_close, +static int tcp_get_file_handle(URLContext *h) +{ + TCPContext *s = h->priv_data; + return s->fd; +} + +URLProtocol ff_tcp_protocol = { + .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, };