X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Ftcp.c;h=b01f0b85bf20a0605c1a7cc422f79cf3ac5147b0;hb=863c471638fa667e6e5c5df059b67af263e1cd40;hp=ee61afafe9817829da12f4f2317aecfbda755ea3;hpb=438fcb754f47ee30036e7f7819341de7fb7c5d54;p=ffmpeg diff --git a/libavformat/tcp.c b/libavformat/tcp.c index ee61afafe98..b01f0b85bf2 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -1,235 +1,192 @@ /* * TCP protocol - * Copyright (c) 2002 Fabrice Bellard. + * Copyright (c) 2002 Fabrice Bellard * - * This library is free software; you can redistribute it and/or + * This file is part of FFmpeg. + * + * FFmpeg 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * FFmpeg 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 this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" #include -#include -#include -#include -#include -#if defined(__APPLE__) || defined(__BEOS__) -typedef int socklen_t; -#endif -#ifndef __BEOS__ -# include -#else -# include "barpainet.h" +#include "internal.h" +#include "network.h" +#include "os_support.h" +#if HAVE_POLL_H +#include #endif -#include #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; - const char *p; - fd_set wfds; - int fd_max, ret; - struct timeval tv; + TCPContext *s = NULL; + int ret; socklen_t optlen; - - s = av_malloc(sizeof(TCPContext)); - if (!s) - return -ENOMEM; - h->priv_data = s; - p = uri; - if (!strstart(p, "tcp://", &p)) - goto fail; - q = hostname; - while (*p != ':' && *p != '/' && *p != '\0') { - if ((q - hostname) < sizeof(hostname) - 1) - *q++ = *p; - p++; + 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); + + 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(NULL, AV_LOG_ERROR, + "Failed to resolve hostname %s: %s\n", + hostname, gai_strerror(ret)); + return AVERROR(EIO); } - *q = '\0'; - if (*p != ':') - goto fail; - p++; - port = strtoul(p, (char **)&p, 10); - if (port <= 0 || port >= 65536) - goto fail; - - dest_addr.sin_family = AF_INET; - dest_addr.sin_port = htons(port); - if (resolve_host(&dest_addr.sin_addr, hostname) < 0) - goto fail; - fd = socket(PF_INET, SOCK_STREAM, 0); + cur_ai = ai; + + 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); - + ff_socket_nonblock(fd, 1); + redo: - ret = connect(fd, (struct sockaddr *)&dest_addr, - sizeof(dest_addr)); + ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen); if (ret < 0) { - if (errno == EINTR) + struct pollfd p = {fd, POLLOUT, 0}; + if (ff_neterrno() == AVERROR(EINTR)) { + if (url_interrupt_cb()) + 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(EINTR); 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(NULL, 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 = -EIO; + 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) - close(fd); - av_free(s); + closesocket(fd); + freeaddrinfo(ai); return ret; } +static int tcp_wait_fd(int fd, int write) +{ + int ev = write ? POLLOUT : POLLIN; + struct pollfd p = { .fd = fd, .events = ev, .revents = 0 }; + int ret; + + ret = poll(&p, 1, 100); + return ret < 0 ? ff_neterrno() : p.revents & ev ? 0 : AVERROR(EAGAIN); +} + static int tcp_read(URLContext *h, uint8_t *buf, int size) { TCPContext *s = h->priv_data; - int size1, len, fd_max; - fd_set rfds; - struct timeval tv; - - size1 = size; - while (size > 0) { - 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; - select(fd_max + 1, &rfds, NULL, NULL, &tv); -#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 - continue; - } else if (len == 0) { - break; - } - size -= len; - buf += len; + int ret; + + if (!(h->flags & URL_FLAG_NONBLOCK)) { + ret = tcp_wait_fd(s->fd, 0); + if (ret < 0) + return ret; } - return size1 - size; + 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; - 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; - select(fd_max + 1, NULL, &wfds, NULL, &tv); -#ifdef __BEOS__ - ret = send(s->fd, buf, size, 0); -#else - ret = write(s->fd, buf, size); -#endif - if (ret < 0 && errno != EINTR && errno != EAGAIN) -#ifdef __BEOS__ - return errno; -#else - return -errno; -#endif - size -= ret; - buf += ret; + int ret; + + if (!(h->flags & URL_FLAG_NONBLOCK)) { + ret = tcp_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) { TCPContext *s = h->priv_data; -#ifdef CONFIG_BEOS_NETSERVER closesocket(s->fd); -#else - close(s->fd); -#endif av_free(s); return 0; } -URLProtocol tcp_protocol = { +static int tcp_get_file_handle(URLContext *h) +{ + TCPContext *s = h->priv_data; + return s->fd; +} + +URLProtocol ff_tcp_protocol = { "tcp", tcp_open, tcp_read, tcp_write, NULL, /* seek */ tcp_close, + .url_get_file_handle = tcp_get_file_handle, };