X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Ftcp.c;h=14b5e19cd960799bdb216adc15fd16d2756f8c26;hb=724b1f6a05dbbc75df70990469fe521b93a098de;hp=769282182c57026894afe945d74baa7ca6737279;hpb=95a47d963b4a6238efa432ba42cf1717e197372e;p=ffmpeg diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 769282182c5..14b5e19cd96 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -1,6 +1,6 @@ /* * TCP protocol - * Copyright (c) 2002 Fabrice Bellard. + * Copyright (c) 2002 Fabrice Bellard * * This file is part of FFmpeg. * @@ -20,108 +20,120 @@ */ #include "avformat.h" #include -#include -#include -#include -#include -#include +#include "internal.h" +#include "network.h" +#include "os_support.h" +#if HAVE_SYS_SELECT_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; + fd_set wfds, efds; int fd_max, ret; struct timeval tv; 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); + + 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); + } - 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); + 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) + if (ff_neterrno() == FF_NETERROR(EINTR)) { + if (url_interrupt_cb()) + goto fail1; goto redo; - if (errno != EINPROGRESS) + } + 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 = -EINTR; + ret = AVERROR(EINTR); goto fail1; } fd_max = fd; FD_ZERO(&wfds); + FD_ZERO(&efds); FD_SET(fd, &wfds); + FD_SET(fd, &efds); 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 = select(fd_max + 1, NULL, &wfds, &efds, &tv); + if (ret > 0 && (FD_ISSET(fd, &wfds) || FD_ISSET(fd, &efds))) 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 = 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; } @@ -134,7 +146,7 @@ static int tcp_read(URLContext *h, uint8_t *buf, int size) for (;;) { if (url_interrupt_cb()) - return -EINTR; + return AVERROR(EINTR); fd_max = s->fd; FD_ZERO(&rfds); FD_SET(s->fd, &rfds); @@ -144,20 +156,19 @@ static int tcp_read(URLContext *h, uint8_t *buf, int size) if (ret > 0 && FD_ISSET(s->fd, &rfds)) { len = recv(s->fd, buf, size, 0); if (len < 0) { - if (errno != EINTR && errno != EAGAIN) -#ifdef __BEOS__ - return errno; -#else - return -errno; -#endif + 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; } } } -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; @@ -167,7 +178,7 @@ static int tcp_write(URLContext *h, uint8_t *buf, int size) size1 = size; while (size > 0) { if (url_interrupt_cb()) - return -EINTR; + return AVERROR(EINTR); fd_max = s->fd; FD_ZERO(&wfds); FD_SET(s->fd, &wfds); @@ -177,18 +188,16 @@ static int tcp_write(URLContext *h, uint8_t *buf, int size) if (ret > 0 && FD_ISSET(s->fd, &wfds)) { len = send(s->fd, buf, size, 0); if (len < 0) { - if (errno != EINTR && errno != EAGAIN) { -#ifdef __BEOS__ - return errno; -#else - return -errno; -#endif - } + 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; } } @@ -203,6 +212,12 @@ static int tcp_close(URLContext *h) return 0; } +static int tcp_get_file_handle(URLContext *h) +{ + TCPContext *s = h->priv_data; + return s->fd; +} + URLProtocol tcp_protocol = { "tcp", tcp_open, @@ -210,4 +225,5 @@ URLProtocol tcp_protocol = { tcp_write, NULL, /* seek */ tcp_close, + .url_get_file_handle = tcp_get_file_handle, };