RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tcp: make connect() timeout properly 

The connect() timeout can take minutes, gets misreported as EIO and
isn't interruptible.
This commit is contained in:
Luca Barbato 2011-05-20 14:09:21 +02:00
parent fa4924a358
commit ebb6b27ad9
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavformat/tcp.c
View File

@ -45,6 +45,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
char buf[256]; char buf[256];
int ret; int ret;
socklen_t optlen; socklen_t optlen;
int timeout = 100;
char hostname[1024],proto[1024],path[1024]; char hostname[1024],proto[1024],path[1024];
char portstr[10]; char portstr[10];
@ -57,6 +58,9 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
if (p) { if (p) {
if (av_find_info_tag(buf, sizeof(buf), "listen", p)) if (av_find_info_tag(buf, sizeof(buf), "listen", p))
listen_socket = 1; listen_socket = 1;
if (av_find_info_tag(buf, sizeof(buf), "timeout", p)) {
timeout = strtol(buf, NULL, 10);
}
} }
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC; hints.ai_family = AF_UNSPEC;
@ -73,6 +77,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
cur_ai = ai; cur_ai = ai;
restart: restart:
ret = AVERROR(EIO);
fd = socket(cur_ai->ai_family, cur_ai->ai_socktype, cur_ai->ai_protocol); fd = socket(cur_ai->ai_family, cur_ai->ai_socktype, cur_ai->ai_protocol);
if (fd < 0) if (fd < 0)
goto fail; goto fail;
@ -84,28 +89,29 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
fd1 = accept(fd, NULL, NULL); fd1 = accept(fd, NULL, NULL);
closesocket(fd); closesocket(fd);
fd = fd1; fd = fd1;
ff_socket_nonblock(fd, 1);
} else { } else {
redo: redo:
ff_socket_nonblock(fd, 1);
ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen); ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen);
} }
ff_socket_nonblock(fd, 1);
if (ret < 0) { if (ret < 0) {
struct pollfd p = {fd, POLLOUT, 0}; struct pollfd p = {fd, POLLOUT, 0};
if (ff_neterrno() == AVERROR(EINTR)) { ret = ff_neterrno();
if (ret == AVERROR(EINTR)) {
if (url_interrupt_cb()) { if (url_interrupt_cb()) {
ret = AVERROR_EXIT; ret = AVERROR_EXIT;
goto fail1; goto fail1;
} }
goto redo; goto redo;
} }
if (ff_neterrno() != AVERROR(EINPROGRESS) && if (ret != AVERROR(EINPROGRESS) &&
ff_neterrno() != AVERROR(EAGAIN)) ret != AVERROR(EAGAIN))
goto fail; goto fail;
/* wait until we are connected or until abort */ /* wait until we are connected or until abort */
for(;;) { while(timeout--) {
if (url_interrupt_cb()) { if (url_interrupt_cb()) {
ret = AVERROR_EXIT; ret = AVERROR_EXIT;
goto fail1; goto fail1;
@ -114,7 +120,10 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
if (ret > 0) if (ret > 0)
break; break;
} }
if (ret <= 0) {
ret = AVERROR(ETIMEDOUT);
goto fail;
}
/* test error */ /* test error */
optlen = sizeof(ret); optlen = sizeof(ret);
getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen); getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen);
@ -122,6 +131,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
av_log(h, AV_LOG_ERROR, av_log(h, AV_LOG_ERROR,
"TCP connection to %s:%d failed: %s\n", "TCP connection to %s:%d failed: %s\n",
hostname, port, strerror(ret)); hostname, port, strerror(ret));
ret = AVERROR(ret);
goto fail; goto fail;
} }
} }
@ -144,7 +154,6 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
closesocket(fd); closesocket(fd);
goto restart; goto restart;
} }
ret = AVERROR(EIO);
fail1: fail1:
if (fd >= 0) if (fd >= 0)
closesocket(fd); closesocket(fd);